test/e2e/data/infrastructure-docker drop imageRepository

kubernetes-sigs · Jul 14, 2022 · b3e6958 · b3e6958
1 parent de59e44
commit b3e6958
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 47 deletions.
diff --git a/test/e2e/data/infrastructure-docker/v1beta1/bases/cluster-with-topology.yaml b/test/e2e/data/infrastructure-docker/v1beta1/bases/cluster-with-topology.yaml
@@ -25,9 +25,6 @@ spec:
         replicas: ${WORKER_MACHINE_COUNT}
         failureDomain: fd4
     variables:
-    # The imageRepository variable is defaulted by the Cluster webhook.
-    #- name: imageRepository
-    #  value: k8s.gcr.io
     - name: etcdImageTag
       # We set an empty value to use the default tag kubeadm init is using.
       value: ""

diff --git a/test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start-runtimesdk.yaml b/test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start-runtimesdk.yaml
@@ -39,14 +39,6 @@ spec:
       openAPIV3Schema:
         type: string
         default: kindest
-  - name: imageRepository
-    required: true
-    schema:
-      openAPIV3Schema:
-        type: string
-        default: ""
-        example: "registry.k8s.io"
-        description: "imageRepository sets the container registry to pull images from. If empty, nothing will be set and the from of kubeadm will be used."
   - name: etcdImageTag
     required: true
     schema:
@@ -76,20 +68,6 @@ spec:
     external:
       generateExtension: generate-patches.k8s-upgrade-with-runtimesdk
       validateExtension: validate-topology.k8s-upgrade-with-runtimesdk
-  - name: imageRepository
-    description: "Sets the imageRepository used for the KubeadmControlPlane."
-    enabledIf: '{{ ne .imageRepository "" }}'
-    definitions:
-    - selector:
-        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-        kind: KubeadmControlPlaneTemplate
-        matchResources:
-          controlPlane: true
-      jsonPatches:
-      - op: add
-        path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/imageRepository"
-        valueFrom:
-          variable: imageRepository
   # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd.
   - name: cgroupDriver-controlPlane
     description: |

diff --git a/test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml
@@ -51,14 +51,6 @@ spec:
       openAPIV3Schema:
         type: string
         default: kindest
-  - name: imageRepository
-    required: true
-    schema:
-      openAPIV3Schema:
-        type: string
-        default: ""
-        example: "registry.k8s.io"
-        description: "imageRepository sets the container registry to pull images from. If empty, nothing will be set and the from of kubeadm will be used."
   - name: etcdImageTag
     required: true
     schema:
@@ -97,20 +89,6 @@ spec:
         valueFrom:
           template: |
             imageRepository: {{ .lbImageRepository }}
-  - name: imageRepository
-    description: "Sets the imageRepository used for the KubeadmControlPlane."
-    enabledIf: '{{ ne .imageRepository "" }}'
-    definitions:
-    - selector:
-        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-        kind: KubeadmControlPlaneTemplate
-        matchResources:
-          controlPlane: true
-      jsonPatches:
-      - op: add
-        path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/imageRepository"
-        valueFrom:
-          variable: imageRepository
   # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd.
   - name: cgroupDriver-controlPlane
     description: |