Skip to content

Commit df65494

Browse files
committed
Use kubedeploy edit to set image in make deploy
1 parent cf0074d commit df65494

File tree

3 files changed

+2
-40
lines changed

3 files changed

+2
-40
lines changed

Makefile

+2-7
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,8 @@ install: crd
9393
deploy: manifests install generate
9494
# Deploy the operator manifests:
9595
mkdir -p overlays/deploy
96-
cp overlays/template/* overlays/deploy
97-
if [[ "`uname`" == "Darwin" ]]; then \
98-
sed -i "" -e "s|IMAGE_REF|$(DEPLOY_IMAGE)|" overlays/deploy/image_patch.yaml; \
99-
else \
100-
sed -i -e "s|IMAGE_REF|$(DEPLOY_IMAGE)|" overlays/deploy/image_patch.yaml; \
101-
fi
102-
echo $(DEPLOY_IMAGE)
96+
cp overlays/template/kustomization.yaml overlays/deploy
97+
cd overlays/deploy && kustomize edit set image registry.svc.ci.openshift.org/openshift/hive-v4.0:hive=${DEPLOY_IMAGE}
10398
kustomize build overlays/deploy | oc apply -f -
10499
rm -rf overlays/deploy
105100

overlays/template/image_patch.yaml

-31
This file was deleted.

overlays/template/kustomization.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# Customizations for the Service Delivery Development environment:
22
bases:
33
- ../../config
4-
patches:
5-
- image_patch.yaml

0 commit comments

Comments
 (0)