Templates: Set provider ID directly via kubelet

This commit sets the provider ID in the ubuntu templates.
To avoid issues with potential mismatches between node names and
openstack servers we can configure the kubelet to set the provider ID.
Otherwise, the cloud controller will try to match nodes and servers
based on just the name. The names can differ because of special
characters, like dots. When this happens, the cloud controller will be
unable to match them and thus believe that the node has no underlying
server.

Author: lentzi90

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/flatcar/patch-flatcar.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

templates/cluster-template-without-lb.yaml

@@ -20,6 +20,7 @@ spec:
         nodeRegistration:
           kubeletExtraArgs:
             cloud-provider: external
+            provider-id: openstack:///'{{ instance_id }}'
           name: '{{ local_hostname }}'
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
@@ -83,11 +84,13 @@ spec:
       nodeRegistration:
         kubeletExtraArgs:
           cloud-provider: external
+          provider-id: openstack:///'{{ instance_id }}'
         name: '{{ local_hostname }}'
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
           cloud-provider: external
+          provider-id: openstack:///'{{ instance_id }}'
         name: '{{ local_hostname }}'
   machineTemplate:
     infrastructureRef:

templates/cluster-template.yaml

@@ -20,6 +20,7 @@ spec:
         nodeRegistration:
           kubeletExtraArgs:
             cloud-provider: external
+            provider-id: openstack:///'{{ instance_id }}'
           name: '{{ local_hostname }}'
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
@@ -83,11 +84,13 @@ spec:
       nodeRegistration:
         kubeletExtraArgs:
           cloud-provider: external
+          provider-id: openstack:///'{{ instance_id }}'
         name: '{{ local_hostname }}'
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
           cloud-provider: external
+          provider-id: openstack:///'{{ instance_id }}'
         name: '{{ local_hostname }}'
   machineTemplate:
     infrastructureRef: