🌱 use images overrides in operator deploy #795
Merged
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
Signed-off-by: Zhiwei Yin <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: zhiweiyin318 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 |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #795 +/- ##
==========================================
+ Coverage 63.79% 63.81% +0.01%
==========================================
Files 192 192
Lines 18613 18613
==========================================
+ Hits 11875 11878 +3
+ Misses 5759 5757 -2
+ Partials 979 978 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
zhujian7
reviewed
Jan 9, 2025
| @@ -21,7 +21,7 @@ hub-kubeconfig: | |||
| deploy-hub: deploy-hub-helm hub-kubeconfig cluster-ip | |||
|
|
|||
| deploy-hub-helm: ensure-helm | |||
| $(HELM) install cluster-manager deploy/cluster-manager/chart/cluster-manager --namespace=open-cluster-management --create-namespace --set images.registry=$(IMAGE_REGISTRY),images.tag=$(IMAGE_TAG) | |||
| $(HELM) install cluster-manager deploy/cluster-manager/chart/cluster-manager --namespace=open-cluster-management --create-namespace --set images.overrides.operatorImage=$(OPERATOR_IMAGE_NAME),images.overrides.registrationImage=$(REGISTRATION_IMAGE),images.overrides.workImage=$(WORK_IMAGE),images.overrides.placementImage=$(PLACEMENT_IMAGE),images.overrides.addOnManagerImage=$(ADDON_MANAGER_IMAGE) | |||
There was a problem hiding this comment.
why do we remove the images.registry and images.tag?
|
/lgtm |
openshift-merge-bot
bot
merged commit e5e013c
into
open-cluster-management-io:main
15 checks passed
zhujian7
pushed a commit
to zhujian7/ocm
that referenced
this pull request
Jan 9, 2025
Signed-off-by: Zhiwei Yin <[email protected]>
openshift-merge-bot bot
pushed a commit
to stolostron/ocm
that referenced
this pull request
Jan 9, 2025
* Use e2e images instead of latest (open-cluster-management-io#756) Signed-off-by: zhujian <[email protected]> * override images in helm chart (open-cluster-management-io#771) Signed-off-by: Zhiwei Yin <[email protected]> * use images overrides in operator deploy (open-cluster-management-io#795) Signed-off-by: Zhiwei Yin <[email protected]> --------- Signed-off-by: zhujian <[email protected]> Signed-off-by: Zhiwei Yin <[email protected]> Co-authored-by: Zhiwei Yin <[email protected]>
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.
Summary
The two makefile commands are used in e2e tests, but in some case, the image name will be overrode by the temp names.
So here use the override images directly .
Related issue(s)
Fixes #