Merge pull request #1406 from vardhaman22/k8s-1.30

[dev v2.9] k8s 1.30
rancher · Jun 14, 2024 · d39e6ce · d39e6ce
2 parents 41e2684 + 4665704
commit d39e6ce
Show file tree

Hide file tree

Showing 15 changed files with 14,788 additions and 975 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -84,6 +84,60 @@ volumes:
     path: /var/run/docker.sock
 ---
 
+kind: pipeline
+name: provisioning-tests-rke2-1-30
+
+platform:
+  os: linux
+  arch: amd64
+
+environment:
+  V2PROV_TEST_DIST: "rke2"
+  V2PROV_TEST_RUN_REGEX: "^Test_Provisioning_.*$"
+  KDM_TEST_K8S_MINOR: "30"
+
+steps:
+  - name: provisioning-tests-pr
+    image: rancher/dapper:v0.6.0
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      event:
+        - pull_request
+  - name: provisioning-tests-push
+    image: rancher/dapper:v0.6.0
+    failure: ignore
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      instance:
+        - drone-publish.rancher.io
+      ref:
+        include:
+          - "refs/heads/dev-v2.*"
+      event:
+        - push
+
+volumes:
+  - name: docker
+    host:
+      path: /var/run/docker.sock
+
+trigger:
+  event:
+    exclude:
+      - promote
+
+---
+
 kind: pipeline
 name: provisioning-tests-rke2-1-29
 
@@ -347,6 +401,59 @@ volumes:
     host:
       path: /var/run/docker.sock
 
+trigger:
+  event:
+    exclude:
+      - promote
+---
+
+kind: pipeline
+name: provisioning-tests-k3s-1-30
+
+platform:
+  os: linux
+  arch: amd64
+
+environment:
+  V2PROV_TEST_DIST: "k3s"
+  V2PROV_TEST_RUN_REGEX: "^Test_Provisioning_.*$"
+  KDM_TEST_K8S_MINOR: "30"
+
+steps:
+  - name: provisioning-tests-pr
+    image: rancher/dapper:v0.6.0
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      event:
+        - pull_request
+  - name: provisioning-tests-push
+    image: rancher/dapper:v0.6.0
+    failure: ignore
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      instance:
+        - drone-publish.rancher.io
+      ref:
+        include:
+          - "refs/heads/dev-v2.*"
+      event:
+        - push
+
+volumes:
+  - name: docker
+    host:
+      path: /var/run/docker.sock
+
 trigger:
   event:
     exclude:
@@ -624,6 +731,60 @@ trigger:
 
 ---
 
+kind: pipeline
+name: provisioning-operations-tests-rke2-1-30
+
+platform:
+  os: linux
+  arch: amd64
+
+environment:
+  V2PROV_TEST_DIST: "rke2"
+  V2PROV_TEST_RUN_REGEX: "^Test_Operation_SetA_.*$"
+  KDM_TEST_K8S_MINOR: "30"
+
+steps:
+  - name: provisioning-operations-tests-pr
+    image: rancher/dapper:v0.6.0
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      event:
+        - pull_request
+  - name: provisioning-operations-tests-push
+    image: rancher/dapper:v0.6.0
+    failure: ignore
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      instance:
+        - drone-publish.rancher.io
+      ref:
+        include:
+          - "refs/heads/dev-v2.*"
+      event:
+        - push
+
+volumes:
+  - name: docker
+    host:
+      path: /var/run/docker.sock
+
+trigger:
+  event:
+    exclude:
+      - promote
+
+---
+
 kind: pipeline
 name: provisioning-operations-tests-rke2-1-29
 
@@ -894,6 +1055,60 @@ trigger:
 
 ---
 
+kind: pipeline
+name: provisioning-operations-tests-k3s-1-30
+
+platform:
+  os: linux
+  arch: amd64
+
+environment:
+  V2PROV_TEST_DIST: "k3s"
+  V2PROV_TEST_RUN_REGEX: "^Test_Operation_SetA_.*$"
+  KDM_TEST_K8S_MINOR: "30"
+
+steps:
+  - name: provisioning-operations-tests-pr
+    image: rancher/dapper:v0.6.0
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      event:
+        - pull_request
+  - name: provisioning-operations-tests-push
+    image: rancher/dapper:v0.6.0
+    failure: ignore
+    commands:
+      - dapper provisioning-tests
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      instance:
+        - drone-publish.rancher.io
+      ref:
+        include:
+          - "refs/heads/dev-v2.*"
+      event:
+        - push
+
+volumes:
+  - name: docker
+    host:
+      path: /var/run/docker.sock
+
+trigger:
+  event:
+    exclude:
+      - promote
+
+---
+
 kind: pipeline
 name: provisioning-operations-tests-k3s-1-29
 

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -14,7 +14,7 @@ COPY --from=rancher /run /run
 RUN mkdir -p /usr/share/rancher
 COPY --from=rancher /usr/share/rancher /usr/share/rancher
 
-COPY --from=rancher/k3s:v1.27.6-k3s1 \
+COPY --from=rancher/k3s:v1.30.1-k3s1 \
     /bin/blkid \
     /bin/bandwidth \
     /bin/cni \
@@ -66,7 +66,7 @@ RUN ln -s /usr/bin/cni /usr/bin/bridge && \
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
-ENV GOLANGCI_LINT v1.57.2
+ENV GOLANGCI_LINT v1.59.0
 
 RUN zypper -n install git docker vim less file curl wget jq awk && rpm -e --nodeps --noscripts containerd
 RUN go install golang.org/x/tools/cmd/goimports@latest
@@ -76,6 +76,9 @@ RUN if [[ "${ARCH}" == "amd64" ]]; then \
         curl -sL https://github.com/regclient/regclient/releases/download/v0.4.8/regsync-linux-amd64 -o /bin/regsync && chmod +x /bin/regsync; \
     fi
 
+ENV YQ_VERSION v4.41.1
+RUN wget -q https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${ARCH}.tar.gz -O - | tar xz && mv yq_linux_${ARCH} /usr/bin/yq
+
 ENV DAPPER_ENV REPO TAG CI DRONE_BUILD_NUMBER DRONE_BUILD_EVENT DRONE_TAG DRONE_COMMIT_BEFORE \
     REGISTRY_ENDPOINT REGISTRY_USERNAME REGISTRY_PASSWORD \
     V2PROV_TEST_DIST V2PROV_TEST_RUN_REGEX KDM_TEST_K8S_MINOR DEBUG

diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -16,8 +16,10 @@ appDefaults:
         defaultVersion: '1.26.x'
       - appVersion: '>= 2.8.0-0 < 2.8.3-0'
         defaultVersion: '1.27.x'
-      - appVersion: '>= 2.8.3-0 < 2.9.100-0'
+      - appVersion: '>= 2.8.3-0 < 2.8.100-0'
         defaultVersion: '1.28.x'
+      - appVersion: '>= 2.9.0-0 < 2.9.100-0'
+        defaultVersion: '1.30.x'
 releases:
   - version: v1.19.16+rke2r1
     minChannelServerVersion: v2.6.0-alpha1
@@ -1902,6 +1904,17 @@ releases:
         repo: rancher-rke2-charts
         version: 3.12.002
     featureVersions: *featureVersions-v1
+  - version: v1.27.14+rke2r1
+    minChannelServerVersion: v2.8.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v1-27-13-rke2r1
+    agentArgs: *agentArgs-v1-25-15-rke2r2
+    charts: &charts-v1-27-14-rke2r1
+      <<: *charts-v1-27-13-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.15.500
+    featureVersions: *featureVersions-v1
   - version: v1.28.8+rke2r1
     minChannelServerVersion: v2.8.3-alpha1
     maxChannelServerVersion: v2.9.99
@@ -1976,7 +1989,18 @@ releases:
       rke2-metrics-server:
         repo: rancher-rke2-charts
         version: 3.12.002
-    featureVersions: *featureVersions-v1  
+    featureVersions: *featureVersions-v1
+  - version: v1.28.10+rke2r1
+    minChannelServerVersion: v2.8.3-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v1-28-9-rke2r1
+    agentArgs: *agentArgs-v1-28-8-rke2r1
+    charts: &charts-v1-28-10-rke2r1
+      <<: *charts-v1-28-9-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.15.500
+    featureVersions: *featureVersions-v1
   - version: v1.29.3+rke2r1
     minChannelServerVersion: v2.9.0-alpha1
     maxChannelServerVersion: v2.9.99
@@ -1991,3 +2015,17 @@ releases:
     agentArgs: *agentArgs-v1-28-8-rke2r1
     charts: *charts-v1-28-9-rke2r1   
     featureVersions: *featureVersions-v1
+  - version: v1.29.5+rke2r1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v1-28-9-rke2r1
+    agentArgs: *agentArgs-v1-28-8-rke2r1
+    charts: *charts-v1-28-10-rke2r1
+    featureVersions: *featureVersions-v1
+  - version: v1.30.1+rke2r1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v1-28-9-rke2r1
+    agentArgs: *agentArgs-v1-28-8-rke2r1
+    charts: *charts-v1-28-10-rke2r1
+    featureVersions: *featureVersions-v1
diff --git a/channels.yaml b/channels.yaml
@@ -16,8 +16,10 @@ appDefaults:
         defaultVersion: '1.26.x'
       - appVersion: '>= 2.8.0-0 < 2.8.3-0'
         defaultVersion: '1.27.x'
-      - appVersion: '>= 2.8.3-0 < 2.9.100-0'
+      - appVersion: '>= 2.8.3-0 < 2.8.100-0'
         defaultVersion: '1.28.x'
+      - appVersion: '>= 2.9.0-0 < 2.9.100-0'
+        defaultVersion: '1.30.x'
 releases:
   - version: v1.18.20+k3s1
     minChannelServerVersion: v2.6.0-alpha1
@@ -569,6 +571,12 @@ releases:
         type: boolean
     agentArgs: *agentArgs-v5
     featureVersions: *featureVersions-v1
+  - version: v1.27.14+k3s1
+    minChannelServerVersion: v2.8.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v8
+    agentArgs: *agentArgs-v5
+    featureVersions: *featureVersions-v1
   - version: v1.28.8+k3s1
     minChannelServerVersion: v2.8.3-alpha1
     maxChannelServerVersion: v2.9.99
@@ -581,6 +589,12 @@ releases:
     serverArgs: *serverArgs-v8
     agentArgs: *agentArgs-v5
     featureVersions: *featureVersions-v1
+  - version: v1.28.10+k3s1
+    minChannelServerVersion: v2.8.3-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v8
+    agentArgs: *agentArgs-v5
+    featureVersions: *featureVersions-v1
   - version: v1.29.3+k3s1
     minChannelServerVersion: v2.9.0-alpha1
     maxChannelServerVersion: v2.9.99
@@ -593,3 +607,15 @@ releases:
     serverArgs: *serverArgs-v7
     agentArgs: *agentArgs-v5
     featureVersions: *featureVersions-v1
+  - version: v1.29.5+k3s1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v8
+    agentArgs: *agentArgs-v5
+    featureVersions: *featureVersions-v1
+  - version: v1.30.1+k3s1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v8
+    agentArgs: *agentArgs-v5
+    featureVersions: *featureVersions-v1