Update Kubernetes to v1.31.0 (rancher#6625)

* Bump hardened k8s to v1.31.0 * Update k8s dependencies to 1.31 * Update old go dependencies * Update lumberjack to new import * Bump vpshere charts * Bump klipper helm Signed-off-by: Derek Nola <[email protected]>
mgfritch · Aug 29, 2024 · e4de10b · e4de10b
1 parent 2000b3a
commit e4de10b
Show file tree

Hide file tree

Showing 11 changed files with 421 additions and 435 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -117,7 +117,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml
 # This image includes any host level programs that we might need. All binaries
 # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation.
 # This means bin/foo/bar will become bin/bar when rke2 installs this to the host
-FROM rancher/hardened-kubernetes:v1.30.3-rke2r1-build20240717 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.31.0-rke2r1-build20240815 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240812 AS containerd
 FROM rancher/hardened-crictl:v1.30.1-build20240812 AS crictl
 FROM rancher/hardened-runc:v1.1.13-build20240821 AS runc

diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -32,10 +32,10 @@ charts:
   - version: v0.25.501
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
-  - version: 1.8.000
+  - version: 1.9.000
     filename: /charts/rancher-vsphere-cpi.yaml
     bootstrap: true
-  - version: 3.3.0-rancher100
+  - version: 3.3.1-rancher100
     filename: /charts/rancher-vsphere-csi.yaml
     bootstrap: true
   - version: 0.2.400

diff --git a/developer-docs/image_sources.md b/developer-docs/image_sources.md
@@ -51,7 +51,7 @@ The **Chart** column indicates the Helm chart that uses this image. `CORE` indic
 | rke2-cilium | rancher/mirrored-cilium-operator-generic | rancher/image-mirror |  | FALSE |
 | rke2-cilium | rancher/mirrored-cilium-startup-script | rancher/image-mirror |  | FALSE |
 |  |  |  |  |  |
-| rancher-vsphere-cpi | rancher/mirrored-cloud-provider-vsphere-cpi-release-manager | rancher/image-mirror |  | FALSE |
+| rancher-vsphere-cpi | rancher/mirrored-cloud-provider-vsphere | rancher/image-mirror |  | FALSE |
 | rancher-vsphere-cpi | rancher/mirrored-cloud-provider-vsphere-csi-release-driver | rancher/image-mirror |  | FALSE |
 | rancher-vsphere-cpi | rancher/mirrored-cloud-provider-vsphere-csi-release-syncer | rancher/image-mirror |  | FALSE |
 |  |  |  |  |  |

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/natefinch/lumberjack"
 	"github.com/spf13/pflag"
+	"gopkg.in/natefinch/lumberjack.v2"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
 )

diff --git a/pkg/pebinaryexecutor/pebinary.go b/pkg/pebinaryexecutor/pebinary.go
@@ -23,12 +23,12 @@ import (
 	"github.com/k3s-io/k3s/pkg/cli/cmds"
 	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/k3s-io/k3s/pkg/daemons/executor"
-	"github.com/natefinch/lumberjack"
 	"github.com/rancher/rke2/pkg/bootstrap"
 	"github.com/rancher/rke2/pkg/images"
 	"github.com/rancher/rke2/pkg/logging"
 	win "github.com/rancher/rke2/pkg/windows"
 	"github.com/sirupsen/logrus"
+	"gopkg.in/natefinch/lumberjack.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/client-go/rest"

diff --git a/pkg/rke2/rke2.go b/pkg/rke2/rke2.go
@@ -18,10 +18,10 @@ import (
 	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/k3s-io/k3s/pkg/daemons/executor"
 	rawServer "github.com/k3s-io/k3s/pkg/server"
-	"github.com/natefinch/lumberjack"
 	"github.com/pkg/errors"
 	"github.com/rancher/rke2/pkg/controllers/cisnetworkpolicy"
 	"github.com/rancher/rke2/pkg/images"
+	"gopkg.in/natefinch/lumberjack.v2"
 
 	"github.com/rancher/wrangler/v3/pkg/slice"
 	"github.com/sirupsen/logrus"

diff --git a/pkg/windows/service_windows.go b/pkg/windows/service_windows.go
@@ -72,7 +72,7 @@ func StartService() (bool, error) {
 	// built-in administrators of the Windows machine or by the local system.
 	// If this Win32 event (Global//stackdump-{pid}) is signaled, a goroutine launched by this call
 	// will dump the current stack trace into {windowsTemporaryDirectory}/{default.WindowsServiceName}.{pid}.stack.logs
-	profilings.SetupDumpStacks(version.Program, os.Getpid())
+	profilings.SetupDumpStacks(version.Program, os.Getpid(), os.TempDir())
 
 	go func() {
 		if err := svc.Run(version.Program, Service); err != nil {

diff --git a/scripts/build-images b/scripts/build-images
@@ -19,7 +19,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240531
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401
     ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240410
-    ${REGISTRY}/rancher/klipper-helm:v0.8.4-build20240523
+    ${REGISTRY}/rancher/klipper-helm:v0.9.1-build20240731
     ${REGISTRY}/rancher/klipper-lb:v0.4.9
     ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
     ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.1
@@ -68,13 +68,13 @@ EOF
 
 if [ "${GOARCH}" != "arm64" ]; then
 xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt
-    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-cpi-release-manager:v1.30.1
-    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0
-    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0
-    ${REGISTRY}/rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1
+    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere:v1.31.0
+    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1
+    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1
+    ${REGISTRY}/rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0
     ${REGISTRY}/rancher/mirrored-sig-storage-csi-resizer:v1.10.1
-    ${REGISTRY}/rancher/mirrored-sig-storage-livenessprobe:v2.12.0
-    ${REGISTRY}/rancher/mirrored-sig-storage-csi-attacher:v4.5.1
+    ${REGISTRY}/rancher/mirrored-sig-storage-livenessprobe:v2.14.0
+    ${REGISTRY}/rancher/mirrored-sig-storage-csi-attacher:v4.7.0
     ${REGISTRY}/rancher/mirrored-sig-storage-csi-provisioner:v4.0.1
     ${REGISTRY}/rancher/mirrored-sig-storage-csi-snapshotter:v7.0.2
 EOF

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -32,8 +32,8 @@ REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code;
 PLATFORM=${GOOS}-${GOARCH}
 RELEASE=${PROG}.${PLATFORM}
 # hardcode versions unless set specifically
-KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.3}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.3-rke2r1-build20240717}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.31.0}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.0-rke2r1-build20240815}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.29.3-build20240515}