Merge pull request #34252 from chrischdi/pr-add-kind-env-vars

CAPI: add KIND_BUILD_IMAGES variable where no version env vars are set
kubernetes · Feb 3, 2025 · dccfdb8 · dccfdb8
2 parents f5f3964 + 4b2b89e
commit dccfdb8
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 55 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-main
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
-
 - name: periodic-cluster-api-e2e-conformance-main
   cluster: eks-prow-build-cluster
   interval: 3h
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml
@@ -176,6 +176,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -224,6 +227,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -267,6 +273,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -330,7 +339,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
       testgrid-tab-name: capi-pr-e2e-main-1-32-1-33
-
   - name: pull-cluster-api-e2e-conformance-main
     cluster: eks-prow-build-cluster
     labels:
@@ -358,6 +366,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -398,6 +409,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-release-1-7
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
-
 - name: periodic-cluster-api-e2e-conformance-release-1-7
   cluster: eks-prow-build-cluster
   interval: 4h
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml
@@ -176,6 +176,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -224,6 +227,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -267,6 +273,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -330,7 +339,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.7
       testgrid-tab-name: capi-pr-e2e-release-1-7-1-29-1-30
-
   - name: pull-cluster-api-e2e-conformance-release-1-7
     cluster: eks-prow-build-cluster
     labels:
@@ -358,6 +366,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -398,6 +409,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-release-1-8
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
-
 - name: periodic-cluster-api-e2e-conformance-release-1-8
   cluster: eks-prow-build-cluster
   interval: 4h
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml
@@ -176,6 +176,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -224,6 +227,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -267,6 +273,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -330,7 +339,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
       testgrid-tab-name: capi-pr-e2e-release-1-8-1-30-1-31
-
   - name: pull-cluster-api-e2e-conformance-release-1-8
     cluster: eks-prow-build-cluster
     labels:
@@ -358,6 +366,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -398,6 +409,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-release-1-9
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
-
 - name: periodic-cluster-api-e2e-conformance-release-1-9
   cluster: eks-prow-build-cluster
   interval: 4h
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true