From cce46c86a3e13ecc3eb45bdf345437b8757c5c5b Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Fri, 5 Jan 2024 15:51:45 +0000 Subject: [PATCH] remove deprecated kubelet credential provider flag --- docs/book/src/topics/managedcluster.md | 1 - templates/cluster-template-aad.yaml | 1 - templates/cluster-template-azure-bastion.yaml | 1 - templates/cluster-template-azure-cni-v1.yaml | 1 - templates/cluster-template-clusterclass.yaml | 3 --- templates/cluster-template-dual-stack.yaml | 1 - templates/cluster-template-edgezone.yaml | 1 - templates/cluster-template-ephemeral.yaml | 1 - templates/cluster-template-flatcar.yaml | 1 - templates/cluster-template-intree-cloud-provider.yaml | 1 - templates/cluster-template-ipv6.yaml | 1 - templates/cluster-template-nvidia-gpu.yaml | 1 - templates/cluster-template-private.yaml | 1 - templates/cluster-template-windows.yaml | 1 - templates/cluster-template.yaml | 1 - templates/flavors/aad/machine-deployment.yaml | 1 - templates/flavors/clusterclass/kubeadm-config-template.yaml | 1 - .../flavors/clusterclass/kubeadm-controlplane-template.yaml | 2 -- templates/flavors/default/machine-deployment.yaml | 1 - templates/flavors/dual-stack/machine-deployment.yaml | 1 - templates/flavors/flatcar/machine-deployment.yaml | 1 - templates/flavors/ipv6/machine-deployment.yaml | 1 - templates/flavors/nvidia-gpu/machine-deployment.yaml | 1 - templates/test/ci/cluster-template-prow-aks-clusterclass.yaml | 2 -- templates/test/ci/cluster-template-prow-azure-cni-v1.yaml | 1 - .../test/ci/cluster-template-prow-ci-version-dual-stack.yaml | 1 - templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml | 1 - templates/test/ci/cluster-template-prow-ci-version.yaml | 1 - .../ci/cluster-template-prow-clusterclass-ci-default.yaml | 4 ---- templates/test/ci/cluster-template-prow-custom-vnet.yaml | 1 - templates/test/ci/cluster-template-prow-dual-stack.yaml | 1 - templates/test/ci/cluster-template-prow-edgezone.yaml | 1 - templates/test/ci/cluster-template-prow-flatcar.yaml | 1 - .../test/ci/cluster-template-prow-intree-cloud-provider.yaml | 1 - templates/test/ci/cluster-template-prow-ipv6.yaml | 1 - templates/test/ci/cluster-template-prow-nvidia-gpu.yaml | 1 - templates/test/ci/cluster-template-prow-private.yaml | 1 - .../test/ci/cluster-template-prow-workload-identity.yaml | 1 - templates/test/ci/cluster-template-prow.yaml | 1 - templates/test/ci/patches/azurediskcsi-migration-off.yaml | 1 - .../patches/kubeadm-config-template.yaml | 2 -- .../ci/prow-ci-version-ipv6/patches/machine-deployment.yaml | 1 - .../prow-clusterclass-ci-default/kubeadm-config-template.yaml | 1 - templates/test/ci/prow-clusterclass-ci-default/windows.yaml | 1 - .../ci/prow-intree-cloud-provider/patches/intree-md-0.yaml | 1 - .../patches/machine-pool-ci-version.yaml | 1 - templates/test/dev/cluster-template-custom-builds.yaml | 1 - .../dev/custom-builds-machine-pool/patches/custom-builds.yaml | 1 - test/e2e/aks_byo_node.go | 3 +-- .../infrastructure-azure/v1.0.2/cluster-template-prow.yaml | 1 - test/e2e/data/infrastructure-azure/v1beta1/bases/mp.yaml | 1 - .../v1beta1/cluster-template-machine-pool.yaml | 1 - .../v1beta1/cluster-template-upgrades.yaml | 1 - 53 files changed, 1 insertion(+), 62 deletions(-) diff --git a/docs/book/src/topics/managedcluster.md b/docs/book/src/topics/managedcluster.md index e2587cae7bc..fb4f533c62f 100644 --- a/docs/book/src/topics/managedcluster.md +++ b/docs/book/src/topics/managedcluster.md @@ -455,7 +455,6 @@ spec: kubeConfigPath: /etc/kubernetes/admin.conf nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml index 07f530abb2a..46447722f26 100644 --- a/templates/cluster-template-aad.yaml +++ b/templates/cluster-template-aad.yaml @@ -193,7 +193,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml index 98ffb2f540c..9d40288a36d 100644 --- a/templates/cluster-template-azure-bastion.yaml +++ b/templates/cluster-template-azure-bastion.yaml @@ -188,7 +188,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/cluster-template-azure-cni-v1.yaml b/templates/cluster-template-azure-cni-v1.yaml index 4de37fdcc5c..cb554407c20 100644 --- a/templates/cluster-template-azure-cni-v1.yaml +++ b/templates/cluster-template-azure-cni-v1.yaml @@ -194,7 +194,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external max-pods: "110" name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/cluster-template-clusterclass.yaml b/templates/cluster-template-clusterclass.yaml index c68df586f34..d85a122f409 100644 --- a/templates/cluster-template-clusterclass.yaml +++ b/templates/cluster-template-clusterclass.yaml @@ -186,13 +186,11 @@ spec: initConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' mounts: @@ -220,7 +218,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml index bb9034fb186..317b1256d43 100644 --- a/templates/cluster-template-dual-stack.yaml +++ b/templates/cluster-template-dual-stack.yaml @@ -233,7 +233,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: diff --git a/templates/cluster-template-edgezone.yaml b/templates/cluster-template-edgezone.yaml index 54b93177496..e5fbe39b543 100644 --- a/templates/cluster-template-edgezone.yaml +++ b/templates/cluster-template-edgezone.yaml @@ -189,7 +189,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml index 55ec76cf701..9a3071d03bd 100644 --- a/templates/cluster-template-ephemeral.yaml +++ b/templates/cluster-template-ephemeral.yaml @@ -192,7 +192,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml index d5b4255b7ea..fda11498601 100644 --- a/templates/cluster-template-flatcar.yaml +++ b/templates/cluster-template-flatcar.yaml @@ -225,7 +225,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '@@HOSTNAME@@' postKubeadmCommands: [] diff --git a/templates/cluster-template-intree-cloud-provider.yaml b/templates/cluster-template-intree-cloud-provider.yaml index 73c19b643e6..f5f5dbfc020 100644 --- a/templates/cluster-template-intree-cloud-provider.yaml +++ b/templates/cluster-template-intree-cloud-provider.yaml @@ -206,7 +206,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-config: /etc/kubernetes/azure.json cloud-provider: azure feature-gates: CSIMigrationAzureDisk=true diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml index 49d0e3837ca..8be15ffc913 100644 --- a/templates/cluster-template-ipv6.yaml +++ b/templates/cluster-template-ipv6.yaml @@ -248,7 +248,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external cluster-dns: '[fd00::10]' name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml index bb758313b47..f15d2f3aa7a 100644 --- a/templates/cluster-template-nvidia-gpu.yaml +++ b/templates/cluster-template-nvidia-gpu.yaml @@ -204,6 +204,5 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml index 252b03eab1a..c837bec879f 100644 --- a/templates/cluster-template-private.yaml +++ b/templates/cluster-template-private.yaml @@ -200,7 +200,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml index c84d2a1b6af..9ba237f59b5 100644 --- a/templates/cluster-template-windows.yaml +++ b/templates/cluster-template-windows.yaml @@ -190,7 +190,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index 270dd7b3758..2284fe484ac 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -186,7 +186,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/flavors/aad/machine-deployment.yaml b/templates/flavors/aad/machine-deployment.yaml index 2e373f69a40..dd1dc088f83 100644 --- a/templates/flavors/aad/machine-deployment.yaml +++ b/templates/flavors/aad/machine-deployment.yaml @@ -48,7 +48,6 @@ spec: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external files: - contentFrom: diff --git a/templates/flavors/clusterclass/kubeadm-config-template.yaml b/templates/flavors/clusterclass/kubeadm-config-template.yaml index 2991ab7dddd..b3e0e169f94 100644 --- a/templates/flavors/clusterclass/kubeadm-config-template.yaml +++ b/templates/flavors/clusterclass/kubeadm-config-template.yaml @@ -17,7 +17,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] \ No newline at end of file diff --git a/templates/flavors/clusterclass/kubeadm-controlplane-template.yaml b/templates/flavors/clusterclass/kubeadm-controlplane-template.yaml index f749208c36b..30cebe9ac3a 100644 --- a/templates/flavors/clusterclass/kubeadm-controlplane-template.yaml +++ b/templates/flavors/clusterclass/kubeadm-controlplane-template.yaml @@ -50,13 +50,11 @@ spec: initConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' mounts: diff --git a/templates/flavors/default/machine-deployment.yaml b/templates/flavors/default/machine-deployment.yaml index f63d224948a..00d60f6eb19 100644 --- a/templates/flavors/default/machine-deployment.yaml +++ b/templates/flavors/default/machine-deployment.yaml @@ -47,7 +47,6 @@ spec: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external files: - contentFrom: diff --git a/templates/flavors/dual-stack/machine-deployment.yaml b/templates/flavors/dual-stack/machine-deployment.yaml index 8b03448f8d9..3c076d4b60c 100644 --- a/templates/flavors/dual-stack/machine-deployment.yaml +++ b/templates/flavors/dual-stack/machine-deployment.yaml @@ -54,7 +54,6 @@ spec: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external files: - contentFrom: diff --git a/templates/flavors/flatcar/machine-deployment.yaml b/templates/flavors/flatcar/machine-deployment.yaml index da7ea9c889b..f69e0224e20 100644 --- a/templates/flavors/flatcar/machine-deployment.yaml +++ b/templates/flavors/flatcar/machine-deployment.yaml @@ -72,7 +72,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '@@HOSTNAME@@' postKubeadmCommands: [] diff --git a/templates/flavors/ipv6/machine-deployment.yaml b/templates/flavors/ipv6/machine-deployment.yaml index 3b38e7f61b1..72571f63c47 100644 --- a/templates/flavors/ipv6/machine-deployment.yaml +++ b/templates/flavors/ipv6/machine-deployment.yaml @@ -54,7 +54,6 @@ spec: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external cluster-dns: "[fd00::10]" clusterConfiguration: diff --git a/templates/flavors/nvidia-gpu/machine-deployment.yaml b/templates/flavors/nvidia-gpu/machine-deployment.yaml index 80917be61ab..4c8dec327fd 100644 --- a/templates/flavors/nvidia-gpu/machine-deployment.yaml +++ b/templates/flavors/nvidia-gpu/machine-deployment.yaml @@ -48,7 +48,6 @@ spec: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external files: - contentFrom: diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml index 34da32fe61a..586cb025367 100644 --- a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml +++ b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml @@ -221,7 +221,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] @@ -245,7 +244,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] 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 13c47e2a47c..ea4ad6056c3 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -199,7 +199,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external max-pods: "110" name: '{{ ds.meta_data["local_hostname"] }}' 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 d54e6ffcffa..bf33deb5a3b 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 @@ -419,7 +419,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider image-credential-provider-config: /var/lib/kubelet/credential-provider-config.yaml 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 42c8d17d3df..3c5914b4006 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -436,7 +436,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external cluster-dns: '[fd00::10]' image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 1d6937e1a41..2ca63a61b94 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -392,7 +392,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider image-credential-provider-config: /var/lib/kubelet/credential-provider-config.yaml diff --git a/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml b/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml index 7509d09824b..597b991bdc2 100644 --- a/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml +++ b/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml @@ -420,13 +420,11 @@ spec: initConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' mounts: @@ -497,7 +495,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] @@ -541,7 +538,6 @@ spec: nodeRegistration: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: - azure-container-registry-config: c:/k/azure.json cloud-provider: external v: "2" windows-priorityclass: ABOVE_NORMAL_PRIORITY_CLASS diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index 9bc049eecf0..7f86c302731 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -208,7 +208,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index 4600af93359..5a068bc1324 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -244,7 +244,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index 34555412ade..7f040a65913 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -208,7 +208,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index ae815cd63b1..0411339c321 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -232,7 +232,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '@@HOSTNAME@@' postKubeadmCommands: [] 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 f440fdbd32d..9a38ec98721 100644 --- a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml +++ b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml @@ -222,7 +222,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index 1491a80f717..da7bb2b7e34 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -255,7 +255,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external cluster-dns: '[fd00::10]' name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index 3515ed2a321..eeb57d4c845 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -211,7 +211,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index 7e0f6673859..0de601a5860 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -249,7 +249,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index 81df52cc5cc..1b7701cb046 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -200,7 +200,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 69e3b518020..de459d3f466 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -208,7 +208,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/test/ci/patches/azurediskcsi-migration-off.yaml b/templates/test/ci/patches/azurediskcsi-migration-off.yaml index 241ef881aa7..ba3b3aae708 100644 --- a/templates/test/ci/patches/azurediskcsi-migration-off.yaml +++ b/templates/test/ci/patches/azurediskcsi-migration-off.yaml @@ -42,4 +42,3 @@ spec: nodeRegistration: kubeletExtraArgs: feature-gates: CSIMigrationAzureDisk=false - azure-container-registry-config: /etc/kubernetes/azure.json diff --git a/templates/test/ci/prow-aks-clusterclass/patches/kubeadm-config-template.yaml b/templates/test/ci/prow-aks-clusterclass/patches/kubeadm-config-template.yaml index d5b21ef8c3b..18f3d80f4c6 100644 --- a/templates/test/ci/prow-aks-clusterclass/patches/kubeadm-config-template.yaml +++ b/templates/test/ci/prow-aks-clusterclass/patches/kubeadm-config-template.yaml @@ -16,7 +16,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] @@ -39,7 +38,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] diff --git a/templates/test/ci/prow-ci-version-ipv6/patches/machine-deployment.yaml b/templates/test/ci/prow-ci-version-ipv6/patches/machine-deployment.yaml index 37c7a5463aa..97873b88819 100644 --- a/templates/test/ci/prow-ci-version-ipv6/patches/machine-deployment.yaml +++ b/templates/test/ci/prow-ci-version-ipv6/patches/machine-deployment.yaml @@ -14,7 +14,6 @@ spec: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external cluster-dns: "[fd00::10]" clusterConfiguration: diff --git a/templates/test/ci/prow-clusterclass-ci-default/kubeadm-config-template.yaml b/templates/test/ci/prow-clusterclass-ci-default/kubeadm-config-template.yaml index ada8ec7852b..f54a47b90b9 100644 --- a/templates/test/ci/prow-clusterclass-ci-default/kubeadm-config-template.yaml +++ b/templates/test/ci/prow-clusterclass-ci-default/kubeadm-config-template.yaml @@ -17,7 +17,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] \ No newline at end of file diff --git a/templates/test/ci/prow-clusterclass-ci-default/windows.yaml b/templates/test/ci/prow-clusterclass-ci-default/windows.yaml index e676ed1e012..43060236823 100644 --- a/templates/test/ci/prow-clusterclass-ci-default/windows.yaml +++ b/templates/test/ci/prow-clusterclass-ci-default/windows.yaml @@ -28,7 +28,6 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: cloud-provider: external - azure-container-registry-config: 'c:/k/azure.json' v: "2" windows-priorityclass: "ABOVE_NORMAL_PRIORITY_CLASS" files: diff --git a/templates/test/ci/prow-intree-cloud-provider/patches/intree-md-0.yaml b/templates/test/ci/prow-intree-cloud-provider/patches/intree-md-0.yaml index bdf25e4b437..36aeceb28f8 100644 --- a/templates/test/ci/prow-intree-cloud-provider/patches/intree-md-0.yaml +++ b/templates/test/ci/prow-intree-cloud-provider/patches/intree-md-0.yaml @@ -9,6 +9,5 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-config: /etc/kubernetes/azure.json cloud-provider: azure diff --git a/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml b/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml index 1eb2c1db5a9..fdf122f59ef 100644 --- a/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml +++ b/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml @@ -6,7 +6,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider image-credential-provider-config: /var/lib/kubelet/credential-provider-config.yaml diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 561da39f431..b91851e09d9 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -348,7 +348,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider image-credential-provider-config: /var/lib/kubelet/credential-provider-config.yaml diff --git a/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml b/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml index 0b3e321e33d..20dd1334bba 100644 --- a/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml +++ b/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml @@ -6,7 +6,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider image-credential-provider-config: /var/lib/kubelet/credential-provider-config.yaml diff --git a/test/e2e/aks_byo_node.go b/test/e2e/aks_byo_node.go index 7f52044151f..ae3e4ea95c0 100644 --- a/test/e2e/aks_byo_node.go +++ b/test/e2e/aks_byo_node.go @@ -109,8 +109,7 @@ func AKSBYONodeSpec(ctx context.Context, inputGetter func() AKSBYONodeSpecInput) NodeRegistration: bootstrapv1.NodeRegistrationOptions{ Name: "{{ ds.meta_data[\"local_hostname\"] }}", KubeletExtraArgs: map[string]string{ - "cloud-provider": "external", - "azure-container-registry-config": "/etc/kubernetes/azure.json", + "cloud-provider": "external", }, }, }, diff --git a/test/e2e/data/infrastructure-azure/v1.0.2/cluster-template-prow.yaml b/test/e2e/data/infrastructure-azure/v1.0.2/cluster-template-prow.yaml index 635a29b2880..331033304ae 100644 --- a/test/e2e/data/infrastructure-azure/v1.0.2/cluster-template-prow.yaml +++ b/test/e2e/data/infrastructure-azure/v1.0.2/cluster-template-prow.yaml @@ -212,7 +212,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/test/e2e/data/infrastructure-azure/v1beta1/bases/mp.yaml b/test/e2e/data/infrastructure-azure/v1beta1/bases/mp.yaml index e4dc44d3907..0eefd52ae0a 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/bases/mp.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/bases/mp.yaml @@ -58,6 +58,5 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' \ No newline at end of file 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 123305c40d2..1cb2b26351b 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 @@ -67,7 +67,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml index d8174eb9b76..bfa92d2d71b 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml @@ -15,7 +15,6 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' ---