make oauth image and cert generator image configurable via env vars #589
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
KPostOffice
force-pushed
the
rhoaieng-8552
branch
from
565ae31
to
facc957
Compare
sutaakar
reviewed
Jul 11, 2024
Comment on lines
25
to
32
| cert-generator-image: | ||
| description: 'Image used to generate RayCluster certificates' | ||
| required: true | ||
| default: 'registry.redhat.io/ubi9:latest' | ||
| oauth-proxy-image: | ||
| description: 'Image used to run OAuth proxy' | ||
| required: true | ||
| default: 'registry.redhat.io/openshift4/ose-oauth-proxy:latest' |
There was a problem hiding this comment.
If I remember correctly GitHub doesn't allow more than 10 input parameters for GH action.
Can we use defaults in the build?
sutaakar
reviewed
Jul 11, 2024
Makefile
Outdated
Comment on lines
116
to
117
| OAUTH_IMAGE ?= registry.redhat.io/openshift4/ose-oauth-proxy:latest | ||
| CERT_GENERATOR_IMAGE ?= registry.redhat.io/ubi9:latest |
There was a problem hiding this comment.
SHA is needed for disconnected clusters, so I think it should be preferred.
KPostOffice
force-pushed
the
rhoaieng-8552
branch
2 times, most recently
from
601603b
to
63623f5
Compare
sutaakar
reviewed
Jul 11, 2024
Comment on lines
-101
to
+112
| gh workflow run tag-and-build.yml --repo ${{ github.event.inputs.codeflare-repository-organization }}/codeflare-operator --ref ${{ github.ref }} --field is-stable=${{ github.event.inputs.is-stable }} --field version=${{ github.event.inputs.operator-version }} --field replaces=${{ github.event.inputs.replaces }} --field codeflare-sdk-version=${{ github.event.inputs.codeflare-sdk-version }} --field appwrapper-version=${{ github.event.inputs.appwrapper-version }} --field kuberay-version=${{ github.event.inputs.kuberay-version }} --field kueue-version=${{ github.event.inputs.kueue-version }} --field quay-organization=${{ github.event.inputs.quay-organization }} --field community-operators-prod-fork-organization=${{ github.event.inputs.codeflare-repository-organization }} --field community-operators-prod-organization=${{ github.event.inputs.community-operators-prod-organization }} | ||
| gh workflow run tag-and-build.yml --repo ${{ github.event.inputs.codeflare-repository-organization }}/codeflare-operator \ | ||
| --ref ${{ github.ref }} \ | ||
| --field is-stable=${{ github.event.inputs.is-stable }} \ | ||
| --field version=${{ github.event.inputs.operator-version }} \ | ||
| --field replaces=${{ github.event.inputs.replaces }} \ | ||
| --field codeflare-sdk-version=${{ github.event.inputs.codeflare-sdk-version }} \ | ||
| --field appwrapper-version=${{ github.event.inputs.appwrapper-version }} \ | ||
| --field kuberay-version=${{ github.event.inputs.kuberay-version }} \ | ||
| --field kueue-version=${{ github.event.inputs.kueue-version }} \ | ||
| --field quay-organization=${{ github.event.inputs.quay-organization }} \ | ||
| --field community-operators-prod-fork-organization=${{ github.event.inputs.codeflare-repository-organization }} \ | ||
| --field community-operators-prod-organization=${{ github.event.inputs.community-operators-prod-organization }} |
There was a problem hiding this comment.
AFAIK this change is not needed, right?
There was a problem hiding this comment.
It's not, but I left it in to improve readability. The line was extremely long
|
Can you remove https://github.com/project-codeflare/codeflare-operator/blob/main/config/e2e/config.yaml#L10 |
Signed-off-by: Kevin <[email protected]>
KPostOffice
force-pushed
the
rhoaieng-8552
branch
from
63623f5
to
098b397
Compare
KPostOffice
changed the title
sutaakar
approved these changes
Jul 12, 2024
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sutaakar 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 |
openshift-merge-bot
bot
merged commit a8b6591
into
project-codeflare:main
8 checks passed
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.
Issue link
https://issues.redhat.com/browse/RHOAIENG-8552
What changes have been made
I've made the cert generator image and oauthproxy image build time configurable
Verification steps
run operator and verify that the images specified via make build are respected in the resulting RayCluster
Checks
Note
There was also discussion about making these configurable at deployment time. I think the only difference would be whether we would need to re-release CFO to update the vs the RHODS/ODH operator. I lean towards leaving it on our end via build args but I'm open to suggestions