@@ -28,10 +28,9 @@ CONTROLLER_NAMESPACE ?= open-cluster-management
2828# Handle KinD configuration
2929CLUSTER_NAME ?= hub
3030KIND_NAMESPACE ?= $(CONTROLLER_NAMESPACE )
31- POSTGRES_HOST ?= localhost
3231
3332# Test coverage threshold
34- export COVERAGE_MIN ?= 74
33+ export COVERAGE_MIN ?= 71
3534
3635# Image URL to use all building/pushing image targets;
3736# Use your own docker registry and image name for dev/test by overridding the IMG and REGISTRY environment variable.
@@ -143,11 +142,10 @@ generate-operator-yaml: kustomize manifests
143142# ###########################################################
144143
145144.PHONY : kind-bootstrap-cluster
146- kind-bootstrap-cluster : POSTGRES_HOST=postgres
147145kind-bootstrap-cluster : kind-bootstrap-cluster-dev webhook kind-deploy-controller install-resources
148146
149147.PHONY : kind-bootstrap-cluster-dev
150- kind-bootstrap-cluster-dev : kind-create-cluster install-crds kind-controller-kubeconfig postgres
148+ kind-bootstrap-cluster-dev : kind-create-cluster install-crds kind-controller-kubeconfig
151149
152150cert-manager :
153151 @echo Installing cert-manager
@@ -156,29 +154,6 @@ cert-manager:
156154 kubectl wait deployment -n cert-manager cert-manager --for condition=Available=True --timeout=180s
157155 kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=cert-manager -n cert-manager --timeout=180s
158156
159- postgres : cert-manager
160- @echo " Installing Postgres"
161- -kubectl create ns $(KIND_NAMESPACE )
162- sed ' s/open-cluster-management/$(KIND_NAMESPACE)/g' build/kind/postgres.yaml | kubectl apply --timeout=180s -f-
163-
164- @echo "Waiting until the pods are up"
165- @sleep 3
166- kubectl -n $(KIND_NAMESPACE) wait --for=condition=Ready pod -l app=postgres
167-
168- @echo "Creating the governance-policy-database secret"
169- @kubectl -n $(KIND_NAMESPACE) get secret governance-policy-database || \
170- kubectl -n $(KIND_NAMESPACE) create secret generic governance-policy-database \
171- --from-literal="user=grc" \
172- --from-literal="password=grc" \
173- --from-literal="host=$(POSTGRES_HOST)" \
174- --from-literal="dbname=ocm-compliance-history" \
175- --from-literal="ca=$$(kubectl -n $(KIND_NAMESPACE) get secret postgres-cert -o json | jq -r '.data["ca.crt"]' | base64 -d)"
176-
177- @echo "Copying the compliance API certificates locally"
178- kubectl -n $(KIND_NAMESPACE) get secret compliance-api-cert -o json | jq -r '.data["tls.crt"]' | base64 -d > dev-tls.crt
179- kubectl -n $(KIND_NAMESPACE) get secret compliance-api-cert -o json | jq -r '.data["ca.crt"]' | base64 -d >> dev-ca.crt
180- kubectl -n $(KIND_NAMESPACE) get secret compliance-api-cert -o json | jq -r '.data["tls.key"]' | base64 -d > dev-tls.key
181-
182157webhook : cert-manager
183158 -kubectl create ns $(KIND_NAMESPACE )
184159 sed -E ' s,open-cluster-management(.svc|/|$$),$(KIND_NAMESPACE)\1,g' deploy/webhook.yaml | kubectl apply -f -
@@ -207,10 +182,6 @@ kind-deploy-controller-dev: kind-deploy-controller
207182 kubectl rollout restart deployment/$(IMG) -n $(KIND_NAMESPACE)
208183 kubectl rollout status -n $(KIND_NAMESPACE) deployment $(IMG) --timeout=180s
209184
210- # Specify KIND_VERSION to indicate the version tag of the KinD image
211- .PHONY : kind-create-cluster
212- kind-create-cluster : KIND_ARGS += --config build/kind/kind-config.yaml
213-
214185.PHONY : kind-delete-cluster
215186kind-delete-cluster :
216187 kind delete cluster --name $(KIND_NAME )
@@ -256,7 +227,7 @@ install-resources:
256227 @echo setting a Hub cluster DNS name
257228 kubectl apply -f test/resources/case5_policy_automation/cluster-dns.yaml
258229
259- E2E_LABEL_FILTER = --label-filter="!webhook && !compliance-events-api && ! policyautomation"
230+ E2E_LABEL_FILTER = --label-filter="!webhook && !policyautomation"
260231.PHONY : e2e-test
261232e2e-test : e2e-dependencies
262233 $(GINKGO ) -v --fail-fast $(E2E_TEST_ARGS ) $(E2E_LABEL_FILTER ) test/e2e -- $(E2E_TEST_CODE_ARGS )
@@ -265,14 +236,6 @@ e2e-test: e2e-dependencies
265236e2e-test-webhook : E2E_LABEL_FILTER = --label-filter="webhook"
266237e2e-test-webhook : e2e-test
267238
268- .PHONY : e2e-test-compliance-events-api
269- e2e-test-compliance-events-api : E2E_LABEL_FILTER = --label-filter="compliance-events-api"
270- e2e-test-compliance-events-api : e2e-test
271-
272- .PHONY : e2e-test-coverage-compliance-events-api
273- e2e-test-coverage-compliance-events-api : E2E_TEST_ARGS = --json-report=report_e2e_compliance_events_api.json --covermode=atomic --coverpkg=open-cluster-management.io/governance-policy-propagator/controllers/complianceeventsapi --coverprofile=coverage_e2e_compliance_events_api.out --output-dir=.
274- e2e-test-coverage-compliance-events-api : e2e-test-compliance-events-api
275-
276239.PHONY : e2e-test-policyautomation
277240e2e-test-policyautomation : E2E_LABEL_FILTER = --label-filter="policyautomation"
278241e2e-test-policyautomation : e2e-test
@@ -296,7 +259,6 @@ e2e-stop-instrumented:
296259
297260.PHONY : e2e-test-coverage
298261e2e-test-coverage : E2E_TEST_ARGS = --json-report=report_e2e.json --output-dir=.
299- e2e-test-coverage : E2E_TEST_CODE_ARGS = --compliance-api-port=8385
300262e2e-test-coverage : e2e-run-instrumented e2e-test e2e-stop-instrumented
301263
302264.PHONY : e2e-test-coverage-policyautomation
0 commit comments