Fix KubeadmControlPlane #21
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
() rendered manifest diff/spec (KubeadmControlPlane/org-giantswarm/awesome)
+ two map entries added:
machineTemplate:
metadata:
labels:
app: cluster
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: 0.1.0-dev
application.giantswarm.io/team: turtles
giantswarm.io/cluster: awesome
giantswarm.io/organization: giantswarm
giantswarm.io/service-priority: highest
cluster.x-k8s.io/cluster-name: awesome
cluster.x-k8s.io/watch-filter: capi
helm.sh/chart: cluster-0.1.0-dev
another-cluster-label: label-2
some-cluster-label: label-1
infrastructureRef:
name: awesome-control-plane-f786309f
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: AWSMachineTemplate
replicas: 3
|
njuettner
reviewed
Oct 27, 2023
| @@ -0,0 +1,8 @@ | |||
| {{- define "cluster.internal.test.controlPlane.machineTemplate.spec" -}} | |||
There was a problem hiding this comment.
Yes, this is just a "dummy" helper that is used in the CI.
njuettner
reviewed
Oct 27, 2023
| @@ -51,4 +55,6 @@ spec: | |||
| {{- include "cluster.internal.controlPlane.kubeadm.postKubeadmCommands" $ | indent 4 }} | |||
| users: | |||
| {{- include "cluster.internal.kubeadm.users" $ | indent 4 }} | |||
| replicas: {{ .Values.global.controlPlane.replicas }} | |||
| version: v{{ trimPrefix "v" .Values.internal.kubernetesVersion }} | |||
There was a problem hiding this comment.
why do we have to trim the prefix v and then adding it again?
There was a problem hiding this comment.
I think it's in order to support .Values.internal.kubernetesVersion to both have and not have the v prefix, i.e. we don't care if the prefix is there, because we "clean up" the version from potential prefix and then we ensure it's there.
Took it from cluster-aws here https://github.com/giantswarm/cluster-aws/blob/acf1b9c712a51b364f5bece1481b3b3e3efdc263/helm/cluster-aws/templates/_control_plane.tpl#L247.
njuettner
approved these changes
Oct 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR fixes control plane resources:
What is the effect of this change to users?
Control plane resources are templated correctly.
How does it look like?
Updated KubeadmControlPlane resource:
Any background context you can provide?
giantswarm/roadmap#2742