Fix 1.22 compatibility #267
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
Also: - ignore some linter warnings re: the deprefacted controller-runtime/pkg/client/fake class - tweak some OLM-related generation tools - ignore gosec G304 warning (appears to be same category as G307). Signed-off-by: Greg Lanthier <greg.lanthier@ca.ibm.com>
I reviewed the internal tool `fixcrd`. A [branch in `fixcrd`](https://github.com/IBM/cloud-operators/blob/9e16ddee216c7f1ab105b315be2e4c4c08cd3305/internal/cmd/fixcrd/main.go#L90-L96) removed the OpenAPI data type `type:` field from the `binding.spec.parameters.value` and `services.spec.parameters.value` fields in the CRD. This caused the `CustomResourceDefinition.apiextensions.k8s.io "..." is invalid` errors. These changes to the PR modify the `fixcrd` tool so that it retains the OpenAPI `type: object` data type for the `value:` field in the CRD and incorporates the changes described in @JohnStarich's feedback. I verified that the CRDs install properly in a `minikube` instance. ```shell $ make install /Users/lanthieg/Developer/git/forks/cloud-operators/cache/controller-gen_0.4.1/controller-gen "crd" rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases go run ./internal/cmd/fixcrd ./config/crd/bases/*.yaml go run ./internal/cmd/firstsetup # Install ICO secret & configmap IBM Cloud Operators configmap and secret already set up. Skipping... kustomize build config/crd | kubectl apply -f - customresourcedefinition.apiextensions.k8s.io/bindings.ibmcloud.ibm.com configured customresourcedefinition.apiextensions.k8s.io/services.ibmcloud.ibm.com configured $ kubectl explain --api-version=ibmcloud.ibm.com/v1 binding.spec.parameters KIND: Binding VERSION: ibmcloud.ibm.com/v1 RESOURCE: parameters <[]Object> DESCRIPTION: Parameters pass configuration to the service during creation Param represents a key-value pair FIELDS: attributes <map[string]map[string]> A parameter may have attributes (e.g. message hub topic might have partitions) name <string> -required- Name representing the key. value <map[string]> Defaults to null. valueFrom <Object> Source for the value. Cannot be used if value is not empty. $ ``` Signed-off-by: Greg Lanthier <greg.lanthier@ca.ibm.com>
Signed-off-by: John Starich <johnstarich@johnstarich.com>
…ype rules: https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/\#validation Signed-off-by: John Starich <johnstarich@johnstarich.com>
Signed-off-by: John Starich <johnstarich@johnstarich.com>
Signed-off-by: John Starich <johnstarich@johnstarich.com>
|
Looks like int tests can't run due to a revoked API key. We'll need to get that fixed up soon, but it can wait. I've manually vetted the changes work on k8s and openshift. |
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.
Fixes #258
cmd/fixcrd