update olm script to remove AdoptedResource from the bundle that is generated #224
Conversation
|
Hi @acornett21. Thanks for your PR. I'm waiting for a aws-controllers-k8s member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
ack-bot
added
the
needs-ok-to-test
|
/ok-to-test |
ack-bot
added
ok-to-test
scripts/olm-create-bundle.sh
Outdated
| @@ -127,6 +127,10 @@ pushd $tmp_kustomize_config_dir/controller 1>/dev/null | |||
| kustomize edit set image controller="$AWS_SERVICE_DOCKER_IMG" | |||
| popd 1>/dev/null | |||
|
|
|||
| # remove crd/common from bases to prevent inclusion of AdoptedResource CRD from being generated in the bundle directory | |||
| sed -i '' '/bases:/d' $tmp_kustomize_config_dir/crd/kustomization.yaml | |||
| sed -i '' '/- common/d' $tmp_kustomize_config_dir/crd/kustomization.yaml | |||
There was a problem hiding this comment.
I may be very wrong here but I have never seen this usage of sed command before.
I ran these commands on a dummy file locally and these commands did not cause any changes in my dummy file on zsh shell.
Can you please tell me the environment setting, where I can test this command to validate that it works?
s3-olm-test also failed with following error
sed: can't read /bases:/d: No such file or directory
make: *** [Makefile:36: build-controller] Error 2
There was a problem hiding this comment.
The sed cmd is looking for specific things in the crd/kustomization.yaml file for any given controller and removing them in our temp working directory. This is a reference to the common folder which contains /common/bases/services.k8s.aws_adoptedresources.yaml which then means our downstream process will not generate a CRD for AdoptedResource and the CSV will no longer have an owner reference to AdoptedResource as well. This needs to run against the kustomize.yaml file from a given controller.
I am on a mac running zsh, the format of sed might not work on all systems, so if the build system that is being used needs it in a certain format we can update to accommodate.
There was a problem hiding this comment.
The integration tests run on debian image https://github.com/aws-controllers-k8s/test-infra/blob/main/prow/jobs/images/Dockerfile.olm-test
Can you please make sure the sed command you are using works on debian platform to get s3-olm-test to pass. : )
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: acornett21, vijtrip2 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Issue #, if available:
aws-controllers-k8s/community#1006
This does not close this issue, this is just one piece needed. The runtime also needs to be update.
Description of changes:
This PR updates the
olmscripts in a way that theAdpotedResourceis no longer generated in the bundle that gets produced on disk. Since the OLM script works off atempdirectory, this does not update/affect any of the artifacts on disk in the repo. The bundle that this generates has been tested against an OpenShift cluster vai OLM install.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.