Merge pull request #1551 from Nordix/lentzi90/remove-unused-templates

🌱 Set provider ID through kubelet in ubuntu templates

Author: k8s-ci-robot

kustomize/v1alpha7/default/cluster-template.yaml

@@ -51,6 +51,7 @@ spec:
         name: '{{ local_hostname }}'
         kubeletExtraArgs:
           cloud-provider: external
+          provider-id: "openstack:///'{{ instance_id }}'"
     clusterConfiguration:
       apiServer:
         extraArgs:
@@ -63,6 +64,7 @@ spec:
         name: '{{ local_hostname }}'
         kubeletExtraArgs:
           cloud-provider: external
+          provider-id: "openstack:///'{{ instance_id }}'"
     files: []
   version: "${KUBERNETES_VERSION}"
 ---
@@ -133,6 +135,7 @@ spec:
           name: '{{ local_hostname }}'
           kubeletExtraArgs:
             cloud-provider: external
+            provider-id: "openstack:///'{{ instance_id }}'"
 ---
 apiVersion: v1
 kind: Secret

kustomize/v1alpha7/external-cloud-provider/kustomization.yaml

@@ -17,9 +17,16 @@ spec:
     joinConfiguration:
       nodeRegistration:
         name: $${COREOS_OPENSTACK_HOSTNAME}
+        kubeletExtraArgs:
+          provider-id: null
     initConfiguration:
       nodeRegistration:
         name: $${COREOS_OPENSTACK_HOSTNAME}
+        kubeletExtraArgs:
+          # Fixme(lentzi90): This is here just to override the value set in the default
+          # kustomization. It will be replaced with a value that works for flatcar in
+          # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
+          provider-id: null
     format: ignition
     ignition:
       containerLinuxConfig:
@@ -54,6 +61,11 @@ spec:
       joinConfiguration:
         nodeRegistration:
           name: $${COREOS_OPENSTACK_HOSTNAME}
+          kubeletExtraArgs:
+            # Fixme(lentzi90): This is here just to override the value set in the default
+            # kustomization. It will be replaced with a value that works for flatcar in
+            # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
+            provider-id: null
       preKubeadmCommands:
         - export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
         - envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp