Verify that the api-server serves the correct CRDs that this client expects #1664
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
…xpects Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com> # Conflicts: # pkg/kudoctl/kudoinit/crd/crds.go
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
# Conflicts: # pkg/kudoctl/util/kudo/kudo_test.go
zen-dog
approved these changes
Sep 10, 2020
| @@ -102,6 +91,20 @@ func NewClientFromK8s(kudo versioned.Interface, kube kubernetes.Interface) *Clie | |||
| return &result | |||
| } | |||
|
|
|||
| func (c *Client) VerifyServedCRDs(kubeClient *kube.Client) error { | |||
| result := verifier.NewResult() | |||
| err := crd.NewInitializer().VerifyServedVersion(kubeClient, v1beta1.SchemeGroupVersion.Version, &result) | |||
There was a problem hiding this comment.
The v1beta1.SchemeGroupVersion.Version parameter sort of hard-codes support for the v1beta1 version. Once we introduce a new version, we should not forget to update this method with the check with the new version?
There was a problem hiding this comment.
Yeah, that's true. Sadly there's no way to get the GV from the generated client - that would make it a bit easier.
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
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.
Signed-off-by: Andreas Neumann aneumann@mesosphere.com
What this PR does / why we need it:
When planning the structured parameters, I thought about client/api-server compatibility.
The CLI currently checks if the CRDs are correctly installed, which is not really what we want - we want to make sure that the API server understands the CRD version that we speak. This PR ensures this behaviour.
This PR:
versionfield of the CRDs and uses the newversionsfield.crdInitializer.verifyInstallationnow verifies that the installed CRD is the same as this CLI would installcrdInitializer.verifyServedVersionthat ensures that the k8s api-server understands the CRD version that we use to read/write our O, OV and I resources. This func is used when we initialise our kudo client.If the API server does not server the CRD version that we support, the user has to update the CLI version.
Fixes #