Merge pull request #17658 from justinsb/one_version

k8s-ci-robot · web-flow · commit 2c07ce66cd3a · 2025-10-19T19:50:08.000-07:00
fix: use kopsbase.Version instead of kopsbase.KOPS_RELEASE_VERSION
diff --git a/Makefile b/Makefile
@@ -54,8 +54,8 @@ unexport AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_STORAGE_ACCOUNT AZURE_SUBSCRI
 
 
 VERSION=$(shell tools/get_version.sh | grep VERSION | awk '{print $$2}')
+IMAGE_TAG=$(shell tools/get_version.sh | grep IMAGE_TAG | awk '{print $$2}')
 
-KOPS_RELEASE_VERSION:=$(shell grep 'KOPS_RELEASE_VERSION\s*=' kops-version.go | awk '{print $$3}' | sed -e 's_"__g')
 KOPS_CI_VERSION:=$(shell grep 'KOPS_CI_VERSION\s*=' kops-version.go | awk '{print $$3}' | sed -e 's_"__g')
 
 # kops local location
@@ -66,17 +66,13 @@ 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.34.0-beta.1
-KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
+KOPS_UTILS_CP_TAG=$(IMAGE_TAG)
 #   upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.34.0-beta.1
-DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
+DNS_CONTROLLER_TAG=$(IMAGE_TAG)
 #   upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
-KOPS_CONTROLLER_TAG=1.34.0-beta.1
-KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
+KOPS_CONTROLLER_TAG=$(IMAGE_TAG)
 #   pkg/model/components/kubeapiserver/model.go
-KUBE_APISERVER_HEALTHCHECK_TAG=1.34.0-beta.1
-KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
+KUBE_APISERVER_HEALTHCHECK_TAG=$(IMAGE_TAG)
 
 CGO_ENABLED=0
 export CGO_ENABLED
@@ -261,9 +257,7 @@ gcs-upload-and-tag: gsutil gcs-upload
 	gsutil -h "Cache-Control:private, max-age=0, no-transform" cp ${UPLOAD}/latest.txt ${GCS_LOCATION}${LATEST_FILE}
 
 # gcs-publish-ci is the entry point for CI testing
-# In CI testing, always upload the CI version.
 .PHONY: gcs-publish-ci
-gcs-publish-ci: VERSION := ${KOPS_CI_VERSION}+${GITSHA}
 gcs-publish-ci: gsutil version-dist-ci
 	@echo "== Uploading kops =="
 	gsutil -h "Cache-Control:private, max-age=0, no-transform" -m cp -n -r ${UPLOAD}/kops/* ${GCS_LOCATION}
@@ -308,14 +302,14 @@ dns-controller-push: ko-dns-controller-push
 
 .PHONY: ko-dns-controller-push
 ko-dns-controller-push:
-	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller" GOFLAGS="-tags=peer_name_alternative,peer_name_hash" ${KO} build --tags ${DNS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./dns-controller/cmd/dns-controller/
+	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller" GOFLAGS="-tags=peer_name_alternative,peer_name_hash" ${KO} build --tags ${DNS_CONTROLLER_TAG} --platform=linux/amd64,linux/arm64 --bare ./dns-controller/cmd/dns-controller/
 
 .PHONY: kops-utils-cp-push
 kops-utils-cp-push: ko-kops-utils-cp-push
 
 .PHONY: ko-kops-utils-cp-push
 ko-kops-utils-cp-push:
-	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-utils-cp" ${KO} build --tags ${KOPS_UTILS_CP_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-utils-cp/
+	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-utils-cp" ${KO} build --tags ${KOPS_UTILS_CP_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-utils-cp/
 
 # --------------------------------------------------
 # development targets
@@ -410,6 +404,8 @@ quick-ci: verify-crds verify-goimports govet verify-boilerplate verify-versions
 # --------------------------------------------------
 # release tasks
 
+KOPS_RELEASE_VERSION:=$(shell grep 'KOPS_RELEASE_VERSION\s*=' kops-version.go | awk '{print $$3}' | sed -e 's_"__g')
+
 .PHONY: release-tag
 release-tag:
 	git tag v${KOPS_RELEASE_VERSION}
@@ -762,7 +758,7 @@ kops-controller-push: ko-kops-controller-push
 
 .PHONY: ko-kops-controller-push
 ko-kops-controller-push:
-	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller" ${KO} build --tags ${KOPS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-controller/
+	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller" ${KO} build --tags ${KOPS_CONTROLLER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-controller/
 
 #------------------------------------------------------
 # kube-apiserver-healthcheck
@@ -772,7 +768,7 @@ kube-apiserver-healthcheck-push: ko-kube-apiserver-healthcheck-push
 
 .PHONY: ko-kube-apiserver-healthcheck-push
 ko-kube-apiserver-healthcheck-push:
-	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck" ${KO} build --tags ${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kube-apiserver-healthcheck/
+	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck" ${KO} build --tags ${KUBE_APISERVER_HEALTHCHECK_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kube-apiserver-healthcheck/
 
 #------------------------------------------------------
 # CloudBuild artifacts
diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go
@@ -907,7 +907,7 @@ func completeZone(options *CreateClusterOptions, rootCommand *RootCmd) func(cmd
 }
 
 func completeKubernetesVersion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	kopsVersion, err := kopsutil.ParseKubernetesVersion(kopsbase.KOPS_RELEASE_VERSION)
+	kopsVersion, err := kopsutil.ParseKubernetesVersion(kopsbase.Version)
 	if err != nil {
 		commandutils.CompletionError("parsing kops version", err)
 	}
diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
@@ -5,4 +5,3 @@
 ./hooks/nvidia-device-plugin/image/files/nvidia-device-plugin.sh
 ./hooks/nvidia-device-plugin/image/run.sh
 ./hooks/prepull-images/image/run.sh
-./tools/get_workspace_status.sh
diff --git a/hack/set-version b/hack/set-version
@@ -56,11 +56,6 @@ 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_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
-sed -i.bak -e "s@\"${KOPS_RELEASE_VERSION}\"@\"${NEW_RELEASE_VERSION}\"@g" upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
 sed -i.bak -e "s@${KOPS_RELEASE_VERSION}@${NEW_RELEASE_VERSION}@g" pkg/nodemodel/wellknownassets/kopsassets_test.go
 
 git grep -l registry.k8s.io/kops/dns-controller | xargs -I {} sed -i.bak -e "s@dns-controller:${KOPS_RELEASE_VERSION}@dns-controller:${NEW_RELEASE_VERSION}@g" {}
diff --git a/kops-version.go b/kops-version.go
@@ -16,9 +16,18 @@ limitations under the License.
 
 package kops
 
+import "strings"
+
 // Version can be replaced by build tooling
 var Version = KOPS_RELEASE_VERSION
 
+// KopsVersionImageTag is like Version, but with + replaced by - (so it can be used in docker tags)
+func KopsVersionImageTag() string {
+	tag := Version
+	// We replace + with - so that we can use the tag in docker image tags
+	return strings.ReplaceAll(tag, "+", "-")
+}
+
 // These constants are parsed by build tooling - be careful about changing the formats
 const (
 	KOPS_RELEASE_VERSION = "1.34.0-beta.1"
diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go
@@ -403,9 +403,9 @@ func (c *Channel) GetPackageVersion(name string, kubernetesVersion *semver.Versi
 		}
 
 		if pkg.KopsVersion != "" {
-			kopsVersion, err := util.ParseVersion(kopsbase.KOPS_RELEASE_VERSION)
+			kopsVersion, err := util.ParseVersion(kopsbase.Version)
 			if err != nil {
-				return nil, fmt.Errorf("parsing kops version %q: %w", kopsbase.KOPS_RELEASE_VERSION, err)
+				return nil, fmt.Errorf("parsing kops version %q: %w", kopsbase.Version, err)
 			}
 
 			versionRange, err := semver.ParseRange(pkg.KopsVersion)
diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
+	kopsversion "k8s.io/kops"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/assets"
 	"k8s.io/kops/pkg/featureflag"
@@ -208,7 +209,7 @@ spec:
     emptyDir: {}
 `
 
-const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1"
+var kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:" + kopsversion.KopsVersionImageTag()
 
 // buildPod creates the pod spec, based on the EtcdClusterSpec
 func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {
diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
+	kopsversion "k8s.io/kops"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/assets"
 	"k8s.io/kops/pkg/k8scodecs"
@@ -80,7 +81,7 @@ kind: Pod
 spec:
   containers:
   - name: healthcheck
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.34.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:%s
     livenessProbe:
       httpGet:
         # The sidecar serves a healthcheck on the same port,
@@ -113,7 +114,7 @@ spec:
 func (b *KubeApiserverBuilder) buildHealthcheckSidecar() (*corev1.Pod, error) {
 	// TODO: pull from bundle
 	bundle := "(embedded kube-apiserver-healthcheck manifest)"
-	manifest := []byte(fmt.Sprintf(defaultManifest, wellknownports.KubeAPIServerHealthCheck))
+	manifest := []byte(fmt.Sprintf(defaultManifest, kopsversion.KopsVersionImageTag(), wellknownports.KubeAPIServerHealthCheck))
 
 	var pod *corev1.Pod
 	var container *corev1.Container
diff --git a/tests/e2e/kubetest2-kops/builder/build.go b/tests/e2e/kubetest2-kops/builder/build.go
@@ -83,15 +83,25 @@ func (b *BuildOptions) Build() (*BuildResults, error) {
 		return results, nil
 	}
 
-	cmd := exec.Command("make", "gcs-publish-ci")
-	cmd.SetEnv(
+	args := []string{"make", "gcs-publish-ci"}
+	cmd := exec.Command(args[0], args[1:]...)
+	env := []string{
 		fmt.Sprintf("HOME=%v", os.Getenv("HOME")),
 		fmt.Sprintf("PATH=%v", os.Getenv("PATH")),
 		fmt.Sprintf("GCS_LOCATION=%v", gcsLocation),
 		fmt.Sprintf("GOPATH=%v", os.Getenv("GOPATH")),
-	)
+	}
+	// We need to "forward" some variables, in particular the variables like "CI" that change the version we use
+	for _, k := range []string{"CI"} {
+		v := os.Getenv(k)
+		if v != "" {
+			env = append(env, fmt.Sprintf("%s=%s", k, v))
+		}
+	}
+	cmd.SetEnv(env...)
 	cmd.SetDir(b.KopsRoot)
 	exec.InheritOutput(cmd)
+	klog.Infof("Executing %q (in %v) with env %v", strings.Join(args, " "), b.KopsRoot, env)
 	if err := cmd.Run(); err != nil {
 		return nil, err
 	}
diff --git a/tools/get_version.sh b/tools/get_version.sh
@@ -44,3 +44,7 @@ if [[ -n "${CI}" ]]; then
 fi
 
 echo "VERSION ${VERSION}"
+
+# IMAGE_TAG is like VERSION, but with + replaced by - (so it can be used in docker tags)
+IMAGE_TAG="${VERSION/+/-}"
+echo "IMAGE_TAG ${IMAGE_TAG}"
diff --git a/tools/get_workspace_status.sh b/tools/get_workspace_status.sh
diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
@@ -6,7 +6,7 @@ metadata:
   labels:
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v{{ KopsVersion }}
+    version: {{ KopsVersionForLabel }}
 spec:
   replicas: 1
   strategy:
@@ -19,7 +19,7 @@ spec:
       labels:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
-        version: v{{ KopsVersion }}
+        version: {{ KopsVersionForLabel }}
     spec:
       priorityClassName: system-cluster-critical
       affinity:
@@ -47,7 +47,7 @@ spec:
       nodeSelector: null
       containers:
       - name: dns-controller
-        image: registry.k8s.io/kops/dns-controller:{{ KopsVersion }}
+        image: registry.k8s.io/kops/dns-controller:{{ KopsVersionImageTag }}
         args:
 {{ range $arg := DnsControllerArgv }}
         - "{{ $arg }}"
diff --git a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
@@ -19,7 +19,7 @@ metadata:
   labels:
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v{{ KopsVersion }}
+    version: {{ KopsVersionForLabel }}
 spec:
   selector:
     matchLabels:
@@ -31,7 +31,7 @@ spec:
       labels:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
-        version: v{{ KopsVersion }}
+        version: {{ KopsVersionForLabel }}
       annotations:
         dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
     spec:
@@ -65,7 +65,7 @@ spec:
       serviceAccount: kops-controller
       containers:
       - name: kops-controller
-        image: registry.k8s.io/kops/kops-controller:{{ KopsVersion }}
+        image: registry.k8s.io/kops/kops-controller:{{ KopsVersionImageTag }}
         volumeMounts:
 {{ if .UseHostCertificates }}
         - mountPath: /etc/ssl/certs
diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go
@@ -930,7 +930,7 @@ func (c *ApplyClusterCmd) validateKubernetesVersion() error {
 		return nil
 	}
 
-	kopsVersion, err := semver.Parse(kopsbase.KOPS_RELEASE_VERSION)
+	kopsVersion, err := semver.Parse(kopsbase.Version)
 	if err != nil {
 		klog.Warningf("unable to parse kops version %q", kopsVersion)
 	} else {
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -410,7 +410,13 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 	dest["IsKubernetesLT"] = tf.IsKubernetesLT
 
 	dest["KopsFeatureEnabled"] = tf.kopsFeatureEnabled
-	dest["KopsVersion"] = func() string { return kopsroot.KOPS_RELEASE_VERSION }
+	dest["KopsVersion"] = func() string { return kopsroot.Version }
+	dest["KopsVersionImageTag"] = func() string { return kopsroot.KopsVersionImageTag() }
+	dest["KopsVersionForLabel"] = func() string {
+		// Labels follow strict rules: a valid label must be an empty string or consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character
+		// By convention we use a v prefix here
+		return "v" + strings.ReplaceAll(kopsroot.Version, "+", "-")
+	}
 
 	dest["ContainerdSELinuxEnabled"] = func() bool {
 		if cluster.Spec.Containerd != nil {

Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,7 @@ func completeZone(options CreateClusterOptions, rootCommand RootCmd) func(cmd`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`func completeKubernetesVersion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`910`		`- kopsVersion, err := kopsutil.ParseKubernetesVersion(kopsbase.KOPS_RELEASE_VERSION)`
	`910`	`+ kopsVersion, err := kopsutil.ParseKubernetesVersion(kopsbase.Version)`
`911`	`911`	`if err != nil {`
`912`	`912`	`commandutils.CompletionError("parsing kops version", err)`
`913`	`913`	`}`
Original file line number	Diff line number	Diff line change
`@@ -403,9 +403,9 @@ func (c Channel) GetPackageVersion(name string, kubernetesVersion semver.Versi`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`if pkg.KopsVersion != "" {`
`406`		`- kopsVersion, err := util.ParseVersion(kopsbase.KOPS_RELEASE_VERSION)`
	`406`	`+ kopsVersion, err := util.ParseVersion(kopsbase.Version)`
`407`	`407`	`if err != nil {`
`408`		`- return nil, fmt.Errorf("parsing kops version %q: %w", kopsbase.KOPS_RELEASE_VERSION, err)`
	`408`	`+ return nil, fmt.Errorf("parsing kops version %q: %w", kopsbase.Version, err)`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`versionRange, err := semver.ParseRange(pkg.KopsVersion)`