Skip to content

Commit

Permalink
Change kube version in image components
Browse files Browse the repository at this point in the history
  • Loading branch information
ardaguclu committed Sep 13, 2024
1 parent e1a41d4 commit 6106ca8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
targets/openshift/deps-gomod.mk \
)

KUBE_GIT_MINOR_VERSION := "30"
KUBE_GIT_VERSION := "v1.30.2"
KUBE_GIT_MINOR_VERSION := "31"
KUBE_GIT_VERSION := "v1.31.1"

GO_LD_EXTRAFLAGS :=-X k8s.io/component-base/version.gitMajor="1" \
-X k8s.io/component-base/version.gitMinor=$(KUBE_GIT_MINOR_VERSION) \
Expand Down
2 changes: 1 addition & 1 deletion images/cli/Dockerfile.rhel
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/
RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done
LABEL io.k8s.display-name="OpenShift Client" \
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
io.openshift.build.versions="kubectl=1.30.2" \
io.openshift.build.versions="kubectl=1.31.1" \
io.openshift.tags="openshift,cli"
2 changes: 1 addition & 1 deletion images/tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ RUN INSTALL_PKGS="\
CMD ["/usr/bin/bash"]
LABEL io.k8s.display-name="OpenShift Tools" \
io.k8s.description="Contains debugging and diagnostic tools for use with an OpenShift cluster." \
io.openshift.build.versions="kubectl=1.30.2" \
io.openshift.build.versions="kubectl=1.31.1" \
io.openshift.tags="openshift,tools"

0 comments on commit 6106ca8

Please sign in to comment.