From e63dde0bebcafb19050e9ab97be098c48dcc2318 Mon Sep 17 00:00:00 2001 From: Jont828 Date: Mon, 9 Oct 2023 18:14:05 -0400 Subject: [PATCH] Add template to all execept AKS and windows containerd --- .../azuredisk-csi-driver.yaml | 18 +++++++++++++++ .../cluster-template-prow-azure-cni-v1.yaml | 22 +++++++++++++++++++ .../ci/cluster-template-prow-ci-version.yaml | 21 ++++++++++++++++++ .../ci/cluster-template-prow-custom-vnet.yaml | 21 ++++++++++++++++++ .../ci/cluster-template-prow-dual-stack.yaml | 21 ++++++++++++++++++ .../ci/cluster-template-prow-edgezone.yaml | 21 ++++++++++++++++++ .../ci/cluster-template-prow-flatcar.yaml | 21 ++++++++++++++++++ ...ow-intree-cloud-provider-machine-pool.yaml | 21 ++++++++++++++++++ ...r-template-prow-intree-cloud-provider.yaml | 21 ++++++++++++++++++ .../test/ci/cluster-template-prow-ipv6.yaml | 20 +++++++++++++++++ ...template-prow-machine-pool-ci-version.yaml | 21 ++++++++++++++++++ ...uster-template-prow-machine-pool-flex.yaml | 21 ++++++++++++++++++ .../cluster-template-prow-machine-pool.yaml | 21 ++++++++++++++++++ .../ci/cluster-template-prow-nvidia-gpu.yaml | 21 ++++++++++++++++++ .../ci/cluster-template-prow-private.yaml | 21 ++++++++++++++++++ .../ci/cluster-template-prow-topology.yaml | 21 ++++++++++++++++++ ...uster-template-prow-workload-identity.yaml | 21 ++++++++++++++++++ templates/test/ci/cluster-template-prow.yaml | 21 ++++++++++++++++++ .../cluster-label-azuredisk-csi-driver.yaml | 6 +++++ .../ci/prow-azure-cni-v1/kustomization.yaml | 2 ++ .../ci/prow-custom-vnet/kustomization.yaml | 4 +++- .../ci/prow-dual-stack/kustomization.yaml | 2 ++ .../test/ci/prow-edgezone/kustomization.yaml | 4 +++- .../test/ci/prow-flatcar/kustomization.yaml | 2 ++ .../test/ci/prow-ipv6/kustomization.yaml | 2 ++ .../ci/prow-machine-pool/kustomization.yaml | 2 ++ .../ci/prow-nvidia-gpu/kustomization.yaml | 2 ++ .../test/ci/prow-private/kustomization.yaml | 2 ++ .../test/ci/prow-topology/kustomization.yaml | 2 ++ .../prow-workload-identity/kustomization.yaml | 2 ++ templates/test/ci/prow/kustomization.yaml | 2 ++ ...r-template-custom-builds-machine-pool.yaml | 21 ++++++++++++++++++ .../dev/cluster-template-custom-builds.yaml | 21 ++++++++++++++++++ 33 files changed, 449 insertions(+), 2 deletions(-) create mode 100644 templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml create mode 100644 templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml diff --git a/templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml b/templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml new file mode 100644 index 00000000000..84477a97ca1 --- /dev/null +++ b/templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml @@ -0,0 +1,18 @@ +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart +spec: + clusterSelector: + matchLabels: + azureDiskCSI: "true" + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + chartName: azuredisk-csi-driver + releaseName: azuredisk-csi-driver-oot + namespace: kube-system + valuesTemplate: | + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} \ No newline at end of file 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 b6f02f0153c..80196da599e 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -1,6 +1,8 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: + labels: + azureDiskCSI: "true" name: ${CLUSTER_NAME} namespace: default spec: @@ -220,3 +222,23 @@ spec: namespace: ${AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE} tenantID: ${AZURE_TENANT_ID} type: ServicePrincipal +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index f585d35dbbc..d4800a73bab 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -620,6 +621,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: kube-proxy-patch: |- diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index 7ec418a3b04..589440153d7 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico name: ${CLUSTER_NAME} namespace: default @@ -269,3 +270,23 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index f909903ae31..5a75983fead 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico-dual-stack name: ${CLUSTER_NAME} namespace: default @@ -358,3 +359,23 @@ spec: encapsulation: None natOutgoing: Enabled nodeSelector: all() +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index cf006b51d69..2604f168b16 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico name: ${CLUSTER_NAME} namespace: default @@ -253,3 +254,23 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index 2da5fdead9c..1dac6f758e5 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico name: ${CLUSTER_NAME} namespace: default @@ -276,3 +277,23 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} 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 4e966d77878..995540cd976 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 @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -390,6 +391,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: proxy: | 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 311f4c63f1e..2cb3d72bde5 100644 --- a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml +++ b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -454,6 +455,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: proxy: | diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index 31f2a234bac..9dd483db9c9 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -375,3 +375,23 @@ spec: encapsulation: None natOutgoing: Enabled nodeSelector: all(){{end}} +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} 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 df0ca977a4a..69ec5babd29 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 @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -554,6 +555,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: kube-proxy-patch: |- 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 5626bb1704b..b43f24f9c72 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -380,6 +381,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: proxy: | diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index 3e64f4be6d1..5b019be4213 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -374,6 +375,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: proxy: | diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index f7328e44dce..aaaf4b3d857 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico name: ${CLUSTER_NAME} namespace: default @@ -239,3 +240,23 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index 19cdfcfd98c..510347ad6a9 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico name: ${CLUSTER_NAME} namespace: default @@ -308,6 +309,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: resources: | diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml index bcee8016d36..bee4378a44a 100644 --- a/templates/test/ci/cluster-template-prow-topology.yaml +++ b/templates/test/ci/cluster-template-prow-topology.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -105,6 +106,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: proxy: | diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index f323d3c7d2b..85baf1b515a 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico name: ${CLUSTER_NAME} namespace: default @@ -245,3 +246,23 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 182897bccfd..7aa4c610c76 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -438,6 +439,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: proxy: | diff --git a/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml b/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml new file mode 100644 index 00000000000..d54b0bbdda0 --- /dev/null +++ b/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml @@ -0,0 +1,6 @@ +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + name: ${CLUSTER_NAME} + labels: + azureDiskCSI: "true" \ No newline at end of file diff --git a/templates/test/ci/prow-azure-cni-v1/kustomization.yaml b/templates/test/ci/prow-azure-cni-v1/kustomization.yaml index 459a03a481b..fe00ee0a141 100644 --- a/templates/test/ci/prow-azure-cni-v1/kustomization.yaml +++ b/templates/test/ci/prow-azure-cni-v1/kustomization.yaml @@ -3,6 +3,8 @@ kind: Kustomization namespace: default resources: - ../../../flavors/azure-cni-v1/ + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/controller-manager.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-custom-vnet/kustomization.yaml b/templates/test/ci/prow-custom-vnet/kustomization.yaml index a2f400d17af..6f7261db37c 100644 --- a/templates/test/ci/prow-custom-vnet/kustomization.yaml +++ b/templates/test/ci/prow-custom-vnet/kustomization.yaml @@ -5,6 +5,7 @@ resources: - ../../../flavors/default - ../prow/mhc.yaml - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/mhc.yaml @@ -12,4 +13,5 @@ patchesStrategicMerge: - patches/custom-vnet.yaml - ../patches/uami-md-0.yaml - ../patches/uami-control-plane.yaml - - ../patches/cluster-label.yaml \ No newline at end of file + - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-dual-stack/kustomization.yaml b/templates/test/ci/prow-dual-stack/kustomization.yaml index 807798da9fd..817ecece126 100644 --- a/templates/test/ci/prow-dual-stack/kustomization.yaml +++ b/templates/test/ci/prow-dual-stack/kustomization.yaml @@ -5,9 +5,11 @@ resources: - ../../../flavors/dual-stack - machine-pool-dualstack.yaml - ../../../addons/cluster-api-helm/calico-dual-stack.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/controller-manager.yaml - patches/azure-machine-template-control-plane.yaml - patches/azure-machine-template.yaml - patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-edgezone/kustomization.yaml b/templates/test/ci/prow-edgezone/kustomization.yaml index 6ca377b7047..0e70e4f1d76 100644 --- a/templates/test/ci/prow-edgezone/kustomization.yaml +++ b/templates/test/ci/prow-edgezone/kustomization.yaml @@ -4,6 +4,7 @@ namespace: default resources: - ../../../flavors/edgezone - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/controller-manager.yaml @@ -14,4 +15,5 @@ patchesStrategicMerge: - patches/standardssd-disk.yaml - patches/machine-type.yaml - patches/kubernetes-version.yaml - - ../patches/cluster-label.yaml \ No newline at end of file + - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-flatcar/kustomization.yaml b/templates/test/ci/prow-flatcar/kustomization.yaml index a188e84aed3..5d6e7cf89b4 100644 --- a/templates/test/ci/prow-flatcar/kustomization.yaml +++ b/templates/test/ci/prow-flatcar/kustomization.yaml @@ -4,7 +4,9 @@ namespace: default resources: - ../../../flavors/flatcar/ - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/controller-manager.yaml - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-ipv6/kustomization.yaml b/templates/test/ci/prow-ipv6/kustomization.yaml index cea194fef13..0122cf35d02 100644 --- a/templates/test/ci/prow-ipv6/kustomization.yaml +++ b/templates/test/ci/prow-ipv6/kustomization.yaml @@ -5,7 +5,9 @@ resources: - ../../../flavors/ipv6 - machine-pool-ipv6.yaml - ../../../addons/cluster-api-helm/calico-ipv6.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/controller-manager.yaml - patches/cluster-label.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-machine-pool/kustomization.yaml b/templates/test/ci/prow-machine-pool/kustomization.yaml index c775226abfa..ecb5d26924b 100644 --- a/templates/test/ci/prow-machine-pool/kustomization.yaml +++ b/templates/test/ci/prow-machine-pool/kustomization.yaml @@ -7,6 +7,7 @@ resources: - ../../../addons/windows/csi-proxy/csi-proxy-resource-set.yaml - ../../../addons/windows/containerd-logging/containerd-logger-resource-set.yaml - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/azuremachinepool-vmextension.yaml - ../patches/tags.yaml @@ -14,6 +15,7 @@ patchesStrategicMerge: - ../patches/machine-pool-worker-counts.yaml - ../patches/windows-containerd-labels.yaml - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml configMapGenerator: - name: cni-${CLUSTER_NAME}-calico-windows files: diff --git a/templates/test/ci/prow-nvidia-gpu/kustomization.yaml b/templates/test/ci/prow-nvidia-gpu/kustomization.yaml index 2f8cd589864..ab9f0e3e62f 100644 --- a/templates/test/ci/prow-nvidia-gpu/kustomization.yaml +++ b/templates/test/ci/prow-nvidia-gpu/kustomization.yaml @@ -4,11 +4,13 @@ namespace: default resources: - ../../../flavors/nvidia-gpu - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/controller-manager.yaml - ../patches/azurecluster-gpu.yaml - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml patches: - path: patches/node-storage-type.yaml target: diff --git a/templates/test/ci/prow-private/kustomization.yaml b/templates/test/ci/prow-private/kustomization.yaml index 8bdcb3821d4..c49e7e11a09 100644 --- a/templates/test/ci/prow-private/kustomization.yaml +++ b/templates/test/ci/prow-private/kustomization.yaml @@ -5,6 +5,7 @@ resources: - ../../../flavors/private - cni-resource-set.yaml - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/controller-manager.yaml @@ -15,6 +16,7 @@ patchesStrategicMerge: - ../prow-intree-cloud-provider/patches/intree-cp.yaml # TODO: remove once CAPI supports Helm addons - ../prow-intree-cloud-provider/patches/intree-md-0.yaml # TODO: remove once CAPI supports Helm addons - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml patches: - path: patches/user-assigned.yaml target: diff --git a/templates/test/ci/prow-topology/kustomization.yaml b/templates/test/ci/prow-topology/kustomization.yaml index 60a8aa47928..238e4ac3db8 100644 --- a/templates/test/ci/prow-topology/kustomization.yaml +++ b/templates/test/ci/prow-topology/kustomization.yaml @@ -6,10 +6,12 @@ resources: - cni-resource-set.yaml - ../../../addons/windows/csi-proxy/csi-proxy-resource-set.yaml - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/windows-containerd-labels.yaml - cluster.yaml - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml configMapGenerator: - name: cni-${CLUSTER_NAME}-calico-windows files: diff --git a/templates/test/ci/prow-workload-identity/kustomization.yaml b/templates/test/ci/prow-workload-identity/kustomization.yaml index a86b5c67cde..40467ad07ee 100644 --- a/templates/test/ci/prow-workload-identity/kustomization.yaml +++ b/templates/test/ci/prow-workload-identity/kustomization.yaml @@ -4,6 +4,7 @@ namespace: default resources: - ../../../flavors/default - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/azureclusteridentity-azwi.yaml - ../patches/tags.yaml @@ -12,3 +13,4 @@ patchesStrategicMerge: - ../patches/uami-md-0.yaml - ../patches/uami-control-plane.yaml - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml index 63563fcf5f7..0cdbcd27b2e 100644 --- a/templates/test/ci/prow/kustomization.yaml +++ b/templates/test/ci/prow/kustomization.yaml @@ -11,6 +11,7 @@ resources: - ../../../addons/windows/csi-proxy/csi-proxy-resource-set.yaml - ../../../addons/windows/containerd-logging/containerd-logger-resource-set.yaml - ../../../addons/cluster-api-helm/calico.yaml + - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml patchesStrategicMerge: - ../patches/tags.yaml - ../patches/mhc.yaml @@ -22,6 +23,7 @@ patchesStrategicMerge: - ../patches/windows-containerd-labels.yaml - ../patches/windows-server-version.yaml - ../patches/cluster-label.yaml + - ../patches/cluster-label-azuredisk-csi-driver.yaml patches: - target: group: bootstrap.cluster.x-k8s.io 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 2048f04b4a7..ee8c924745d 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -502,6 +503,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: kube-proxy-patch: |- diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 44299c7ab59..7e8119e117e 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -2,6 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: + azureDiskCSI: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled @@ -567,6 +568,26 @@ spec: - cidr: {{ $cidr }} encapsulation: VXLAN{{end}} --- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: azuredisk-csi-driver-chart + namespace: default +spec: + chartName: azuredisk-csi-driver + clusterSelector: + matchLabels: + azureDiskCSI: "true" + namespace: kube-system + releaseName: azuredisk-csi-driver-oot + repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts + valuesTemplate: |- + controller: + replicas: 1 + runOnControlPlane: true + windows: + useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }} +--- apiVersion: v1 data: kube-proxy-patch: |-