Prune v1.0.0 test-operator

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

Author: Per Goncalves da Silva

test/test-operator/v1/bundle.Dockerfile renamed to test/test-operator/bundle.Dockerfile

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1 contains API Schema definitions for the testolm v1 API group.
-// +kubebuilder:object:generate=true
-// +groupName=testolm.operator-framework.io
+// +kubebuilder:object:generate=false
+// +groupName=testolm.operatorframework.io
 package v1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "testolm.operator-framework.io", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "testolm.operatorframework.io", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

test/test-operator/v1/Dockerfile renamed to test/test-operator/controller.Dockerfile

@@ -4,10 +4,10 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2025-07-03T15:21:41Z"
+    createdAt: "2025-07-03T15:15:31Z"
     operators.operatorframework.io/builder: operator-sdk-v1.40.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
-  name: v1.v0.0.1
+  name: test-operator.v1.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -16,14 +16,9 @@ spec:
     - description: TestOperator is the Schema for the testoperators API.
       displayName: Test Operator
       kind: TestOperator
-      name: testoperators.testolm.operator-framework.io
+      name: testoperators.testolm.operatorframework.io
       version: v1
-    - description: TestOperator is the Schema for the testoperators API.
-      displayName: Test Operator
-      kind: TestOperator
-      name: testoperators.testolm.operator-framework.io
-      version: v2
-  description: OLM Test Operator
+  description: Test OLM Operator
   displayName: OLM Test Operator
   icon:
   - base64data: ""
@@ -33,7 +28,7 @@ spec:
       clusterPermissions:
       - rules:
         - apiGroups:
-          - testolm.operator-framework.io
+          - testolm.operatorframework.io
           resources:
           - testoperators
           verbs:
@@ -45,13 +40,13 @@ spec:
           - update
           - watch
         - apiGroups:
-          - testolm.operator-framework.io
+          - testolm.operatorframework.io
           resources:
           - testoperators/finalizers
           verbs:
           - update
         - apiGroups:
-          - testolm.operator-framework.io
+          - testolm.operatorframework.io
           resources:
           - testoperators/status
           verbs:
@@ -70,53 +65,47 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: v1-controller-manager
+        serviceAccountName: test-operator-controller-manager
       deployments:
       - label:
           app.kubernetes.io/managed-by: kustomize
-          app.kubernetes.io/name: v1
+          app.kubernetes.io/name: test-operator
           control-plane: controller-manager
-        name: v1-controller-manager
+        name: test-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              app.kubernetes.io/name: v1
+              app.kubernetes.io/name: test-operator
               control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                app.kubernetes.io/name: v1
+                app.kubernetes.io/name: test-operator
                 control-plane: controller-manager
             spec:
               containers:
               - args:
-                - --metrics-bind-address=:8443
                 - --leader-elect
                 - --health-probe-bind-address=:8081
-                - --webhook-cert-path=/tmp/k8s-webhook-server/serving-certs
                 command:
                 - /manager
                 env:
                 - name: WATCH_NAMESPACE
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: controller:latest
+                image: docker.io/perdasilva/test-operator:v1.0.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
                     port: 8081
                   initialDelaySeconds: 15
                   periodSeconds: 20
                 name: manager
-                ports:
-                - containerPort: 9443
-                  name: webhook-server
-                  protocol: TCP
                 readinessProbe:
                   httpGet:
                     path: /readyz
@@ -139,7 +128,7 @@ spec:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: v1-controller-manager
+              serviceAccountName: test-operator-controller-manager
               terminationGracePeriodSeconds: 10
       permissions:
       - rules:
@@ -174,12 +163,12 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: v1-controller-manager
+        serviceAccountName: test-operator-controller-manager
     strategy: deployment
   installModes:
-  - supported: false
+  - supported: true
     type: OwnNamespace
-  - supported: false
+  - supported: true
     type: SingleNamespace
   - supported: false
     type: MultiNamespace
@@ -190,104 +179,12 @@ spec:
   - operator
   links:
   - name: V1
-    url: https://v1.domain
+    url: https://github.com/operator-framework/operator-controller
   maintainers:
   - email: operator-framework-olm-dev@googlegroups.com
     name: community
   maturity: alpha
   provider:
     name: operator-framework
     url: https://github.com/operator-framework/operator-controller
-  version: 0.0.1
-  webhookdefinitions:
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    conversionCRDs:
-    - testoperators.testolm.operator-framework.io
-    deploymentName: v1-controller-manager
-    generateName: ctestoperators.kb.io
-    sideEffects: None
-    targetPort: 9443
-    type: ConversionWebhook
-    webhookPath: /convert
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: v1-controller-manager
-    failurePolicy: Fail
-    generateName: mtestoperator-v1.kb.io
-    rules:
-    - apiGroups:
-      - testolm.operator-framework.io
-      apiVersions:
-      - v1
-      operations:
-      - CREATE
-      - UPDATE
-      resources:
-      - testoperators
-    sideEffects: None
-    targetPort: 9443
-    type: MutatingAdmissionWebhook
-    webhookPath: /mutate-testolm-operator-framework-io-v1-testoperator
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: v1-controller-manager
-    failurePolicy: Fail
-    generateName: mtestoperator-v2.kb.io
-    rules:
-    - apiGroups:
-      - testolm.operator-framework.io
-      apiVersions:
-      - v2
-      operations:
-      - CREATE
-      - UPDATE
-      resources:
-      - testoperators
-    sideEffects: None
-    targetPort: 9443
-    type: MutatingAdmissionWebhook
-    webhookPath: /mutate-testolm-operator-framework-io-v2-testoperator
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: v1-controller-manager
-    failurePolicy: Fail
-    generateName: vtestoperator-v1.kb.io
-    rules:
-    - apiGroups:
-      - testolm.operator-framework.io
-      apiVersions:
-      - v1
-      operations:
-      - CREATE
-      - UPDATE
-      resources:
-      - testoperators
-    sideEffects: None
-    targetPort: 9443
-    type: ValidatingAdmissionWebhook
-    webhookPath: /validate-testolm-operator-framework-io-v1-testoperator
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: v1-controller-manager
-    failurePolicy: Fail
-    generateName: vtestoperator-v2.kb.io
-    rules:
-    - apiGroups:
-      - testolm.operator-framework.io
-      apiVersions:
-      - v2
-      operations:
-      - CREATE
-      - UPDATE
-      resources:
-      - testoperators
-    sideEffects: None
-    targetPort: 9443
-    type: ValidatingAdmissionWebhook
-    webhookPath: /validate-testolm-operator-framework-io-v2-testoperator
+  version: 1.0.0

test/test-operator/v2/api/v1/groupversion_info.go renamed to test/test-operator/v1.0.0/api/v1/groupversion_info.go

@@ -4,9 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
   creationTimestamp: null
-  name: testoperators.testolm.operator-framework.io
+  name: testoperators.testolm.operatorframework.io
 spec:
-  group: testolm.operator-framework.io
+  group: testolm.operatorframework.io
   names:
     kind: TestOperator
     listKind: TestOperatorList

test/test-operator/v1/api/v1/testoperator_types.go renamed to test/test-operator/v1.0.0/api/v1/testoperator_types.go

@@ -0,0 +1,6 @@
+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-operator
+  operators.operatorframework.io.bundle.channels.v1: alpha

test/test-operator/v1/api/v1/zz_generated.deepcopy.go renamed to test/test-operator/v1.0.0/api/v1/zz_generated.deepcopy.go

@@ -19,7 +19,6 @@ package main
 import (
 	"crypto/tls"
 	"flag"
-	"fmt"
 	"os"
 	"path/filepath"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -39,9 +38,8 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1/api/v1"
-	"github.com/operator-framework/operator-controller/test/test-operator/v1/internal/controller"
-	webhookv1 "github.com/operator-framework/operator-controller/test/test-operator/v1/internal/webhook/v1"
+	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
+	"github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/internal/controller"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -181,19 +179,15 @@ func main() {
 		})
 	}
 
-	watchNamespace, err := getWatchNamespace()
-	if err != nil {
-		setupLog.Error(err, "unable to get WatchNamespace, "+
-			"the manager will watch and manage resources in all namespaces")
-	}
+	watchNamespace := getWatchNamespace()
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
 		Metrics:                metricsServerOptions,
 		WebhookServer:          webhookServer,
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "e10ca34c.operator-framework.io",
+		LeaderElectionID:       "e10ca34c.operatorframework.io",
 		Cache: cache.Options{
 			DefaultNamespaces: map[string]cache.Config{watchNamespace: {}},
 		},
@@ -221,13 +215,6 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "TestOperator")
 		os.Exit(1)
 	}
-	// nolint:goconst
-	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
-		if err := webhookv1.SetupTestOperatorWebhookWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create webhook", "webhook", "TestOperator")
-			os.Exit(1)
-		}
-	}
 	// +kubebuilder:scaffold:builder
 
 	if metricsCertWatcher != nil {
@@ -263,15 +250,12 @@ func main() {
 }
 
 // getWatchNamespace returns the Namespace the operator should be watching for changes
-func getWatchNamespace() (string, error) {
+func getWatchNamespace() string {
 	// WatchNamespaceEnvVar is the constant for env variable WATCH_NAMESPACE
 	// which specifies the Namespace to watch.
 	// An empty value means the operator is running with cluster scope.
 	var watchNamespaceEnvVar = "WATCH_NAMESPACE"
 
-	ns, found := os.LookupEnv(watchNamespaceEnvVar)
-	if !found {
-		return "", fmt.Errorf("%s must be set", watchNamespaceEnvVar)
-	}
-	return ns, nil
+	ns, _ := os.LookupEnv(watchNamespaceEnvVar)
+	return ns
 }