Merge pull request kubernetes-sigs#1295 from furkatgofurov7/move-to-n…

…ew-repo GCE: Fix k8s deb/rpm image versions revision part based on OBS format
scott-grimes · Sep 14, 2023 · 34910d3 · 34910d3
2 parents 8963d5d + 53c63b5
commit 34910d3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/images/capi/hack/ensure-boskosctl.sh b/images/capi/hack/ensure-boskosctl.sh
@@ -22,7 +22,7 @@ set -o pipefail
 
 if [[ -z "$(command -v boskosctl)" ]]; then
   echo "installing boskosctl"
-  GO111MODULE=on go get sigs.k8s.io/boskos/cmd/boskosctl@master
+  GO111MODULE=on go install sigs.k8s.io/boskos/cmd/boskosctl@master
   echo "'boskosctl' has been installed to $GOPATH/bin, make sure this directory is in your \$PATH"
 fi
 

diff --git a/images/capi/packer/gce/ci/nightly/overwrite-1-24.json b/images/capi/packer/gce/ci/nightly/overwrite-1-24.json
@@ -1,7 +1,7 @@
 {
   "build_timestamp": "nightly",
-  "kubernetes_deb_version": "1.24.15-00",
-  "kubernetes_rpm_version": "1.24.15-0",
+  "kubernetes_deb_version": "1.24.15-1.1",
+  "kubernetes_rpm_version": "1.24.15",
   "kubernetes_semver": "v1.24.15",
   "kubernetes_series": "v1.24",
   "service_account_email": "gcb-builder-cluster-api-gcp@k8s-staging-cluster-api-gcp.iam.gserviceaccount.com"

diff --git a/images/capi/packer/gce/ci/nightly/overwrite-1-25.json b/images/capi/packer/gce/ci/nightly/overwrite-1-25.json
@@ -1,7 +1,7 @@
 {
   "build_timestamp": "nightly",
-  "kubernetes_deb_version": "1.25.11-00",
-  "kubernetes_rpm_version": "1.25.11-0",
+  "kubernetes_deb_version": "1.25.11-1.1",
+  "kubernetes_rpm_version": "1.25.11",
   "kubernetes_semver": "v1.25.11",
   "kubernetes_series": "v1.25",
   "service_account_email": "gcb-builder-cluster-api-gcp@k8s-staging-cluster-api-gcp.iam.gserviceaccount.com"

diff --git a/images/capi/packer/gce/ci/nightly/overwrite-1-26.json b/images/capi/packer/gce/ci/nightly/overwrite-1-26.json
@@ -1,7 +1,7 @@
 {
   "build_timestamp": "nightly",
-  "kubernetes_deb_version": "1.26.6-00",
-  "kubernetes_rpm_version": "1.26.6-0",
+  "kubernetes_deb_version": "1.26.6-1.1",
+  "kubernetes_rpm_version": "1.26.6",
   "kubernetes_semver": "v1.26.6",
   "kubernetes_series": "v1.26",
   "service_account_email": "gcb-builder-cluster-api-gcp@k8s-staging-cluster-api-gcp.iam.gserviceaccount.com"

diff --git a/images/capi/packer/gce/ci/nightly/overwrite-1-27.json b/images/capi/packer/gce/ci/nightly/overwrite-1-27.json
@@ -1,7 +1,7 @@
 {
   "build_timestamp": "nightly",
-  "kubernetes_deb_version": "1.27.3-00",
-  "kubernetes_rpm_version": "1.27.3-0",
+  "kubernetes_deb_version": "1.27.3-1.1",
+  "kubernetes_rpm_version": "1.27.3",
   "kubernetes_semver": "v1.27.3",
   "kubernetes_series": "v1.27",
   "service_account_email": "gcb-builder-cluster-api-gcp@k8s-staging-cluster-api-gcp.iam.gserviceaccount.com"