From 69613896065b71894578d9499570421ac147da67 Mon Sep 17 00:00:00 2001 From: Yi Rae Kim Date: Wed, 16 Aug 2023 11:33:32 -0400 Subject: [PATCH] Fix Hosted mode framework test (#141) Ref: https://issues.redhat.com/browse/ACM-6966 Signed-off-by: Yi Rae Kim --- .github/workflows/framework-kind.yml | 6 ++++-- Makefile | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/framework-kind.yml b/.github/workflows/framework-kind.yml index 5b9d9ba9..d09f0a96 100644 --- a/.github/workflows/framework-kind.yml +++ b/.github/workflows/framework-kind.yml @@ -1,12 +1,14 @@ name: Framework on: + push: + tags: + - v0.** pull_request: branches: - main - - release-[0-9]+.[0-9]+ jobs: fw-kind-tests: name: KinD - uses: stolostron/governance-policy-framework/.github/workflows/kind.yml@main + uses: stolostron/governance-policy-framework/.github/workflows/kind.yml@main \ No newline at end of file diff --git a/Makefile b/Makefile index 5a8bd68c..03091479 100644 --- a/Makefile +++ b/Makefile @@ -162,12 +162,23 @@ kind-bootstrap-cluster: kind-bootstrap-cluster-dev kind-deploy-controller .PHONY: kind-bootstrap-cluster-dev kind-bootstrap-cluster-dev: kind-create-all-clusters install-crds kind-controller-all-kubeconfigs + +HOSTED ?= none + +.PHONY: kind-deploy-controller-dev +kind-deploy-controller-dev: + if [ "$(HOSTED)" = "hosted" ]; then\ + $(MAKE) kind-deploy-controller-dev-addon ;\ + else\ + $(MAKE) kind-deploy-controller-dev-normal ;\ + fi + .PHONY: kind-deploy-controller kind-deploy-controller: generate-operator-yaml install-resources deploy -kubectl create secret -n $(KIND_NAMESPACE) generic hub-kubeconfig --from-file=kubeconfig=$(HUB_CONFIG_INTERNAL) --kubeconfig=$(MANAGED_CONFIG)_e2e -.PHONY: kind-deploy-controller-dev -kind-deploy-controller-dev: kind-deploy-controller +.PHONY: kind-deploy-controller-dev-normal +kind-deploy-controller-dev-normal: kind-deploy-controller @echo Pushing image to KinD cluster kind load docker-image $(REGISTRY)/$(IMG):$(TAG) --name $(KIND_NAME) @echo "Patch deployment image" @@ -187,6 +198,13 @@ kind-controller-all-kubeconfigs: CLUSTER_NAME=$(HUB_CLUSTER_NAME) KIND_NAME=$(KIND_HUB_NAME) KIND_CLUSTER_NAME=$(KIND_HUB_CLUSTER_NAME) $(MAKE) kind-controller-kubeconfig yq e '.clusters[0].cluster.server = "https://$(KIND_HUB_NAME)-control-plane:6443"' $(HUB_CONFIG) > $(HUB_CONFIG_INTERNAL) +.PHONY: kind-deploy-controller-dev-addon +kind-deploy-controller-dev-addon: + @echo Hosted mode test + kind load docker-image $(REGISTRY)/$(IMG):$(TAG) --name $(KIND_NAME) + kubectl annotate -n $(subst -hosted,,$(KIND_NAMESPACE)) --overwrite managedclusteraddon governance-policy-framework\ + addon.open-cluster-management.io/values='{"global":{"imagePullPolicy": "Never", "imageOverrides":{"governance_policy_framework_addon": "$(REGISTRY)/$(IMG):$(TAG)"}}}' + .PHONY: kind-delete-cluster kind-delete-cluster: kind delete cluster --name $(KIND_HUB_NAME)