From ce77f3c4d277ec76b53a403772c3082e0fa5af49 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Thu, 12 Jun 2025 15:43:33 -0400 Subject: [PATCH] Add catalogd to code coverage Signed-off-by: Todd Short --- .../catalogd_manager_e2e_coverage_patch.yaml | 20 +++++++++++++++++++ config/components/coverage/kustomization.yaml | 3 ++- ...ontroller_manager_e2e_coverage_patch.yaml} | 0 hack/test/e2e-coverage.sh | 5 +++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 config/components/coverage/catalogd_manager_e2e_coverage_patch.yaml rename config/components/coverage/{manager_e2e_coverage_patch.yaml => operator_controller_manager_e2e_coverage_patch.yaml} (100%) diff --git a/config/components/coverage/catalogd_manager_e2e_coverage_patch.yaml b/config/components/coverage/catalogd_manager_e2e_coverage_patch.yaml new file mode 100644 index 000000000..254766e54 --- /dev/null +++ b/config/components/coverage/catalogd_manager_e2e_coverage_patch.yaml @@ -0,0 +1,20 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: catalogd-controller-manager + namespace: olmv1-system +spec: + template: + spec: + containers: + - name: manager + env: + - name: GOCOVERDIR + value: /e2e-coverage + volumeMounts: + - name: e2e-coverage-volume + mountPath: /e2e-coverage + volumes: + - name: e2e-coverage-volume + persistentVolumeClaim: + claimName: e2e-coverage diff --git a/config/components/coverage/kustomization.yaml b/config/components/coverage/kustomization.yaml index 5522eb7f8..6d3084989 100644 --- a/config/components/coverage/kustomization.yaml +++ b/config/components/coverage/kustomization.yaml @@ -5,4 +5,5 @@ resources: - manager_e2e_coverage_pvc.yaml - manager_e2e_coverage_copy_pod.yaml patches: -- path: manager_e2e_coverage_patch.yaml +- path: operator_controller_manager_e2e_coverage_patch.yaml +- path: catalogd_manager_e2e_coverage_patch.yaml diff --git a/config/components/coverage/manager_e2e_coverage_patch.yaml b/config/components/coverage/operator_controller_manager_e2e_coverage_patch.yaml similarity index 100% rename from config/components/coverage/manager_e2e_coverage_patch.yaml rename to config/components/coverage/operator_controller_manager_e2e_coverage_patch.yaml diff --git a/hack/test/e2e-coverage.sh b/hack/test/e2e-coverage.sh index a5107ae12..05aee8703 100755 --- a/hack/test/e2e-coverage.sh +++ b/hack/test/e2e-coverage.sh @@ -6,6 +6,10 @@ COVERAGE_OUTPUT="${COVERAGE_OUTPUT:-${ROOT_DIR}/coverage/e2e.out}" OPERATOR_CONTROLLER_NAMESPACE="olmv1-system" OPERATOR_CONTROLLER_MANAGER_DEPLOYMENT_NAME="operator-controller-controller-manager" + +CATALOGD_NAMESPACE="olmv1-system" +CATALOGD_MANAGER_DEPLOYMENT_NAME="catalogd-controller-manager" + COPY_POD_NAME="e2e-coverage-copy-pod" # Create a temporary directory for coverage @@ -15,6 +19,7 @@ rm -rf ${COVERAGE_DIR} && mkdir -p ${COVERAGE_DIR} # Coverage-instrumented binary produces coverage on termination, # so we scale down the manager before gathering the coverage kubectl -n "$OPERATOR_CONTROLLER_NAMESPACE" scale deployment/"$OPERATOR_CONTROLLER_MANAGER_DEPLOYMENT_NAME" --replicas=0 +kubectl -n "$CATALOGD_NAMESPACE" scale deployment/"$CATALOGD_MANAGER_DEPLOYMENT_NAME" --replicas=0 # Wait for the copy pod to be ready kubectl -n "$OPERATOR_CONTROLLER_NAMESPACE" wait --for=condition=ready pod "$COPY_POD_NAME"