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

[v1.28] September K8s patch #6809

Merged
merged 2 commits into from
Sep 12, 2024
Merged

[v1.28] September K8s patch #6809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5398aaf
update k8s version
rafaelbreno Sep 12, 2024
43b0470
update build-base version
rafaelbreno Sep 12, 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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG KUBERNETES_VERSION=dev

# Build environment
FROM rancher/hardened-build-base:v1.22.5b1 AS build
FROM rancher/hardened-build-base:v1.22.6b1 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x && \
Expand Down 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.28.13-rke2r1-build20240910 AS kubernetes
FROM rancher/hardened-kubernetes:v1.28.14-rke2r1-build20240912 AS kubernetes
FROM rancher/hardened-containerd:v1.7.21-k3s2-build20240910 AS containerd
FROM rancher/hardened-crictl:v1.28.0-build20240910 AS crictl
FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc
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.28.13}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.13-rke2r1-build20240815}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.14}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.14-rke2r1-build20240912}
ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.28.13-build20240910}
Expand Down