Skip to content

Commit 21d998e

Browse files
Callisto13yitsushi
andauthored
feat: use local_hostname from instance metadata for node registration (#126)
Co-authored-by: Balazs Nadasdi <balazs@weave.works>
1 parent 489d1cc commit 21d998e

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

templates/cluster-template-cilium.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,11 @@ spec:
5353
kubeadmConfigSpec:
5454
initConfiguration:
5555
nodeRegistration:
56-
kubeletExtraArgs:
57-
provider-id: "PROVIDER_ID"
56+
name: '{{ ds.meta_data.local_hostname }}'
5857
clusterConfiguration: {}
5958
joinConfiguration:
6059
nodeRegistration:
61-
kubeletExtraArgs:
62-
provider-id: "PROVIDER_ID"
60+
name: '{{ ds.meta_data.local_hostname }}'
6361
ignorePreflightErrors:
6462
- DirAvailable--etc-kubernetes-manifests
6563
preKubeadmCommands:
@@ -139,8 +137,7 @@ spec:
139137
spec:
140138
joinConfiguration:
141139
nodeRegistration:
142-
kubeletExtraArgs:
143-
provider-id: "PROVIDER_ID"
140+
name: '{{ ds.meta_data.local_hostname }}'
144141
---
145142
apiVersion: addons.cluster.x-k8s.io/v1beta1
146143
kind: ClusterResourceSet

templates/cluster-template.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,11 @@ spec:
4949
kubeadmConfigSpec:
5050
initConfiguration:
5151
nodeRegistration:
52-
kubeletExtraArgs:
53-
provider-id: "PROVIDER_ID"
52+
name: '{{ ds.meta_data.local_hostname }}'
5453
clusterConfiguration: {}
5554
joinConfiguration:
5655
nodeRegistration:
57-
kubeletExtraArgs:
58-
provider-id: "PROVIDER_ID"
56+
name: '{{ ds.meta_data.local_hostname }}'
5957
ignorePreflightErrors:
6058
- DirAvailable--etc-kubernetes-manifests
6159
preKubeadmCommands:
@@ -135,5 +133,4 @@ spec:
135133
spec:
136134
joinConfiguration:
137135
nodeRegistration:
138-
kubeletExtraArgs:
139-
provider-id: "PROVIDER_ID"
136+
name: '{{ ds.meta_data.local_hostname }}'

0 commit comments

Comments
 (0)