diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml index 5e7705edfd6..2ee92c5a40d 100644 --- a/templates/cluster-template-aad.yaml +++ b/templates/cluster-template-aad.yaml @@ -51,6 +51,7 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external oidc-client-id: ${AZURE_SERVER_APP_ID} oidc-groups-claim: groups oidc-issuer-url: https://sts.windows.net/${AZURE_TENANT_ID}/ @@ -60,6 +61,7 @@ spec: controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -95,11 +97,13 @@ spec: 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: - - LABEL=etcd_disk @@ -192,6 +196,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml index d8360c9f421..e922f76a8cc 100644 --- a/templates/cluster-template-azure-bastion.yaml +++ b/templates/cluster-template-azure-bastion.yaml @@ -52,10 +52,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -91,11 +94,13 @@ spec: 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: - - LABEL=etcd_disk @@ -186,6 +191,7 @@ spec: 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 2f863d787a8..1a72e1a0eca 100644 --- a/templates/cluster-template-dual-stack.yaml +++ b/templates/cluster-template-dual-stack.yaml @@ -64,10 +64,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "true" + cloud-provider: external cluster-cidr: 10.244.0.0/16,2001:1234:5678:9a40::/58 cluster-name: ${CLUSTER_NAME} configure-cloud-routes: "true" @@ -107,6 +110,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' joinConfiguration: controlPlane: @@ -115,6 +119,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' mounts: - - LABEL=etcd_disk @@ -229,6 +234,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml index 2eb33131d9d..b815021e241 100644 --- a/templates/cluster-template-ephemeral.yaml +++ b/templates/cluster-template-ephemeral.yaml @@ -50,10 +50,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -89,11 +92,13 @@ spec: 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: - - LABEL=etcd_disk @@ -190,6 +195,7 @@ spec: 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-external-cloud-provider-machinepool.yaml b/templates/cluster-template-external-cloud-provider-machinepool.yaml deleted file mode 100644 index 77c8ead0470..00000000000 --- a/templates/cluster-template-external-cloud-provider-machinepool.yaml +++ /dev/null @@ -1,218 +0,0 @@ -apiVersion: cluster.x-k8s.io/v1beta1 -kind: Cluster -metadata: - name: ${CLUSTER_NAME} - namespace: default -spec: - clusterNetwork: - pods: - cidrBlocks: - - 192.168.0.0/16 - controlPlaneRef: - apiVersion: controlplane.cluster.x-k8s.io/v1beta1 - kind: KubeadmControlPlane - name: ${CLUSTER_NAME}-control-plane - infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 - kind: AzureCluster - name: ${CLUSTER_NAME} ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 -kind: AzureCluster -metadata: - name: ${CLUSTER_NAME} - namespace: default -spec: - identityRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 - kind: AzureClusterIdentity - name: ${CLUSTER_IDENTITY_NAME} - location: ${AZURE_LOCATION} - networkSpec: - subnets: - - name: control-plane-subnet - role: control-plane - - name: node-subnet - natGateway: - name: node-natgateway - role: node - vnet: - name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} - resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} - subscriptionID: ${AZURE_SUBSCRIPTION_ID} ---- -apiVersion: controlplane.cluster.x-k8s.io/v1beta1 -kind: KubeadmControlPlane -metadata: - name: ${CLUSTER_NAME}-control-plane - namespace: default -spec: - kubeadmConfigSpec: - clusterConfiguration: - apiServer: - extraArgs: - cloud-provider: external - timeoutForControlPlane: 20m - controllerManager: - extraArgs: - allocate-node-cidrs: "false" - cloud-provider: external - cluster-name: ${CLUSTER_NAME} - external-cloud-volume-plugin: azure - feature-gates: CSIMigrationAzureDisk=true - etcd: - local: - dataDir: /var/lib/etcddisk/etcd - extraArgs: - quota-backend-bytes: "8589934592" - diskSetup: - filesystems: - - device: /dev/disk/azure/scsi1/lun0 - extraOpts: - - -E - - lazy_itable_init=1,lazy_journal_init=1 - filesystem: ext4 - label: etcd_disk - - device: ephemeral0.1 - filesystem: ext4 - label: ephemeral0 - replaceFS: ntfs - partitions: - - device: /dev/disk/azure/scsi1/lun0 - layout: true - overwrite: false - tableType: gpt - files: - - contentFrom: - secret: - key: control-plane-azure.json - name: ${CLUSTER_NAME}-control-plane-azure-json - owner: root:root - path: /etc/kubernetes/azure.json - permissions: "0644" - initConfiguration: - nodeRegistration: - kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json - cloud-provider: external - feature-gates: CSIMigrationAzureDisk=true - name: '{{ ds.meta_data["local_hostname"] }}' - joinConfiguration: - nodeRegistration: - kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json - cloud-provider: external - feature-gates: CSIMigrationAzureDisk=true - name: '{{ ds.meta_data["local_hostname"] }}' - mounts: - - - LABEL=etcd_disk - - /var/lib/etcddisk - postKubeadmCommands: [] - preKubeadmCommands: [] - machineTemplate: - infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 - kind: AzureMachineTemplate - name: ${CLUSTER_NAME}-control-plane - replicas: ${CONTROL_PLANE_MACHINE_COUNT} - version: ${KUBERNETES_VERSION} ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 -kind: AzureMachineTemplate -metadata: - name: ${CLUSTER_NAME}-control-plane - namespace: default -spec: - template: - spec: - dataDisks: - - diskSizeGB: 256 - lun: 0 - nameSuffix: etcddisk - osDisk: - diskSizeGB: 128 - osType: Linux - sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""} - vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE} ---- -apiVersion: cluster.x-k8s.io/v1beta1 -kind: MachinePool -metadata: - name: ${CLUSTER_NAME}-mp-0 - namespace: default -spec: - clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} - template: - spec: - bootstrap: - configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 - kind: KubeadmConfig - name: ${CLUSTER_NAME}-mp-0 - clusterName: ${CLUSTER_NAME} - infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 - kind: AzureMachinePool - name: ${CLUSTER_NAME}-mp-0 - version: ${KUBERNETES_VERSION} ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 -kind: AzureMachinePool -metadata: - name: ${CLUSTER_NAME}-mp-0 - namespace: default -spec: - location: ${AZURE_LOCATION} - orchestrationMode: Flexible - strategy: - rollingUpdate: - maxSurge: 0% - maxUnavailable: 0 - type: RollingUpdate - template: - osDisk: - diskSizeGB: 30 - managedDisk: - storageAccountType: Premium_LRS - osType: Linux - sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""} - vmSize: ${AZURE_NODE_MACHINE_TYPE} ---- -apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 -kind: KubeadmConfig -metadata: - name: ${CLUSTER_NAME}-mp-0 - namespace: default -spec: - files: - - contentFrom: - secret: - key: worker-node-azure.json - name: ${CLUSTER_NAME}-mp-0-azure-json - owner: root:root - path: /etc/kubernetes/azure.json - permissions: "0644" - joinConfiguration: - nodeRegistration: - kubeletExtraArgs: - azure-container-registry-config: /etc/kubernetes/azure.json - cloud-provider: external - feature-gates: CSIMigrationAzureDisk=true - name: '{{ ds.meta_data["local_hostname"] }}' ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 -kind: AzureClusterIdentity -metadata: - labels: - clusterctl.cluster.x-k8s.io/move-hierarchy: "true" - name: ${CLUSTER_IDENTITY_NAME} - namespace: default -spec: - allowedNamespaces: {} - clientID: ${AZURE_CLIENT_ID} - clientSecret: - name: ${AZURE_CLUSTER_IDENTITY_SECRET_NAME} - namespace: ${AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE} - tenantID: ${AZURE_TENANT_ID} - type: ServicePrincipal diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml index 12a83587ff2..697817b9c62 100644 --- a/templates/cluster-template-flatcar.yaml +++ b/templates/cluster-template-flatcar.yaml @@ -50,10 +50,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -102,11 +105,13 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '@@HOSTNAME@@' joinConfiguration: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '@@HOSTNAME@@' mounts: - - etcd_disk @@ -221,6 +226,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '@@HOSTNAME@@' postKubeadmCommands: [] preKubeadmCommands: diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml index adc3870a13c..52d60d2da16 100644 --- a/templates/cluster-template-ipv6.yaml +++ b/templates/cluster-template-ipv6.yaml @@ -64,11 +64,13 @@ spec: apiServer: extraArgs: bind-address: '::' + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "true" bind-address: '::' + cloud-provider: external cluster-cidr: 2001:1234:5678:9a40::/58 cluster-name: ${CLUSTER_NAME} configure-cloud-routes: "true" @@ -112,6 +114,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external cluster-dns: fd00::10 node-ip: '::' name: '{{ ds.meta_data["local_hostname"] }}' @@ -123,6 +126,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external cluster-dns: fd00::10 node-ip: '::' name: '{{ ds.meta_data["local_hostname"] }}' @@ -231,9 +235,11 @@ spec: apiServer: extraArgs: bind-address: '::' + cloud-provider: external controllerManager: extraArgs: bind-address: '::' + cloud-provider: external scheduler: extraArgs: bind-address: '::' @@ -249,6 +255,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external cluster-dns: '[fd00::10]' node-ip: '::' name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml index f2d57fc2a38..d9052ba84be 100644 --- a/templates/cluster-template-machinepool-windows.yaml +++ b/templates/cluster-template-machinepool-windows.yaml @@ -55,11 +55,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: WindowsHostProcessContainers=true timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -95,11 +97,13 @@ spec: 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: - - LABEL=etcd_disk @@ -194,6 +198,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -274,6 +279,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml index 6e98b97fa4f..5f01ddae9ef 100644 --- a/templates/cluster-template-machinepool.yaml +++ b/templates/cluster-template-machinepool.yaml @@ -50,10 +50,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -89,11 +92,13 @@ spec: 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: - - LABEL=etcd_disk @@ -188,6 +193,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml index c13bf8052ed..6a74c18657f 100644 --- a/templates/cluster-template-nvidia-gpu.yaml +++ b/templates/cluster-template-nvidia-gpu.yaml @@ -50,10 +50,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -89,11 +92,13 @@ spec: 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: - - LABEL=etcd_disk @@ -202,4 +207,5 @@ spec: 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 069d9fcf296..e8a8ba7b51f 100644 --- a/templates/cluster-template-private.yaml +++ b/templates/cluster-template-private.yaml @@ -59,10 +59,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -98,11 +101,13 @@ spec: 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: - - LABEL=etcd_disk @@ -198,6 +203,7 @@ spec: 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 df4f4e7563a..ac94f38119d 100644 --- a/templates/cluster-template-windows.yaml +++ b/templates/cluster-template-windows.yaml @@ -55,11 +55,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: WindowsHostProcessContainers=true timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -95,11 +97,13 @@ spec: 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: - - LABEL=etcd_disk @@ -190,6 +194,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] --- @@ -280,6 +285,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true v: "2" windows-priorityclass: ABOVE_NORMAL_PRIORITY_CLASS diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index 9522c1eb18a..4fc41f16cb9 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -50,10 +50,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} etcd: local: @@ -89,11 +92,13 @@ spec: 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: - - LABEL=etcd_disk @@ -184,6 +189,7 @@ spec: 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 a144dd80bef..2e373f69a40 100644 --- a/templates/flavors/aad/machine-deployment.yaml +++ b/templates/flavors/aad/machine-deployment.yaml @@ -49,6 +49,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external files: - contentFrom: secret: diff --git a/templates/flavors/aad/patches/kubeadm-controlplane.yaml b/templates/flavors/aad/patches/kubeadm-controlplane.yaml index 21e39645720..8dde2f89450 100644 --- a/templates/flavors/aad/patches/kubeadm-controlplane.yaml +++ b/templates/flavors/aad/patches/kubeadm-controlplane.yaml @@ -9,11 +9,13 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external joinConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external clusterConfiguration: apiServer: timeoutForControlPlane: 20m diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml index c0a25a178a5..679eda71982 100644 --- a/templates/flavors/base/cluster-template.yaml +++ b/templates/flavors/base/cluster-template.yaml @@ -52,18 +52,23 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external joinConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external clusterConfiguration: apiServer: timeoutForControlPlane: 20m + extraArgs: + cloud-provider: external controllerManager: extraArgs: allocate-node-cidrs: "false" cluster-name: ${CLUSTER_NAME} + cloud-provider: external etcd: local: dataDir: "/var/lib/etcddisk/etcd" diff --git a/templates/flavors/default/machine-deployment.yaml b/templates/flavors/default/machine-deployment.yaml index a65027010f9..f63d224948a 100644 --- a/templates/flavors/default/machine-deployment.yaml +++ b/templates/flavors/default/machine-deployment.yaml @@ -48,6 +48,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external files: - contentFrom: secret: diff --git a/templates/flavors/dual-stack/machine-deployment.yaml b/templates/flavors/dual-stack/machine-deployment.yaml index 141ca210fbc..f3c56ca609e 100644 --- a/templates/flavors/dual-stack/machine-deployment.yaml +++ b/templates/flavors/dual-stack/machine-deployment.yaml @@ -55,6 +55,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external files: - contentFrom: secret: diff --git a/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml b/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml index 3f28f807177..29e0525e140 100644 --- a/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml +++ b/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml @@ -14,6 +14,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external localAPIEndpoint: bindPort: 6443 joinConfiguration: @@ -21,6 +22,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external controlPlane: localAPIEndpoint: bindPort: 6443 @@ -33,3 +35,4 @@ spec: allocate-node-cidrs: "true" cluster-cidr: "10.244.0.0/16,2001:1234:5678:9a40::/58" configure-cloud-routes: "true" + cloud-provider: external diff --git a/templates/flavors/flatcar/machine-deployment.yaml b/templates/flavors/flatcar/machine-deployment.yaml index 8add7cef2fd..59ccfde5794 100644 --- a/templates/flavors/flatcar/machine-deployment.yaml +++ b/templates/flavors/flatcar/machine-deployment.yaml @@ -71,6 +71,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '@@HOSTNAME@@' postKubeadmCommands: [] preKubeadmCommands: diff --git a/templates/flavors/ipv6/machine-deployment.yaml b/templates/flavors/ipv6/machine-deployment.yaml index 9d2b1e644ed..2f7ae090701 100644 --- a/templates/flavors/ipv6/machine-deployment.yaml +++ b/templates/flavors/ipv6/machine-deployment.yaml @@ -57,13 +57,16 @@ spec: azure-container-registry-config: /etc/kubernetes/azure.json node-ip: "::" cluster-dns: "[fd00::10]" + cloud-provider: external clusterConfiguration: apiServer: extraArgs: bind-address: "::" + cloud-provider: external controllerManager: extraArgs: bind-address: "::" + cloud-provider: external scheduler: extraArgs: bind-address: "::" diff --git a/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml b/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml index 73d5c8819f9..e403e0a3b2a 100644 --- a/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml +++ b/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml @@ -14,6 +14,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external node-ip: "::" cluster-dns: "fd00::10" localAPIEndpoint: @@ -24,6 +25,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external node-ip: "::" cluster-dns: "fd00::10" controlPlane: @@ -34,6 +36,7 @@ spec: apiServer: timeoutForControlPlane: 20m extraArgs: + cloud-provider: external bind-address: "::" controllerManager: extraArgs: @@ -42,6 +45,7 @@ spec: cluster-cidr: "2001:1234:5678:9a40::/58" configure-cloud-routes: "true" bind-address: "::" + cloud-provider: external scheduler: extraArgs: bind-address: "::" diff --git a/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml b/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml index 8023510d9d2..a104072e950 100644 --- a/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml +++ b/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml @@ -58,6 +58,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: 'c:/k/azure.json' + cloud-provider: external pod-infra-container-image: "mcr.microsoft.com/oss/kubernetes/pause:3.4.1" feature-gates: "WindowsHostProcessContainers=true" files: diff --git a/templates/flavors/machinepool/machine-pool-deployment.yaml b/templates/flavors/machinepool/machine-pool-deployment.yaml index b6cd45c9704..389be0f30de 100644 --- a/templates/flavors/machinepool/machine-pool-deployment.yaml +++ b/templates/flavors/machinepool/machine-pool-deployment.yaml @@ -51,6 +51,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external files: - contentFrom: secret: diff --git a/templates/flavors/nvidia-gpu/machine-deployment.yaml b/templates/flavors/nvidia-gpu/machine-deployment.yaml index 18f5c352764..80917be61ab 100644 --- a/templates/flavors/nvidia-gpu/machine-deployment.yaml +++ b/templates/flavors/nvidia-gpu/machine-deployment.yaml @@ -49,6 +49,7 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external files: - contentFrom: secret: diff --git a/templates/flavors/windows/machine-deployment-windows.yaml b/templates/flavors/windows/machine-deployment-windows.yaml index 01870c8c592..2deda6c8744 100644 --- a/templates/flavors/windows/machine-deployment-windows.yaml +++ b/templates/flavors/windows/machine-deployment-windows.yaml @@ -64,6 +64,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: 'c:/k/azure.json' + cloud-provider: external feature-gates: "WindowsHostProcessContainers=true" v: "2" windows-priorityclass: "ABOVE_NORMAL_PRIORITY_CLASS" diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml index 3e4caa40eb2..edb5585aa77 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml @@ -60,11 +60,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: ${K8S_FEATURE_GATES:-""} timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} feature-gates: HPAContainerMetrics=true v: "4" @@ -167,11 +169,13 @@ spec: 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: - - LABEL=etcd_disk @@ -351,6 +355,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - bash -c /tmp/kubeadm-bootstrap.sh @@ -498,6 +503,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true v: "2" windows-priorityclass: ABOVE_NORMAL_PRIORITY_CLASS diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 1695cb08366..0245eda1dfe 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -60,11 +60,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: ${K8S_FEATURE_GATES:-""} timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} feature-gates: HPAContainerMetrics=true v: "4" @@ -167,11 +169,13 @@ spec: 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: - - LABEL=etcd_disk @@ -351,6 +355,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - bash -c /tmp/kubeadm-bootstrap.sh @@ -498,6 +503,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true v: "2" windows-priorityclass: ABOVE_NORMAL_PRIORITY_CLASS 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 e6e66d0ed4f..6ded41c0092 100644 --- a/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml +++ b/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml @@ -383,6 +383,8 @@ spec: controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external + cluster-name: ${CLUSTER_NAME} etcd: local: dataDir: /var/lib/etcddisk/etcd diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index 7ebb8c18470..877f8c4521e 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -59,10 +59,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -99,11 +102,13 @@ spec: 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: - - LABEL=etcd_disk @@ -202,6 +207,7 @@ spec: 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 39cee04e109..809444c80a3 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -68,10 +68,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "true" + cloud-provider: external cluster-cidr: 10.244.0.0/16,2001:1234:5678:9a40::/58 cluster-name: ${CLUSTER_NAME} configure-cloud-routes: "true" @@ -112,6 +115,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' joinConfiguration: controlPlane: @@ -120,6 +124,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' mounts: - - LABEL=etcd_disk @@ -240,6 +245,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index 98c95db17b2..2e8d9c7f732 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -54,10 +54,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -107,11 +110,13 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '@@HOSTNAME@@' joinConfiguration: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '@@HOSTNAME@@' mounts: - - etcd_disk @@ -226,6 +231,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '@@HOSTNAME@@' postKubeadmCommands: [] preKubeadmCommands: diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index aa20664c7c5..443e93ff6ba 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -68,11 +68,13 @@ spec: apiServer: extraArgs: bind-address: '::' + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "true" bind-address: '::' + cloud-provider: external cluster-cidr: 2001:1234:5678:9a40::/58 cluster-name: ${CLUSTER_NAME} configure-cloud-routes: "true" @@ -117,6 +119,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external cluster-dns: fd00::10 node-ip: '::' name: '{{ ds.meta_data["local_hostname"] }}' @@ -128,6 +131,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external cluster-dns: fd00::10 node-ip: '::' name: '{{ ds.meta_data["local_hostname"] }}' @@ -236,9 +240,11 @@ spec: apiServer: extraArgs: bind-address: '::' + cloud-provider: external controllerManager: extraArgs: bind-address: '::' + cloud-provider: external scheduler: extraArgs: bind-address: '::' @@ -254,6 +260,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external cluster-dns: '[fd00::10]' node-ip: '::' name: '{{ ds.meta_data["local_hostname"] }}' 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 4d654297633..f90dabc8a76 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 @@ -60,11 +60,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: ${K8S_FEATURE_GATES:-""} timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -166,11 +168,13 @@ spec: 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: - - LABEL=etcd_disk @@ -353,6 +357,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - bash -c /tmp/kubeadm-bootstrap.sh @@ -468,6 +473,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 name: '{{ ds.meta_data["local_hostname"] }}' 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 d0624441f8d..2794f9fdfb1 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -60,11 +60,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: ${K8S_FEATURE_GATES:-""} timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -101,11 +103,13 @@ spec: 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: - - LABEL=etcd_disk @@ -209,6 +213,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -295,6 +300,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index 2e724999ff4..0b89619a64d 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -60,11 +60,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: ${K8S_FEATURE_GATES:-""} timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -101,11 +103,13 @@ spec: 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: - - LABEL=etcd_disk @@ -209,6 +213,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -289,6 +294,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 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 e57f5136ab1..818f39cd8ec 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -54,10 +54,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -94,11 +97,13 @@ spec: 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: - - LABEL=etcd_disk @@ -207,4 +212,5 @@ spec: 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 d7eee1e1f49..6fc7a60d42e 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -83,10 +83,13 @@ spec: kubeadmConfigSpec: clusterConfiguration: apiServer: + extraArgs: + cloud-provider: external timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -123,11 +126,13 @@ spec: 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: - - LABEL=etcd_disk @@ -229,6 +234,7 @@ spec: 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 1d58d75aee2..35b0d5ccbfd 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -59,11 +59,13 @@ spec: clusterConfiguration: apiServer: extraArgs: + cloud-provider: external feature-gates: ${K8S_FEATURE_GATES:-""} timeoutForControlPlane: 20m controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external cluster-name: ${CLUSTER_NAME} v: "4" etcd: @@ -100,11 +102,13 @@ spec: 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: - - LABEL=etcd_disk @@ -206,6 +210,7 @@ spec: nodeRegistration: kubeletExtraArgs: azure-container-registry-config: /etc/kubernetes/azure.json + cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: [] --- @@ -317,6 +322,7 @@ spec: criSocket: npipe:////./pipe/containerd-containerd kubeletExtraArgs: azure-container-registry-config: c:/k/azure.json + cloud-provider: external feature-gates: WindowsHostProcessContainers=true v: "2" windows-priorityclass: ABOVE_NORMAL_PRIORITY_CLASS diff --git a/templates/test/ci/prow-clusterclass-ci-default/base.yaml b/templates/test/ci/prow-clusterclass-ci-default/base.yaml index ec86abf6444..d66c6349d31 100644 --- a/templates/test/ci/prow-clusterclass-ci-default/base.yaml +++ b/templates/test/ci/prow-clusterclass-ci-default/base.yaml @@ -71,6 +71,8 @@ spec: controllerManager: extraArgs: allocate-node-cidrs: "false" + cloud-provider: external + cluster-name: ${CLUSTER_NAME} etcd: local: dataDir: /var/lib/etcddisk/etcd