[Backport release-1.26] Fix workerprofile data types on the generated CRD #3376
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
Using json.RawMessage creates the data type in CRD as `string` which is obviously wrong. Although in the Golang side it work perfectly it results into case where a k0s config cannot be created in the API when dynamic config is enabled and the config has worker profiles:
```
level=info msg="E0810 18:28:49.753959 60 fieldmanager.go:152] \"[SHOULD NOT HAPPEN] failed to update managedFields\" err=\"failed to convert new object (kube-system/k0s; k0s.k0sproject.io/v1beta1, Kind=ClusterConfig) to smd typed: .spec.workerProfiles[0].values: expected string, got &value.valueUnstructured{Value:map[string]interface {}{}}\" versionKind=\"k0s.k0sproject.io/v1beta1, Kind=ClusterConfig\" namespace=\"kube-system\" name=\"k0s\"" component=kube-apiserver stream=stderr
```
Many projects (e.g. ArgoCD) using generic maps for data use runtime.RawExtension and so does the controller-gen maintainers seem to advise.
https://github.com/argoproj/argo-cd/blob/master/pkg/apis/application/v1alpha1/types.go#L325-L326
Added also a test in `configchange` smoke that actually verifies the workerprofiles are usable with dynamic config and can be used for workers.
Signed-off-by: Jussi Nummelin <[email protected]>
jnummelin
added
the
backport/release-1.25
kke
approved these changes
Aug 14, 2023
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-1.25
git worktree add -d .worktree/backport-3376-to-release-1.25 origin/release-1.25
cd .worktree/backport-3376-to-release-1.25
git checkout -b backport-3376-to-release-1.25
ancref=$(git merge-base faeabcf338a443e15c05b9c1345fdc83ad71a34e d6ce15a9ba8b4b759bbc3be43d673924ddbf6392)
git cherry-pick -x $ancref..d6ce15a9ba8b4b759bbc3be43d673924ddbf6392 |
twz123
changed the title
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.
Backport of #3372 to 1.26. See #3369.