Skip to content

Commit

Permalink
use images overrides in operator deploy (open-cluster-management-io#795)
Browse files Browse the repository at this point in the history
Signed-off-by: Zhiwei Yin <[email protected]>
  • Loading branch information
zhiweiyin318 authored and zhujian7 committed Jan 9, 2025
1 parent 5a898b7 commit dc073cc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/e2e-test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

deploy-hub-operator: ensure-kustomize
cp deploy/cluster-manager/config/kustomization.yaml deploy/cluster-manager/config/kustomization.yaml.tmp
Expand Down Expand Up @@ -56,7 +56,7 @@ bootstrap-secret:
$(KUSTOMIZE) build deploy/klusterlet/config/samples/bootstrap | $(KUBECTL) apply -f -

deploy-spoke-operator-helm: ensure-helm
$(HELM) install klusterlet deploy/klusterlet/chart/klusterlet --namespace=open-cluster-management --set klusterlet.create=false,images.registry=$(IMAGE_REGISTRY),images.tag=$(IMAGE_TAG) --set-file bootstrapHubKubeConfig=$(HUB_KUBECONFIG)
$(HELM) install klusterlet deploy/klusterlet/chart/klusterlet --namespace=open-cluster-management --set-file bootstrapHubKubeConfig=$(HUB_KUBECONFIG) --set klusterlet.create=false,images.overrides.operatorImage=$(OPERATOR_IMAGE_NAME),images.overrides.registrationImage=$(REGISTRATION_IMAGE),images.overrides.workImage=$(WORK_IMAGE)

deploy-spoke-operator: ensure-kustomize
cp deploy/klusterlet/config/kustomization.yaml deploy/klusterlet/config/kustomization.yaml.tmp
Expand Down

0 comments on commit dc073cc

Please sign in to comment.