Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Set provider ID through kubelet in ubuntu templates #1551

Merged
merged 2 commits into from
May 26, 2023
Merged

🌱 Set provider ID through kubelet in ubuntu templates #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c7fb2e
Cleanup unused files
lentzi90 May 15, 2023
8c7b85e
Templates: Set provider ID directly via kubelet
lentzi90 May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions kustomize/v1alpha7/default/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ spec:
name: '{{ local_hostname }}'
kubeletExtraArgs:
cloud-provider: external
provider-id: "openstack:///'{{ instance_id }}'"
clusterConfiguration:
apiServer:
extraArgs:
Expand All @@ -63,6 +64,7 @@ spec:
name: '{{ local_hostname }}'
kubeletExtraArgs:
cloud-provider: external
provider-id: "openstack:///'{{ instance_id }}'"
files: []
version: "${KUBERNETES_VERSION}"
---
Expand Down Expand Up @@ -133,6 +135,7 @@ spec:
name: '{{ local_hostname }}'
kubeletExtraArgs:
cloud-provider: external
provider-id: "openstack:///'{{ instance_id }}'"
---
apiVersion: v1
kind: Secret
Expand Down
5 changes: 0 additions & 5 deletions kustomize/v1alpha7/external-cloud-provider/kustomization.yaml
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions kustomize/v1alpha7/external-cloud-provider/patch-ccm.yaml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions kustomize/v1alpha7/flatcar/patch-flatcar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,16 @@ spec:
joinConfiguration:
nodeRegistration:
name: $${COREOS_OPENSTACK_HOSTNAME}
kubeletExtraArgs:
provider-id: null
lentzi90 marked this conversation as resolved.
Show resolved Hide resolved
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
Comment on lines +26 to +28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You added this comment in both places other than the one where I asked for it 🤣 I'll try not to take it personally.

It's not worth updating imho. The important thing is that that somebody looking will see the comment, and they'll see one of these.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OMG sorry! I'm not sure how I managed to miss the first occurance 🤦 😂

provider-id: null
format: ignition
ignition:
containerLinuxConfig:
Expand Down Expand Up @@ -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
Expand Down
189 changes: 0 additions & 189 deletions templates/cluster-template-external-cloud-provider-flatcar.yaml
View file
Open in desktop

This file was deleted.

Loading