-
Notifications
You must be signed in to change notification settings - Fork 69
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use yq to add nullables to bundle CRD #796
Conversation
…unts`, yq +nullables
This comment was marked as off-topic.
This comment was marked as off-topic.
@@ -168,7 +168,8 @@ metadata: | |||
operatorframework.io/cluster-monitoring: "true" | |||
operatorframework.io/suggested-namespace: openshift-adp | |||
operators.openshift.io/infrastructure-features: '["Disconnected"]' | |||
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]' | |||
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file changed because yq is no longer processing it.
@@ -12,612 +12,462 @@ spec: | |||
listKind: DataProtectionApplicationList | |||
plural: dataprotectionapplications | |||
shortNames: | |||
- dpa | |||
- dpa |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file changed because yq processed it.
@@ -14,612 +12,462 @@ spec: | |||
listKind: DataProtectionApplicationList | |||
plural: dataprotectionapplications | |||
shortNames: | |||
- dpa | |||
- dpa |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file changed because yq processed it.
Checked https://yamldiff.com/ |
/retest |
@kaovilai: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
@kaovilai is there an issue associated w/ this? |
@weshayutin Nullable was manually added to CustomResourceDefinition for https://issues.redhat.com/browse/OADP-535. It has to be constantly overridden after running This PR automates and preserves the desired nullable overrides in the CRD. |
Locally tested the PR w/ make deploy-olm |
/LGTM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
- local run of
make bundle
with changes; successful - superficial review of manifests/ & config/ files; acknowledging your comments on yq formatting (indention) changes
Thanks!
/cherrypick oadp-1.1 |
@kaovilai: #796 failed to apply on top of branch "oadp-1.1":
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
* remove placeholder deployment, use operator-sdk `--extra-service-accounts`, yq +nullables * use var to shorten yq eval expression
* remove placeholder deployment, use operator-sdk `--extra-service-accounts`, yq +nullables * use var to shorten yq eval expression
remove placeholder deployment previously used to get operator-sdk to honor the service accounts roles.
Now using operator-sdk
--extra-service-accounts
flag feature instead.Nullables that we override from
make manifests
are now added to make bundle by default.The format changes are a side effect of yq processing.
manifests generated from kustomize has 2 spaces for indents except for lists where it has 0 indents.
yq forces 2 spaces on lists and turn multi-line description into a single line.
file now affected by yq formatting
file no longer affected by yq formatting