-
Notifications
You must be signed in to change notification settings - Fork 148
adding in OPERATOR_SDK_BIN_PATH env var to relevant OLM jobs and scripts #189
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
adding in OPERATOR_SDK_BIN_PATH env var to relevant OLM jobs and scripts #189
Conversation
| - name: OPERATOR_SDK_BIN_PATH | ||
| value: "/usr/local/bin" |
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.
I think I would prefer for this to be maintained inside the image. Since we are installing the binary as part of the Dockerfile, if we update that, we would also need to remember to update this Prow config. Would you mind just adding the export on a line underneath where we copy the operator SDK binary over? https://github.com/aws-controllers-k8s/test-infra/blob/main/prow/jobs/images/Dockerfile.olm-bundle-pr#L53-L54
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.
@RedbackThomson I moved this change to the docker files, and also made these two docker files match where appropriate. LMK if there are any other issues.
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.
I am not sure if exporting the variable in a Dockerfile layer will make the env variable available during prow execution.
Why not add ENV OPERATOR_SDK_BIN_PATH=/usr/local/bin inside both Dockerfiles?
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.
@vijtrip2 I wasn't sure either, that's why I added it to the jobs first, but you're probably right then need to be ENV's as well.
cd/olm/olm-bundle-pr.sh
Outdated
| OLM_BUNDLE_VERSION=$(echo "$RELEASE_VERSION" | awk -F v '{print $NF}') | ||
| echo "olm-bundle-pr.sh][INFO] olm bundle version is $OLM_BUNDLE_VERSION" | ||
| export ACK_GENERATE_OLM=true | ||
| export OPERATOR_SDK_BIN_PATH=/usr/local/bin |
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.
Echoing my comment below, but for this image too.
9908f7f to
15b7dc6
Compare
…e olm docker files Signed-off-by: Adam D. Cornett <adc@redhat.com>
15b7dc6 to
c0e49c2
Compare
|
/lgtm I will build these new prow images, and publish them, and update the prow-jobs to use new image version, and then re-run the code-generator tests. :) |
|
[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 |
|
Thanks @vijtrip2!! |
Issue #, if available:
Description of changes:
In order to get changes to code-generator made, the tests for OLM also need to be changed. Passing in the new env
OPERATOR_SDK_BIN_PATHwhere necessary. Please let me know if I missed any places.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Signed-off-by: Adam D. Cornett adc@redhat.com