Skip to content
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.

Sign up for GitHub

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

update olm script to remove AdoptedResource from the bundle that is generated #224

Merged
merged 2 commits into from
Oct 18, 2021
Merged

update olm script to remove AdoptedResource from the bundle that is generated #224

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b44fa8d
update olm script to remove AdoptedResource from the bundle that is g…
acornett21 Oct 15, 2021
b6a080f
adding .orig to be system agnostic.
acornett21 Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/olm-create-bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@vijtrip2 vijtrip2 Oct 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

@acornett21 acornett21 Oct 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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. : )


# prepare bundle generate arguments
opsdk_gen_bundle_args="--version $BUNDLE_VERSION --package ack-$SERVICE-controller --kustomize-dir $SERVICE_CONTROLLER_SOURCE_PATH/config/manifests --overwrite "

Expand Down