Skip to content

Commit

Permalink
update k8s and go
Browse files Browse the repository at this point in the history
Signed-off-by: Brian Downs <[email protected]>
  • Loading branch information
briandowns committed Jan 17, 2025
1 parent 42e7846 commit 5d5dc9a
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
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.9b1 AS build
FROM rancher/hardened-build-base:v1.22.10b1 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x && \
@@ -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.29.12-rke2r1-build20241212 AS kubernetes
FROM rancher/hardened-kubernetes:v1.29.12-rke2r1-build20250117 AS kubernetes
FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd
FROM rancher/hardened-crictl:v1.29.0-build20241008 AS crictl
FROM rancher/hardened-runc:v1.2.4-build20250109 AS runc
4 changes: 2 additions & 2 deletions scripts/version.sh
Original file line number Diff line number Diff line change
@@ -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.29.12}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.12-rke2r1-build20241212}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.13}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.12-rke2r1-build20250117}
ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.29.10-0.20241016053521-9510ac25fefb-build20241016}

0 comments on commit 5d5dc9a

Please sign in to comment.