Merge pull request #1368 from rancher/dev-v2.7

[v2.7] KDM release for v2.7.12
rancher · Mar 27, 2024 · 1087403 · 1087403
2 parents 4d4f011 + 36eff45
commit 1087403
Show file tree

Hide file tree

Showing 7 changed files with 2,085 additions and 1,352 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -2,7 +2,7 @@ ARG RANCHER_VERSION=v2.7-head
 
 FROM rancher/rancher:$RANCHER_VERSION as rancher
 
-FROM registry.suse.com/bci/golang:1.20
+FROM registry.suse.com/bci/golang:1.21
 
 RUN mkdir -p /var/lib/rancher
 COPY --from=rancher /var/lib/rancher /var/lib/rancher
@@ -61,7 +61,7 @@ RUN ln -s /usr/bin/cni /usr/bin/bridge && \
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
-ENV GOLANGCI_LINT v1.52.0
+ENV GOLANGCI_LINT v1.56.2
 
 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
@@ -86,4 +86,4 @@ VOLUME /var/lib/kubelet
 WORKDIR ${DAPPER_SOURCE}
 
 ENTRYPOINT ["./scripts/entry"]
-CMD ["ci"]
+CMD ["ci"]
diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -1669,6 +1669,32 @@ releases:
         repo: rancher-rke2-charts
         version: 0.1.1700
     featureVersions: *featureVersions-v1
+  - version: v1.26.15+rke2r1
+    minChannelServerVersion: v2.7.5-alpha1
+    maxChannelServerVersion: v2.8.99
+    serverArgs: *serverArgs-v1-26-14-rke2r1
+    agentArgs: *agentArgs-v1-25-15-rke2r2
+    charts: &charts-v1-26-15-rke2r1
+      <<: *charts-v1-26-14-rke2r1
+      rancher-vsphere-csi:
+        repo: rancher-rke2-charts
+        version: 3.1.2-rancher101
+      rancher-vsphere-cpi:
+        repo: rancher-rke2-charts
+        version: 1.7.001
+      rke2-coredns:
+        repo: rancher-rke2-charts
+        version: 1.29.002
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.27.2-build2024030800
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.27.200
+      rke2-multus:
+        repo: rancher-rke2-charts
+        version: v4.0.2-build2024020802
+    featureVersions: *featureVersions-v1
   - version: v1.27.5+rke2r1
     minChannelServerVersion: v2.7.11-alpha1
     maxChannelServerVersion: v2.7.99
@@ -1818,3 +1844,29 @@ releases:
         repo: rancher-rke2-charts
         version: 0.1.1700
     featureVersions: *featureVersions-v1
+  - version: v1.27.12+rke2r1
+    minChannelServerVersion: v2.7.11-alpha1
+    maxChannelServerVersion: v2.8.99
+    serverArgs: *serverArgs-v1-27-11-rke2r1
+    agentArgs: *agentArgs-v1-25-15-rke2r2
+    charts: &charts-v1-27-12-rke2r1
+      <<: *charts-v1-27-11-rke2r1
+      rancher-vsphere-csi:
+        repo: rancher-rke2-charts
+        version: 3.1.2-rancher101
+      rancher-vsphere-cpi:
+        repo: rancher-rke2-charts
+        version: 1.7.001
+      rke2-coredns:
+        repo: rancher-rke2-charts
+        version: 1.29.002
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.27.2-build2024030800
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.27.200
+      rke2-multus:
+        repo: rancher-rke2-charts
+        version: v4.0.2-build2024020802
+    featureVersions: *featureVersions-v1
diff --git a/channels.yaml b/channels.yaml
@@ -516,6 +516,12 @@ releases:
     serverArgs: *serverArgs-v7
     agentArgs: *agentArgs-v5
     featureVersions: *featureVersions-v1
+  - version: v1.26.15+k3s1
+    minChannelServerVersion: v2.7.5-alpha1
+    maxChannelServerVersion: v2.7.99
+    serverArgs: *serverArgs-v7
+    agentArgs: *agentArgs-v5
+    featureVersions: *featureVersions-v1
   - version: v1.27.5+k3s1
     minChannelServerVersion: v2.7.11-alpha1
     maxChannelServerVersion: v2.7.99
@@ -546,3 +552,9 @@ releases:
     serverArgs: *serverArgs-v7
     agentArgs: *agentArgs-v5
     featureVersions: *featureVersions-v1
+  - version: v1.27.12+k3s1
+    minChannelServerVersion: v2.7.11-alpha1
+    maxChannelServerVersion: v2.7.99
+    serverArgs: *serverArgs-v7
+    agentArgs: *agentArgs-v5
+    featureVersions: *featureVersions-v1