Skip to content

Commit 1d18f2b

Browse files
dhaiducekopenshift-merge-bot[bot]
authored andcommitted
Fix deployments for alternate namespaces
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
1 parent 3918970 commit 1d18f2b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ postgres: cert-manager
174174

175175
webhook: cert-manager
176176
-kubectl create ns $(KIND_NAMESPACE)
177-
sed 's/namespace: open-cluster-management/namespace: $(KIND_NAMESPACE)/g' deploy/webhook.yaml | kubectl apply -f-
177+
sed -E 's,open-cluster-management(.svc|/|$$),$(KIND_NAMESPACE)\1,g' deploy/webhook.yaml | kubectl apply -f -
178178

179179
HUB_ONLY ?= none
180180

@@ -187,7 +187,7 @@ kind-deploy-controller: manifests
187187
fi
188188
@echo installing $(IMG)
189189
-kubectl create ns $(KIND_NAMESPACE)
190-
kubectl apply -f deploy/operator.yaml -n $(KIND_NAMESPACE)
190+
sed 's/namespace: open-cluster-management/namespace: $(KIND_NAMESPACE)/g' deploy/operator.yaml | kubectl apply -f - -n $(KIND_NAMESPACE)
191191

192192
.PHONY: kind-deploy-controller-dev
193193
kind-deploy-controller-dev: kind-deploy-controller
@@ -236,7 +236,8 @@ install-resources:
236236
kubectl create ns managed6
237237
@echo deploying roles and service account
238238
kubectl apply -k deploy/rbac -n $(KIND_NAMESPACE)
239-
kubectl apply -f deploy/manager/service-account.yaml -n $(KIND_NAMESPACE)
239+
sed 's/namespace: open-cluster-management/namespace: $(KIND_NAMESPACE)/' deploy/manager/service-account.yaml | \
240+
kubectl apply -f -
240241
@echo creating cluster resources
241242
kubectl apply -f test/resources/local-cluster.yaml
242243
kubectl apply -f test/resources/managed1-cluster.yaml

0 commit comments

Comments
 (0)