feat: Add k8s version logic for external cloud-provider flag #1134
Conversation
This file contains hidden or 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
faiq
reviewed
May 22, 2025
| "patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(), | ||
| "patchedObjectName", ctrlclient.ObjectKeyFromObject(obj), | ||
| ).Info( | ||
| "adding external cloud-provider flag to control plane kubeadm config template because Kubernetes < 1.33.0", |
There was a problem hiding this comment.
can we see if we can get away with not providing this flag at all in previous versions?
There was a problem hiding this comment.
From https://kubernetes.io/blog/2023/12/14/cloud-provider-integration-changes/#migrate-to-external-cloud-controller-managers it does look like this is required still. I'd rather be safe than sorry.
jimmidyson
force-pushed
the
jimmi/1.33-cloud-provider-external
branch
from
c500c89 to
f42ccb7
Compare
This flag has been removed from kube-apiserver in k8s v1.33 so need to use version specific logic to add it for pre-1.33 clusters.
jimmidyson
force-pushed
the
jimmi/1.33-cloud-provider-external
branch
from
f42ccb7 to
c3876bd
Compare
dkoshkin
reviewed
May 23, 2025
| @@ -63,17 +63,15 @@ func AssertGeneratePatches[T mutation.GeneratePatches]( | |||
| } | |||
| resp := &runtimehooksv1.GeneratePatchesResponse{} | |||
| h.GeneratePatches(context.Background(), req, resp) | |||
| expectedStatus := runtimehooksv1.ResponseStatusSuccess | |||
There was a problem hiding this comment.
I don't really understand the intent of these changes, please reply here.
| return fmt.Errorf("failed to get control plane Kubernetes version from builtin variable: %w", err) | ||
| } | ||
|
|
||
| cpK8sVersion, err := semver.ParseTolerant(cpVersion) |
There was a problem hiding this comment.
nit: the codebase mostly does not use "k8sVersion"
Suggested change
| cpK8sVersion, err := semver.ParseTolerant(cpVersion) | |
| kubernetesVersion, err := semver.ParseTolerant(cpVersion) |
|
|
||
| if versionGreatOrEqualTo133Range(cpK8sVersion) { | ||
| log.V(5).Info( | ||
| "skipping external cloud-provider flag to control plane kubeadm config template because Kubernetes < 1.33.0", |
There was a problem hiding this comment.
Suggested change
| "skipping external cloud-provider flag to control plane kubeadm config template because Kubernetes < 1.33.0", | |
| "skipping external cloud-provider flag to control plane kubeadm config template because Kubernetes <= 1.33.0", |
| if obj.Spec.Template.Spec.KubeadmConfigSpec.ClusterConfiguration.APIServer.ExtraArgs == nil { | ||
| obj.Spec.Template.Spec.KubeadmConfigSpec.ClusterConfiguration.APIServer.ExtraArgs = make(map[string]string, 1) | ||
| } | ||
| obj.Spec.Template.Spec.KubeadmConfigSpec.ClusterConfiguration.APIServer.ExtraArgs["cloud-provider"] = "external" |
There was a problem hiding this comment.
Is it still possible for this value to be anything else, I think it can even be set to ""? Should we only set it if the key is missing?
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.
This flag has been removed from kube-apiserver in k8s v1.33 so need to
use version specific logic to add it for pre-1.33 clusters.