diff --git a/Makefile b/Makefile index 6e493d42da0..69bdaa5b549 100644 --- a/Makefile +++ b/Makefile @@ -536,8 +536,6 @@ $(CALICO_MANIFESTS_DIR): @echo "Fetching Calico release manifests from release artifacts, this might take a minute..." wget -qO- https://github.com/projectcalico/calico/releases/download/$(CALICO_VERSION)/release-$(CALICO_VERSION).tgz | tar xz --directory $(CALICO_RELEASES) $(CALICO_RELEASE_MANIFESTS_DIR) -export AZUREDISK_CSI_DRIVER_VERSION := v1.29.0 - .PHONY: modules modules: ## Runs go mod tidy to ensure proper vendoring. go mod tidy diff --git a/templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml b/templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml index 4f71448eeb6..07afde0faf6 100644 --- a/templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml +++ b/templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml @@ -8,7 +8,6 @@ spec: azuredisk-csi: "true" repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts chartName: azuredisk-csi-driver - version: ${AZUREDISK_CSI_DRIVER_VERSION} releaseName: azuredisk-csi-driver-oot namespace: kube-system valuesTemplate: | diff --git a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml index 37a49bad620..a6b97a786c5 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -242,4 +242,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml index 534abf71354..34a7937dfcf 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml @@ -514,7 +514,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml index 218cfa9055e..3331958192f 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -532,7 +532,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 234b86840cf..5c72f16249a 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -703,7 +703,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index c451a004063..013bdaf70fd 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -298,4 +298,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index 6fc92a8c5b8..8782c06ec51 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -387,4 +387,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index c2bb7641b71..c5bf852d13e 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -282,4 +282,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index 531ca8811d8..2254726d569 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -309,4 +309,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} 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 index bb28f25dd5f..1b2776209aa 100644 --- 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 @@ -418,7 +418,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml index 3b878b6fc30..12a90dee52b 100644 --- a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml +++ b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml @@ -482,7 +482,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index b605d5bca16..ac9e94b5c39 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -404,4 +404,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} 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 index b056d06e038..47fad868a9d 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -637,7 +637,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml index f89925d6cf1..9105375b4a9 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -408,7 +408,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index a307f111693..0947e9a2c30 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -402,7 +402,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index e847170f181..23062dd4383 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -268,4 +268,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index 68825484f99..bfa26ccb463 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -336,7 +336,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml index e858174cfd3..c6e880ded37 100644 --- a/templates/test/ci/cluster-template-prow-topology.yaml +++ b/templates/test/ci/cluster-template-prow-topology.yaml @@ -133,7 +133,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index 690114d9439..d46601ecb24 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -274,4 +274,3 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index f4eb3321d12..e3dcbd88459 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -466,7 +466,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index 81353d119ea..a0e9e815c70 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -585,7 +585,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 464ef82f889..24d17685b52 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -678,7 +678,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: v1 data: diff --git a/test/e2e/cloud-provider-azure.go b/test/e2e/cloud-provider-azure.go index bbe391ecbc9..eee1ddc4b85 100644 --- a/test/e2e/cloud-provider-azure.go +++ b/test/e2e/cloud-provider-azure.go @@ -91,7 +91,7 @@ func EnsureAzureDiskCSIDriverHelmChart(ctx context.Context, input clusterctl.App if hasWindows { options.Values = append(options.Values, "windows.useHostProcessContainers=true") } - InstallHelmChart(ctx, clusterProxy, kubesystem, azureDiskCSIDriverHelmRepoURL, azureDiskCSIDriverChartName, azureDiskCSIDriverHelmReleaseName, options, os.Getenv(AzureDiskCSIDriverVersion)) + InstallHelmChart(ctx, clusterProxy, kubesystem, azureDiskCSIDriverHelmRepoURL, azureDiskCSIDriverChartName, azureDiskCSIDriverHelmReleaseName, options, "") } else { By("Ensuring azure-disk CSI driver is installed via CAAPH") } diff --git a/test/e2e/common.go b/test/e2e/common.go index e4e9bfedc31..d9e3360b2e4 100644 --- a/test/e2e/common.go +++ b/test/e2e/common.go @@ -83,7 +83,6 @@ const ( SecurityScanFailThreshold = "SECURITY_SCAN_FAIL_THRESHOLD" SecurityScanContainer = "SECURITY_SCAN_CONTAINER" CalicoVersion = "CALICO_VERSION" - AzureDiskCSIDriverVersion = "AZUREDISK_CSI_DRIVER_VERSION" ManagedClustersResourceType = "managedClusters" capiImagePublisher = "cncf-upstream" capiOfferName = "capi" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/bases/azuredisk-csi-driver.yaml b/test/e2e/data/infrastructure-azure/v1beta1/bases/azuredisk-csi-driver.yaml index 4f71448eeb6..07afde0faf6 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/bases/azuredisk-csi-driver.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/bases/azuredisk-csi-driver.yaml @@ -8,7 +8,6 @@ spec: azuredisk-csi: "true" repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts chartName: azuredisk-csi-driver - version: ${AZUREDISK_CSI_DRIVER_VERSION} releaseName: azuredisk-csi-driver-oot namespace: kube-system valuesTemplate: | diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml index 0fa61e9de02..3675868068c 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml @@ -16,7 +16,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml index 935150b76f2..2634076849f 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml @@ -16,7 +16,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml index 6daa5f9f8e3..44ad8083fca 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml @@ -16,7 +16,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml index 474d5da56af..bc22c3e24ab 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml @@ -16,7 +16,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml index d53f7bd1447..621d053fa6a 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml @@ -16,7 +16,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml index e776ae8974f..1d3a8a0703f 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml @@ -16,7 +16,6 @@ spec: runOnControlPlane: true windows: useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} - version: ${AZUREDISK_CSI_DRIVER_VERSION} --- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy