Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kubernetes to v1.31.0 #6625

Merged
merged 6 commits into from
Aug 29, 2024
Merged

Update Kubernetes to v1.31.0 #6625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ac8c24
Bump hardened k8s to v1.31.0
dereknola Aug 15, 2024
324d2a5
Update k8s dependencies to 1.31
dereknola Aug 22, 2024
2c3258d
Update old go dependencies
dereknola Aug 22, 2024
c504423
Update lumberjack to new import
dereknola Aug 22, 2024
22f4d6c
Bump vpshere charts
dereknola Aug 28, 2024
f53f4d8
Bump klipper helm
dereknola Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/chart_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer-docs/image_sources.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
| | | | | |
Expand Down
263 changes: 130 additions & 133 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

559 changes: 274 additions & 285 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/logging/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/pebinaryexecutor/pebinary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/rke2/rke2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/windows/service_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@brandond brandond Sep 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

${REGISTRY}/rancher/klipper-lb:v0.4.9
${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.1
Expand Down Expand Up @@ -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
dereknola marked this conversation as resolved.
Show resolved Hide resolved
${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
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading