Move to Helm-based test-operator

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

.github/workflows/testdata.yaml

@@ -20,4 +20,4 @@ jobs:
 
       - name: Run test-operator unit tests
         run: |
-          make test-test-operator
+          make test-operator-test-unit

Makefile

@@ -247,23 +247,40 @@ test-unit: $(SETUP_ENVTEST) envtest-k8s-bins #HELP Run the unit tests
                 -test.gocoverdir=$(COVERAGE_UNIT_DIR)
 
 
-.PHONY: test-test-operator
-test-test-operator: $(SETUP_ENVTEST) envtest-k8s-bins
-	KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use -p path $(ENVTEST_VERSION) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE))" \
-		CGO_ENABLED=1 go test -tags '$(GO_BUILD_TAGS)' -count=1 -race -short ./testdata/images/bundles/test-operator/...
-
-TEST_OPERATOR_CONTROLLERS_HOME=./testdata/images/controllers
-TEST_OPERATOR_CONTROLLERS=v1.0.0 v2.0.0
+TEST_OPERATOR_DIR=./testdata/operators/test-operator
 
-.PHONY: $(TEST_OPERATOR_CONTROLLERS)
-$(TEST_OPERATOR_CONTROLLERS):
-	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(TEST_OPERATOR_CONTROLLERS_HOME)/test-operator/$@/manager ./testdata/images/bundles/test-operator/$@/cmd/main.go
+.PHONY: test-operator-test-unit
+test-operator-test-unit: $(SETUP_ENVTEST) envtest-k8s-bins
+	KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use -p path $(ENVTEST_VERSION) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE))" \
+		CGO_ENABLED=1 go test -tags '$(GO_BUILD_TAGS)' -count=1 -race -short $(TEST_OPERATOR_DIR)/...
+
+.PHONY: build-test-operator-controllers
+build-test-operator-controllers:
+	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/images/controllers/test-operator/v1.0.0/manager $(TEST_OPERATOR_DIR)/v1/cmd/main.go
+	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/images/controllers/test-operator/v2.0.0/manager $(TEST_OPERATOR_DIR)/v2/cmd/main.go
+
+.PHONY: test-operator-manifests
+test-operator-manifests: $(CONTROLLER_GEN)
+	# generate resources crds
+    $(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) crd paths="$(TEST_OPERATOR_DIR)/api/v1/..." output:dir=$(TEST_OPERATOR_DIR)/charts/v1/crds
+    $(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) crd paths="$(TEST_OPERATOR_DIR)/api/..." output:dir=$(TEST_OPERATOR_DIR)/charts/v2/crds
+
+    # generate other resources
+    $(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) rbac:roleName=test-operator-manager-role paths="$(TEST_OPERATOR_DIR)/v1/..." output:dir=$(TEST_OPERATOR_DIR)/charts/v1/templates
+    $(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) rbac:roleName=test-operator-manager-role webhook paths=".$(TEST_OPERATOR_DIR)/v2/..." output:dir=$(TEST_OPERATOR_DIR)/charts/v2/templates
+
+.PHONY: generate-test-operator-bundles
+generate-test-operator-bundles: build-test-operator-controllers test-operator-manifests $(OPERATOR_SDK)
+	# generate bundles
+	helm template --include-crds $(TEST_OPERATOR_DIR)/charts/v1 | $(OPERATOR_SDK) generate bundle -q --channels beta --version 1.0.0 --package test --output-dir ./testdata/images/bundles/test-operator/v1.0.0
+	helm template --include-crds --set=configmap.shouldNotTemplate=true $(TEST_OPERATOR_DIR)/charts/v1 | $(OPERATOR_SDK) generate bundle -q --channels beta  --version 1.3.0 --package test --output-dir ./testdata/images/bundles/test-operator/v1.3.0
+	helm template --include-crds $(TEST_OPERATOR_DIR)/charts/v2 | $(OPERATOR_SDK) generate bundle -q --channels beta --version 2.0.0 --package test --output-dir ./testdata/images/bundles/test-operator/v2.0.0
 
 .PHONY: image-registry
 E2E_REGISTRY_IMAGE=localhost/e2e-test-registry:devel
 image-registry: export GOOS=linux
 image-registry: export GOARCH=amd64
-image-registry: $(TEST_OPERATOR_CONTROLLERS) ## Build the testdata catalog used for e2e tests and push it to the image registry
+image-registry: generate-test-operator-bundles ## Build the testdata catalog used for e2e tests and push it to the image registry
 	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push         ./testdata/push/push.go
 	$(CONTAINER_RUNTIME) build -f ./testdata/Dockerfile -t $(E2E_REGISTRY_IMAGE) ./testdata
 	$(CONTAINER_RUNTIME) save $(E2E_REGISTRY_IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)

testdata/images/bundles/test-operator/v1.0.0/manifests/bundle.configmap.yaml renamed to testdata/images/bundles/test-operator/v1.0.0/manifests/test-configmap_v1_configmap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
+data:
+  name: test-configmap
+  version: v1.0.0
 kind: ConfigMap
 metadata:
   name: test-configmap
-data:
-  version: "v1.0.0"
-  name: "test-configmap"

testdata/images/bundles/test-operator/v1.0.0/manifests/test-operator.v1.0.0.clusterserviceversion.yaml renamed to testdata/images/bundles/test-operator/v1.0.0/manifests/test.clusterserviceversion.yaml

@@ -4,10 +4,10 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2025-07-03T15:15:31Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.40.0+git
+    createdAt: "2025-07-09T18:30:36Z"
+    operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
-  name: test-operator.v1.0.0
+  name: test.v1.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -53,25 +53,12 @@ spec:
           - get
           - patch
           - update
-        - apiGroups:
-          - authentication.k8s.io
-          resources:
-          - tokenreviews
-          verbs:
-          - create
-        - apiGroups:
-          - authorization.k8s.io
-          resources:
-          - subjectaccessreviews
-          verbs:
-          - create
-        serviceAccountName: test-operator-controller-manager
+        serviceAccountName: test-operator-manager
       deployments:
       - label:
-          app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: test-operator
           control-plane: controller-manager
-        name: test-operator-controller-manager
+        name: controller-manager
         spec:
           replicas: 1
           selector:
@@ -89,7 +76,6 @@ spec:
             spec:
               containers:
               - args:
-                - --leader-elect
                 - --health-probe-bind-address=:8081
                 command:
                 - /manager
@@ -128,42 +114,8 @@ spec:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: test-operator-controller-manager
+              serviceAccountName: test-operator-manager
               terminationGracePeriodSeconds: 10
-      permissions:
-      - rules:
-        - apiGroups:
-          - ""
-          resources:
-          - configmaps
-          verbs:
-          - get
-          - list
-          - watch
-          - create
-          - update
-          - patch
-          - delete
-        - apiGroups:
-          - coordination.k8s.io
-          resources:
-          - leases
-          verbs:
-          - get
-          - list
-          - watch
-          - create
-          - update
-          - patch
-          - delete
-        - apiGroups:
-          - ""
-          resources:
-          - events
-          verbs:
-          - create
-          - patch
-        serviceAccountName: test-operator-controller-manager
     strategy: deployment
   installModes:
   - supported: true

testdata/images/bundles/test-operator/v1.0.0/manifests/testoperators.testolm.operatorframework.io.crd.yaml renamed to testdata/images/bundles/test-operator/v1.0.0/manifests/testolm.operatorframework.io_testoperators.yaml

@@ -1,6 +1,10 @@
 annotations:
+  # Core bundle annotations.
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: test
   operators.operatorframework.io.bundle.channels.v1: beta
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

testdata/images/bundles/test-operator/v1.0.0/metadata/annotations.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+data:
+  name: test-configmap
+  version: v1.0.0
+kind: ConfigMap
+metadata:
+  annotations:
+    shouldNotTemplate: |
+      'The namespace is  {{ $labels.namespace  }}. The templated $labels.namespace is NOT expected to be processed by OLM's rendering engine for registry+v1 bundles.
+  name: test-configmap

testdata/images/bundles/test-operator/v1.3.0/manifests/test-configmap_v1_configmap.yaml

@@ -4,10 +4,10 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2025-07-03T15:15:31Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.40.0+git
+    createdAt: "2025-07-09T18:30:36Z"
+    operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
-  name: test-operator.v1.0.0
+  name: test.v1.3.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -53,25 +53,12 @@ spec:
           - get
           - patch
           - update
-        - apiGroups:
-          - authentication.k8s.io
-          resources:
-          - tokenreviews
-          verbs:
-          - create
-        - apiGroups:
-          - authorization.k8s.io
-          resources:
-          - subjectaccessreviews
-          verbs:
-          - create
-        serviceAccountName: test-operator-controller-manager
+        serviceAccountName: test-operator-manager
       deployments:
       - label:
-          app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: test-operator
           control-plane: controller-manager
-        name: test-operator-controller-manager
+        name: controller-manager
         spec:
           replicas: 1
           selector:
@@ -89,7 +76,6 @@ spec:
             spec:
               containers:
               - args:
-                - --leader-elect
                 - --health-probe-bind-address=:8081
                 command:
                 - /manager
@@ -128,42 +114,8 @@ spec:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: test-operator-controller-manager
+              serviceAccountName: test-operator-manager
               terminationGracePeriodSeconds: 10
-      permissions:
-      - rules:
-        - apiGroups:
-          - ""
-          resources:
-          - configmaps
-          verbs:
-          - get
-          - list
-          - watch
-          - create
-          - update
-          - patch
-          - delete
-        - apiGroups:
-          - coordination.k8s.io
-          resources:
-          - leases
-          verbs:
-          - get
-          - list
-          - watch
-          - create
-          - update
-          - patch
-          - delete
-        - apiGroups:
-          - ""
-          resources:
-          - events
-          verbs:
-          - create
-          - patch
-        serviceAccountName: test-operator-controller-manager
     strategy: deployment
   installModes:
   - supported: true
@@ -187,4 +139,4 @@ spec:
   provider:
     name: operator-framework
     url: https://github.com/operator-framework/operator-controller
-  version: 1.0.0
+  version: 1.3.0

testdata/images/bundles/test-operator/v1.3.0/manifests/test-operator.v1.0.0.clusterserviceversion.yaml renamed to testdata/images/bundles/test-operator/v1.3.0/manifests/test.clusterserviceversion.yaml

@@ -1,6 +1,10 @@
 annotations:
+  # Core bundle annotations.
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: test
   operators.operatorframework.io.bundle.channels.v1: beta
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4