Refactor out other helm charts

kubernetes-sigs · May 15, 2023 · 866fcfd · 866fcfd
1 parent 1fdb762
commit 866fcfd
Show file tree

Hide file tree

Showing 40 changed files with 12 additions and 243 deletions.
diff --git a/Makefile b/Makefile
@@ -166,10 +166,6 @@ E2E_CONF_FILE ?= $(ROOT_DIR)/test/e2e/config/azure-dev.yaml
 E2E_CONF_FILE_ENVSUBST := $(ROOT_DIR)/test/e2e/config/azure-dev-envsubst.yaml
 E2E_CLOUD_PROVIDER_AZURE_PATH ?= $(ROOT_DIR)/templates/caaph/cloud-provider-azure.yaml
 E2E_CLOUD_PROVIDER_AZURE_CI_PATH ?= $(ROOT_DIR)/templates/caaph/cloud-provider-azure-ci.yaml
-E2E_CALICO_PATH ?= $(ROOT_DIR)/templates/caaph/calico.yaml
-E2E_CALICO_IPV6_PATH ?= $(ROOT_DIR)/templates/caaph/calico-ipv6.yaml
-E2E_CALICO_DUAL_STACK_PATH ?= $(ROOT_DIR)/templates/caaph/calico-dual-stack.yaml
-E2E_AZUREDISK_CSI_DRIVER ?= $(ROOT_DIR)/templates/caaph/azuredisk-csi-driver.yaml
 
 SKIP_CLEANUP ?= false
 SKIP_LOG_COLLECTION ?= false
@@ -678,10 +674,6 @@ test-e2e-run: generate-e2e-templates install-tools ## Run e2e tests.
     	-e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \
 		-e2e.cloud-provider-azure="$(E2E_CLOUD_PROVIDER_AZURE_PATH)" \
 		-e2e.cloud-provider-azure-ci="$(E2E_CLOUD_PROVIDER_AZURE_CI_PATH)" \
-		-e2e.calico="$(E2E_CALICO_PATH)" \
-		-e2e.calico-ipv6="$(E2E_CALICO_IPV6_PATH)" \
-		-e2e.calico-dual-stack="$(E2E_CALICO_DUAL_STACK_PATH)" \
-		-e2e.azuredisk-csi-driver="$(E2E_AZUREDISK_CSI_DRIVER)" \
     	-e2e.skip-log-collection="$(SKIP_LOG_COLLECTION)" \
     	-e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) $(E2E_ARGS)
 

diff --git a/templates/caaph/azuredisk-csi-driver.yaml b/templates/caaph/azuredisk-csi-driver.yaml
diff --git a/templates/caaph/calico-dual-stack.yaml b/templates/caaph/calico-dual-stack.yaml
diff --git a/templates/caaph/calico-ipv6.yaml b/templates/caaph/calico-ipv6.yaml
diff --git a/templates/caaph/calico.yaml b/templates/caaph/calico.yaml
diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml
diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml
diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml
diff --git a/templates/cluster-template-edgezone.yaml b/templates/cluster-template-edgezone.yaml
diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml
diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml
diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml
diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml
diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml
diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml
diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml
diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default

diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml
@@ -5,8 +5,6 @@ metadata:
   name: ${CLUSTER_NAME}
   labels:
     installCloudProviderAzureChart: "true"
-    installAzureDiskCSIDriverChart: "true"
-    cni: calico
 spec:
   clusterNetwork:
     pods:

diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml
diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml
diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml