Fix promotion of kops-utils-cp

kubernetes · Jun 19, 2023 · 1d0fbfc · 1d0fbfc
1 parent e299cc2
commit 1d0fbfc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -66,7 +66,7 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
 # We lock the versions of our controllers also
 # We need to keep in sync with:
 #   pkg/model/components/etcdmanager/model.go
-KOPS_UTILS_CP_TAG=1.27.0-alpha.2
+KOPS_UTILS_CP_TAG=1.27.0-beta.1
 KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
 #   upup/models/cloudup/resources/addons/dns-controller/
 DNS_CONTROLLER_TAG=1.27.0-beta.1

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -16,6 +16,7 @@ steps:
   - DOCKER_REGISTRY=$_DOCKER_REGISTRY
   - DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
   args:
+  - kops-utils-cp
   - kops-controller-push
   - dns-controller-push
   - kube-apiserver-healthcheck-push

diff --git a/hack/set-version b/hack/set-version
@@ -56,7 +56,7 @@ KOPS_CI_VERSION=`grep 'KOPS_CI_VERSION\s*=' kops-version.go  |  awk '{print $3}'
 echo "KOPS_RELEASE_VERSION ${KOPS_RELEASE_VERSION} -> ${NEW_RELEASE_VERSION}"
 echo "KOPS_CI_VERSION ${KOPS_CI_VERSION} -> ${NEW_CI_VERSION}"
 
-sed -i.bak -e "s@KOPS_COPY_TAG=${KOPS_RELEASE_VERSION}@KOPS_COPY_TAG=${NEW_RELEASE_VERSION}@g" Makefile
+sed -i.bak -e "s@KOPS_UTILS_CP_TAG=${KOPS_RELEASE_VERSION}@KOPS_UTILS_CP_TAG=${NEW_RELEASE_VERSION}@g" Makefile
 sed -i.bak -e "s@DNS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@DNS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile
 sed -i.bak -e "s@KOPS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@KOPS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile
 sed -i.bak -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_APISERVER_HEALTHCHECK_TAG=${NEW_RELEASE_VERSION}@g" Makefile
@@ -69,7 +69,7 @@ git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/ad
 git grep -l registry.k8s.io/kops/kops-controller | xargs -I {} sed -i.bak -e "s@kops-controller:${KOPS_RELEASE_VERSION}@kops-controller:${NEW_RELEASE_VERSION}@g" {}
 git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ | xargs -I {} sed -i.bak -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {}
 
-git grep -l registry.k8s.io/kops/kops-utils-cp | xargs -I {} sed -i.bak -e "s@kops-copy:${KOPS_RELEASE_VERSION}@kops-copy:${NEW_RELEASE_VERSION}@g" {}
+git grep -l registry.k8s.io/kops/kops-utils-cp | xargs -I {} sed -i.bak -e "s@kops-utils-cp:${KOPS_RELEASE_VERSION}@kops-utils-cp:${NEW_RELEASE_VERSION}@g" {}
 git grep -l registry.k8s.io/kops/kube-apiserver-healthcheck | xargs -I {} sed -i.bak -e "s@kube-apiserver-healthcheck:${KOPS_RELEASE_VERSION}@kube-apiserver-healthcheck:${NEW_RELEASE_VERSION}@g" {}
 
 git grep -l "version..${KOPS_RELEASE_VERSION}" upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/ | xargs -I {} sed -i.bak -e "s@version: ${KOPS_RELEASE_VERSION}@version: ${NEW_RELEASE_VERSION}@g" {}

diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
@@ -206,7 +206,7 @@ spec:
     - /opt/bin
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.27.0-alpha.2
+    image: registry.k8s.io/kops/kops-utils-cp:1.27.0-beta.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:

diff --git a/tools/get_workspace_status.sh b/tools/get_workspace_status.sh
@@ -67,10 +67,10 @@ if [[ -z "${DNS_CONTROLLER_TAG}" ]]; then
 fi
 echo "STABLE_DNS_CONTROLLER_TAG ${DNS_CONTROLLER_TAG}"
 
-if [[ -z "${KOPS_COPY_TAG}" ]]; then
-  KOPS_COPY_TAG="${PROTOKUBE_TAG}"
+if [[ -z "${KOPS_UTILS_CP_TAG}" ]]; then
+  KOPS_UTILS_CP_TAG="${PROTOKUBE_TAG}"
 fi
-echo "STABLE_KOPS_COPY_TAG ${KOPS_COPY_TAG}"
+echo "STABLE_KOPS_UTILS_CP_TAG ${KOPS_UTILS_CP_TAG}"
 
 if [[ -z "${KUBE_APISERVER_HEALTHCHECK_TAG}" ]]; then
   KUBE_APISERVER_HEALTHCHECK_TAG="${PROTOKUBE_TAG}"