test/e2e disable capd customImage patch if not no stable version

kubernetes-sigs · May 16, 2022 · ad92ec9 · ad92ec9
1 parent 6a5c02c
commit ad92ec9
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml
@@ -142,8 +142,8 @@ spec:
         valueFrom:
           template: |
             imageTag: {{ .coreDNSImageTag }}
-  - name: customImage
-    description: "Sets the container image that is used for running dockerMachines for the controlPlane and default-worker machineDeployments."
+  - name: customImage-controlPlane
+    description: "Sets the container image that is used for running dockerMachines for the default-worker machineDeployments."
     definitions:
     - selector:
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -158,6 +158,11 @@ spec:
         valueFrom:
           template: |
             kindest/node:{{ .builtin.machineDeployment.version }}
+    # only enable this patch for normal semver versions, not versions which contain `+<commit-sha>`
+    enabledIf: '{{ not (contains "+" .builtin.machineDeployment.version) }}'
+  - name: customImage-machineDeployment
+    description: "Sets the container image that is used for running dockerMachines for the controlPlane."
+    definitions:
     - selector:
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         kind: DockerMachineTemplate
@@ -169,6 +174,8 @@ spec:
         valueFrom:
           template: |
             kindest/node:{{ .builtin.controlPlane.version }}
+    # only enable this patch for normal semver versions, not versions which contain `+<commit-sha>`
+    enabledIf: '{{ not (contains "+" .builtin.controlPlane.version) }}'
   - name: kubeadmControlPlaneMaxSurge
     description: "Sets the maxSurge value used for rolloutStrategy in the KubeadmControlPlane."
     definitions: