rework the markers to make kops markers behave the same as kubernetes markers

Author: upodroid

Makefile

@@ -14,12 +14,10 @@
 
 # kops source root directory (without trailing /)
 KOPS_ROOT?=$(patsubst %/,%,$(abspath $(dir $(firstword $(MAKEFILE_LIST)))))
-DOCKER_REGISTRY?=gcr.io/must-override
+DOCKER_IMAGE_REGISTRY?=gcr.io/must-override
 S3_BUCKET?=s3://must-override/
 UPLOAD_DEST?=$(S3_BUCKET)
-GCS_LOCATION?=gs://must-override
-GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
-LATEST_FILE?=latest-ci.txt
+GCS_BUCKET?=gs://must-override
 GOPATH_1ST:=$(shell go env GOPATH)
 UNIQUE:=$(shell date +%s)
 BUILD=$(KOPS_ROOT)/.build
@@ -39,6 +37,16 @@ ifeq ($(GOBIN),)
 GOBIN := $(shell go env GOPATH)/bin
 endif
 
+# We need to create latest.txt for master and latest-X.Y for release branches
+BRANCH ?= $(shell git -C $(KOPS_ROOT) rev-parse --abbrev-ref HEAD)
+ifeq ($(BRANCH),master)
+LATEST_FILE ?= latest.txt
+else ifneq (,$(filter release-1.%,$(BRANCH)))
+LATEST_FILE ?= $(patsubst release-%,latest-%.txt,$(BRANCH))
+else
+LATEST_FILE ?= latest.txt
+endif
+
 # CODEGEN_VERSION is the version of k8s.io/code-generator to use
 CODEGEN_VERSION=v0.34.1
 
@@ -193,18 +201,18 @@ kops: crossbuild-kops-$(shell go env GOOS)-$(shell go env GOARCH)
 .PHONY: crossbuild-kops-linux-amd64 crossbuild-kops-linux-arm64
 crossbuild-kops-linux-amd64 crossbuild-kops-linux-arm64: crossbuild-kops-linux-%:
 	mkdir -p ${DIST}/linux/$*
-	GOOS=linux GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/kops ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" k8s.io/kops/cmd/kops
+	GOOS=linux GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/kops ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION}" k8s.io/kops/cmd/kops
 
 .PHONY: crossbuild-kops-darwin-amd64 crossbuild-kops-darwin-arm64
 crossbuild-kops-darwin-amd64 crossbuild-kops-darwin-arm64: crossbuild-kops-darwin-%:
 	mkdir -p ${DIST}/darwin/$*
-	GOOS=darwin GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/darwin/$*/kops ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" k8s.io/kops/cmd/kops
+	GOOS=darwin GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/darwin/$*/kops ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION}" k8s.io/kops/cmd/kops
 
 
 .PHONY: crossbuild-kops-windows-amd64
 crossbuild-kops-windows-amd64:
 	mkdir -p ${DIST}/windows/amd64
-	GOOS=windows GOARCH=amd64 go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/windows/amd64/kops.exe ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" k8s.io/kops/cmd/kops
+	GOOS=windows GOARCH=amd64 go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/windows/amd64/kops.exe ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION}" k8s.io/kops/cmd/kops
 
 .PHONY: crossbuild
 crossbuild: crossbuild-kops
@@ -215,7 +223,7 @@ crossbuild: crossbuild-kops-linux-amd64 crossbuild-kops-linux-arm64 crossbuild-k
 .PHONY: nodeup-amd64 nodeup-arm64
 nodeup-amd64 nodeup-arm64: nodeup-%:
 	mkdir -p ${DIST}/linux/$*
-	GOOS=linux GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/nodeup ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" k8s.io/kops/cmd/nodeup
+	GOOS=linux GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/nodeup ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION}" k8s.io/kops/cmd/nodeup
 
 .PHONY: nodeup
 nodeup: nodeup-amd64
@@ -226,7 +234,7 @@ crossbuild-nodeup: nodeup-amd64 nodeup-arm64
 .PHONY: protokube-amd64 protokube-arm64
 protokube-amd64 protokube-arm64: protokube-%:
 	mkdir -p ${DIST}/linux/$*
-	GOOS=linux GOARCH=$* go build -tags=peer_name_alternative,peer_name_hash ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/protokube ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" k8s.io/kops/protokube/cmd/protokube
+	GOOS=linux GOARCH=$* go build -tags=peer_name_alternative,peer_name_hash ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/protokube ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION}" k8s.io/kops/protokube/cmd/protokube
 
 .PHONY: protokube
 protokube: protokube-amd64
@@ -237,7 +245,7 @@ crossbuild-protokube: protokube-amd64 protokube-arm64
 .PHONY: channels-amd64 channels-arm64
 channels-amd64 channels-arm64: channels-%:
 	mkdir -p ${DIST}/linux/$*
-	GOOS=linux GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/channels ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" k8s.io/kops/channels/cmd/channels
+	GOOS=linux GOARCH=$* go build ${GCFLAGS} ${BUILDFLAGS} ${EXTRA_BUILDFLAGS} -o ${DIST}/linux/$*/channels ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION}" k8s.io/kops/channels/cmd/channels
 
 .PHONY: channels
 channels: channels-amd64
@@ -251,24 +259,15 @@ upload: version-dist # Upload kops to S3
 
 # gcs-upload builds kops and uploads to GCS
 .PHONY: gcs-upload
-gcs-upload: gsutil version-dist
+gcs-upload: version-dist
 	@echo "== Uploading kops =="
-	gsutil -h "Cache-Control:private, max-age=0, no-transform" -m cp -n -r ${UPLOAD}/kops/* ${GCS_LOCATION}
+	gcloud storage cp -r ${UPLOAD}/kops/* ${GCS_BUCKET}
 
 # gcs-upload-tag runs gcs-upload to upload, then uploads a version-marker to LATEST_FILE
 .PHONY: gcs-upload-and-tag
 gcs-upload-and-tag: gsutil gcs-upload
-	echo "${GCS_URL}${VERSION}" > ${UPLOAD}/latest.txt
-	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
-.PHONY: gcs-publish-ci
-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}
-	echo "VERSION: ${VERSION}"
-	echo "${GCS_URL}/${VERSION}" > ${UPLOAD}/${LATEST_FILE}
-	gsutil -h "Cache-Control:private, max-age=0, no-transform" cp ${UPLOAD}/${LATEST_FILE} ${GCS_LOCATION}
+	echo "${VERSION}" > ${UPLOAD}/${LATEST_FILE}
+	gcloud storage cp ${UPLOAD}/${LATEST_FILE} ${GCS_BUCKET}/${LATEST_FILE}
 
 .PHONY: gen-cli-docs
 gen-cli-docs: kops # Regenerate CLI docs
@@ -300,21 +299,21 @@ push-aws-run-amd64 push-aws-run-arm64: push-aws-run-%: push-%
 
 .PHONY: ${NODEUP}
 ${NODEUP}:
-	go build ${GCFLAGS} ${EXTRA_BUILDFLAGS} ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" -o $@ k8s.io/kops/cmd/nodeup
+	go build ${GCFLAGS} ${EXTRA_BUILDFLAGS} ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION}" -o $@ k8s.io/kops/cmd/nodeup
 
 .PHONY: dns-controller-push
 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_TAG} --platform=linux/amd64,linux/arm64 --bare ./dns-controller/cmd/dns-controller/
+	KO_DOCKER_REPO="${DOCKER_IMAGE_REGISTRY}/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_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-utils-cp/
+	KO_DOCKER_REPO="${DOCKER_IMAGE_REGISTRY}/kops-utils-cp" ${KO} build --tags ${KOPS_UTILS_CP_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-utils-cp/
 
 # --------------------------------------------------
 # development targets
@@ -592,14 +591,6 @@ version-dist: dev-version-dist-amd64 dev-version-dist-arm64 crossbuild
 	cp ${DIST}/windows/amd64/kops.exe ${UPLOAD}/kops/${VERSION}/windows/amd64/kops.exe
 	tools/sha256 ${UPLOAD}/kops/${VERSION}/windows/amd64/kops.exe ${UPLOAD}/kops/${VERSION}/windows/amd64/kops.exe.sha256
 
-# This target skips arm64 and windows kops binary since CI does not use them
-.PHONY: version-dist-ci
-version-dist-ci: dev-version-dist-amd64 dev-version-dist-arm64 crossbuild-kops-linux-amd64
-	mkdir -p ${UPLOAD}/kops/${VERSION}/linux/amd64/
-	cp ${DIST}/linux/amd64/kops ${UPLOAD}/kops/${VERSION}/linux/amd64/kops
-	tools/sha256 ${UPLOAD}/kops/${VERSION}/linux/amd64/kops ${UPLOAD}/kops/${VERSION}/linux/amd64/kops.sha256
-
-
 # prow-postsubmit is run by the prow postsubmit job
 # It uploads a build to a staging directory, which in theory we can publish as a release
 .PHONY: prow-postsubmit
@@ -791,7 +782,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_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-controller/
+	KO_DOCKER_REPO="${DOCKER_IMAGE_REGISTRY}/kops-controller" ${KO} build --tags ${KOPS_CONTROLLER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-controller/
 
 #------------------------------------------------------
 # kube-apiserver-healthcheck
@@ -801,7 +792,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_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kube-apiserver-healthcheck/
+	KO_DOCKER_REPO="${DOCKER_IMAGE_REGISTRY}/kube-apiserver-healthcheck" ${KO} build --tags ${KUBE_APISERVER_HEALTHCHECK_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kube-apiserver-healthcheck/
 
 #------------------------------------------------------
 # discovery-server
@@ -811,7 +802,7 @@ discovery-server-push: ko-discovery-server-push
 
 .PHONY: ko-discovery-server-push
 ko-discovery-server-push:
-	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}discovery-server" ${KO} build --tags ${DISCOVERY_SERVER_TAG} --platform=linux/amd64,linux/arm64 --bare ./discovery/cmd/discovery-server/
+	KO_DOCKER_REPO="${DOCKER_IMAGE_REGISTRY}/discovery-server" ${KO} build --tags ${DISCOVERY_SERVER_TAG} --platform=linux/amd64,linux/arm64 --bare ./discovery/cmd/discovery-server/
 
 #------------------------------------------------------
 # CloudBuild artifacts

cloudbuild.yaml

@@ -4,63 +4,35 @@ options:
   substitution_option: ALLOW_LOOSE
   machineType: "E2_HIGHCPU_32"
 steps:
-  # Push the images
+  # Build & Push the images
   - name: "mirror.gcr.io/library/golang:1.25.7-trixie"
     id: images
     entrypoint: make
     env:
-      # _GIT_TAG is not a valid semver, we use CI=1 instead
-      # - VERSION=$_GIT_TAG
       - CI=$_CI
-      - PULL_BASE_REF=$_PULL_BASE_REF
-      - DOCKER_REGISTRY=$_DOCKER_REGISTRY
-      - DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
+      - DOCKER_IMAGE_REGISTRY=$_DOCKER_IMAGE_REGISTRY
     args:
       - kops-utils-cp-push
       - kops-controller-push
       - dns-controller-push
       - kube-apiserver-healthcheck-push
       - discovery-server-push
-  # Push the artifacts
+  # Build & push the binaries
   - name: "mirror.gcr.io/library/golang:1.25.7-trixie"
-    id: artifacts
+    id: binaries
     entrypoint: make
     env:
       # _GIT_TAG is not a valid semver, we use CI=1 instead
       # - VERSION=$_GIT_TAG
       - CI=$_CI
-      - PULL_BASE_REF=$_PULL_BASE_REF
-      - DOCKER_REGISTRY=$_DOCKER_REGISTRY
-      - DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
-      - GCS_LOCATION=$_GCS_LOCATION
-      - LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
+      - GCS_BUCKET=$_GCS_BUCKET
     args:
       - gcs-upload-and-tag
-  # Build cloudbuild artifacts (for attestation)
-  - name: "mirror.gcr.io/library/golang:1.25.7-trixie"
-    id: cloudbuild-artifacts
-    entrypoint: make
-    env:
-      # _GIT_TAG is not a valid semver, we use CI=1 instead
-      # - VERSION=$_GIT_TAG
-      - CI=$_CI
-      - PULL_BASE_REF=$_PULL_BASE_REF
-      - DOCKER_REGISTRY=$_DOCKER_REGISTRY
-      - DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
-      - GCS_LOCATION=$_GCS_LOCATION
-      - LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
-    args:
-      - cloudbuild-artifacts
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution
   _CI: "1"
   _GIT_TAG: "12345"
   _PULL_BASE_REF: "dev"
-  _DOCKER_REGISTRY: "gcr.io"
-  _DOCKER_IMAGE_PREFIX: "k8s-staging-kops/"
-  _GCS_LOCATION: "gs://k8s-staging-kops/kops/releases/"
-artifacts:
-  objects:
-    location: "$_GCS_LOCATION/$_GIT_TAG/cloudbuild/"
-    paths: ["cloudbuild/*"]
+  _DOCKER_IMAGE_REGISTRY: "gcr.io/k8s-staging-kops"
+  _GCS_BUCKET: "gs://k8s-staging-kops"

hack/set-version

@@ -44,17 +44,9 @@ PATCH=${BASH_REMATCH[2]}
 PRERELEASE=${BASH_REMATCH[4]}
 PRERELEASE_SEQUENCE=${BASH_REMATCH[5]}
 
-if [[ -z "$PRERELEASE" ]]; then
-  NEW_CI_VERSION="${MINOR}."$(($PATCH + 1))
-else
-  NEW_CI_VERSION="${MINOR}.${PATCH}-${PRERELEASE}."$(($PRERELEASE_SEQUENCE + 1))
-fi
-
-KOPS_RELEASE_VERSION=`grep 'KOPS_RELEASE_VERSION\s*=' kops-version.go  | awk '{print $3}' | sed -e 's_"__g'`
-KOPS_CI_VERSION=`grep 'KOPS_CI_VERSION\s*=' kops-version.go  |  awk '{print $3}' | sed -e 's_"__g'`
+KOPS_RELEASE_VERSION=`git describe --always --dirty --tags --match='v*' --abbrev=14`
 
 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_RELEASE_VERSION}@${NEW_RELEASE_VERSION}@g" pkg/nodemodel/wellknownassets/kopsassets_test.go
 
@@ -68,6 +60,3 @@ git grep -l registry.k8s.io/kops/kops-utils-cp | xargs -I {} sed -i.bak -e "s@ko
 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" {}
-
-sed -i.bak -e "s@${KOPS_CI_VERSION}@${NEW_CI_VERSION}@g" kops-version.go
-sed -i.bak -e "s@${KOPS_RELEASE_VERSION}@${NEW_RELEASE_VERSION}@g" kops-version.go

kops-version.go

@@ -19,7 +19,7 @@ package kops
 import "strings"
 
 // Version can be replaced by build tooling
-var Version = KOPS_RELEASE_VERSION
+var Version = "unknown"
 
 // KopsVersionImageTag is like Version, but with + replaced by - (so it can be used in docker tags)
 func KopsVersionImageTag() string {
@@ -28,11 +28,5 @@ func KopsVersionImageTag() string {
 	return strings.ReplaceAll(tag, "+", "-")
 }
 
-// These constants are parsed by build tooling - be careful about changing the formats
-const (
-	KOPS_RELEASE_VERSION = "1.35.0-beta.1"
-	KOPS_CI_VERSION      = "1.35.0-beta.2"
-)
-
 // GitVersion should be replaced by the makefile
 var GitVersion = ""

tests/e2e/kubetest2-kops/builder/build.go

@@ -18,7 +18,6 @@ package builder
 
 import (
 	"fmt"
-	"net/url"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -47,9 +46,6 @@ type BuildResults struct {
 func (b *BuildOptions) Build() (*BuildResults, error) {
 	// We expect to upload to a subdirectory with a version identifier
 	gcsLocation := b.StageLocation
-	if !strings.HasSuffix(gcsLocation, "/") {
-		gcsLocation += "/"
-	}
 
 	results := &BuildResults{}
 
@@ -88,7 +84,7 @@ func (b *BuildOptions) Build() (*BuildResults, error) {
 	env := []string{
 		fmt.Sprintf("HOME=%v", os.Getenv("HOME")),
 		fmt.Sprintf("PATH=%v", os.Getenv("PATH")),
-		fmt.Sprintf("GCS_LOCATION=%v", gcsLocation),
+		fmt.Sprintf("GCS_BUCKET=%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
@@ -107,31 +103,21 @@ func (b *BuildOptions) Build() (*BuildResults, error) {
 	}
 
 	// Get the full path (including subdirectory) that we uploaded to
-	// It is written by gcs-publish-ci to .build/upload/latest-ci.txt
-	latestPath := filepath.Join(b.KopsRoot, ".build", "upload", "latest-ci.txt")
-	kopsBaseURL, err := os.ReadFile(latestPath)
+	// It is written by gcs-publish-ci to .build/upload/latest.txt
+	latestPath := filepath.Join(b.KopsRoot, ".build", "upload", "latest.txt")
+	// kops
+	kopsVersion, err := os.ReadFile(latestPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read file %q: %w", latestPath, err)
 	}
-	u, err := url.Parse(strings.TrimSpace(string(kopsBaseURL)))
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse url %q from file %q: %w", string(kopsBaseURL), latestPath, err)
-	}
-	u.Path = strings.ReplaceAll(u.Path, "//", "/")
-	results = &BuildResults{
-		KopsBaseURL: u.String(),
+	var kopsBaseUrl string
+	if after, ok := strings.CutPrefix(b.StageLocation, "gs://"); ok {
+		kopsBaseUrl = "https://storage.googleapis.com/" + after + "/" + strings.TrimSpace(string(kopsVersion))
 	}
 
-	// Write some meta files so that other tooling can know e.g. KOPS_BASE_URL
-	metaDir := filepath.Join(b.KopsRoot, ".kubetest2")
-	if err := os.MkdirAll(metaDir, 0o755); err != nil {
-		return nil, fmt.Errorf("failed to Mkdir(%q): %w", metaDir, err)
-	}
-	p := filepath.Join(metaDir, "kops-base-url")
-	if err := os.WriteFile(p, []byte(results.KopsBaseURL), 0o644); err != nil {
-		return nil, fmt.Errorf("failed to WriteFile(%q): %w", p, err)
+	results = &BuildResults{
+		KopsBaseURL: kopsBaseUrl,
 	}
-	klog.Infof("wrote file %q with %q", p, results.KopsBaseURL)
 
 	return results, nil
 }

tests/e2e/pkg/kops/download.go

@@ -27,8 +27,8 @@ import (
 )
 
 // DownloadKops will download the kops binary from the version marker URL
-// Returning the URL to use for KOPS_BASE_URL
-// Example markerURL: https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt
+// KOPS_BASE_URL will be set to the contents of marker + marker URL
+// Example markerURL: https://storage.googleapis.com/k8s-staging-kops/kops/latest.txt
 func DownloadKops(markerURL, downloadPath, kopsVersion string) (string, error) {
 	var b bytes.Buffer
 	var kopsBaseURL string
@@ -39,7 +39,11 @@ func DownloadKops(markerURL, downloadPath, kopsVersion string) (string, error) {
 		if err := util.HTTPGETWithHeaders(markerURL, nil, &b); err != nil {
 			return "", err
 		}
-		kopsBaseURL = strings.TrimSpace(b.String())
+		baseURL := markerURL
+		if slash := strings.LastIndex(markerURL, "/"); slash != -1 {
+			baseURL = markerURL[:slash]
+		}
+		kopsBaseURL = baseURL + "/" + strings.TrimSpace(b.String())
 	}
 
 	kopsFile, err := os.Create(downloadPath)