Merge pull request #24314 from sbueringer/pr-upgrae-capi-jobs-to-go-1.17

Upgrade cluster-api job images to Go 1.17
kubernetes · Nov 11, 2021 · ac1c64c · ac1c64c
2 parents 28fa43e + 2de5eb3
commit ac1c64c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml
@@ -17,7 +17,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
       args:
         - runner.sh
         - "./scripts/ci-e2e.sh"
@@ -61,7 +61,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
       args:
         - runner.sh
         - "./scripts/ci-e2e.sh"
@@ -149,7 +149,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
       args:
         - runner.sh
         - "./scripts/ci-e2e.sh"
@@ -193,7 +193,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
       args:
         - runner.sh
         - "./scripts/ci-e2e.sh"

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml
@@ -11,7 +11,7 @@ periodics:
     path_alias: sigs.k8s.io/cluster-api
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
       command:
       - "./scripts/ci-test.sh"
       resources:
@@ -39,7 +39,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
@@ -81,7 +81,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
@@ -116,7 +116,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -148,7 +148,7 @@ periodics:
     path_alias: sigs.k8s.io/cluster-api
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
       command:
       - "runner.sh"
       - "make"

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml
@@ -11,7 +11,7 @@ presubmits:
     - ^main$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         command:
         - runner.sh
         - ./scripts/ci-build.sh
@@ -37,7 +37,7 @@ presubmits:
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         resources:
           requests:
             cpu: 7300m
@@ -59,7 +59,7 @@ presubmits:
       - command:
         - runner.sh
         - ./scripts/ci-apidiff.sh
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
       testgrid-tab-name: capi-pr-apidiff-main
@@ -74,7 +74,7 @@ presubmits:
     - ^main$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         command:
         - "runner.sh"
         - ./scripts/ci-verify.sh
@@ -95,7 +95,7 @@ presubmits:
     - ^main$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
         - runner.sh
         - ./scripts/ci-test.sh
@@ -116,7 +116,7 @@ presubmits:
     - ^main$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
         - runner.sh
         - ./scripts/ci-test.sh
@@ -146,7 +146,7 @@ presubmits:
     run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|scripts|test|third_party|util)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
@@ -175,7 +175,7 @@ presubmits:
     run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|scripts|test|third_party|util)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
@@ -210,7 +210,7 @@ presubmits:
     path_alias: sigs.k8s.io/cluster-api
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
@@ -247,7 +247,7 @@ presubmits:
       path_alias: k8s.io/kubernetes
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-1.22
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211110-cdea54775d-master
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"