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

[release-1.26] update rke2 #4368

Merged
merged 3 commits into from Jun 15, 2023
Merged

[release-1.26] update rke2 #4368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9ffce1
update rke2
briandowns Jun 14, 2023
a517c49
update go
briandowns Jun 14, 2023
b3a943d
test fix
briandowns Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ RUN rm -vf /charts/*.sh /charts/*.md
# 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.26.5-rke2r1-build20230518 AS kubernetes
FROM rancher/hardened-kubernetes:v1.26.6-rke2r1-build20230614 AS kubernetes
FROM rancher/hardened-containerd:v1.7.1-k3s1-build20230511 AS containerd
FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl
FROM rancher/hardened-runc:v1.1.7-build20230511 AS runc
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
View file
Open in desktop
Expand Up @@ -31,8 +31,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.26.5}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.5-rke2r1-build20230518}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.6}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.6-rke2r1-build20230614}
ETCD_VERSION=${ETCD_VERSION:-v3.5.7-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}
Expand Down