Prune v2.0.0 test-operator

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

Author: Per Goncalves da Silva

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

@@ -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/v2.0.0/api/v1/testoperator_conversion.go

@@ -21,7 +21,7 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2/api/v2"
+	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 )
 
 // ConvertTo converts this TestOperator (v1) to the Hub version (v2).

test/test-operator/v2.0.0/api/v2/groupversion_info.go

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v2 contains API Schema definitions for the testolm v2 API group.
-// +kubebuilder:object:generate=true
-// +groupName=testolm.operator-framework.io
+// +kubebuilder:object:generate=false
+// +groupName=testolm.operatorframework.io
 package v2
 
 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: "v2"}
+	GroupVersion = schema.GroupVersion{Group: "testolm.operatorframework.io", Version: "v2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

test/test-operator/v2.0.0/bin/manager

@@ -104,7 +104,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: docker-registry.operator-controller-e2e.svc:5000/controllers/test-operator:v2.0.0
+                image: docker.io/perdasilva/test-operator:v2.0.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -211,7 +211,7 @@ spec:
     type: ConversionWebhook
     webhookPath: /convert
   - admissionReviewVersions:
-    - v2
+    - v1
     containerPort: 443
     deploymentName: test-operator-controller-manager
     failurePolicy: Fail
@@ -231,7 +231,7 @@ spec:
     type: MutatingAdmissionWebhook
     webhookPath: /mutate-testolm-test-operatorframework-io-v2-testoperator
   - admissionReviewVersions:
-    - v2
+    - v1
     containerPort: 443
     deploymentName: test-operator-controller-manager
     failurePolicy: Fail

test/test-operator/v2.0.0/bundle/manifests/test-operator.v2.0.0.clusterserviceversion.yaml

@@ -1,10 +1,6 @@
 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: v1
+  operators.operatorframework.io.bundle.package.v1: test-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.40.0+git
-  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
-  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

test/test-operator/v2.0.0/bundle/metadata/annotations.yaml

@@ -19,7 +19,6 @@ package main
 import (
 	"crypto/tls"
 	"flag"
-	"fmt"
 	"os"
 	"path/filepath"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -39,11 +38,10 @@ 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/v2/api/v1"
-	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2/api/v2"
-	"github.com/operator-framework/operator-controller/test/test-operator/v2/internal/controller"
-	webhookv1 "github.com/operator-framework/operator-controller/test/test-operator/v2/internal/webhook/v1"
-	webhookv2 "github.com/operator-framework/operator-controller/test/test-operator/v2/internal/webhook/v2"
+	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
+	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
+	"github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/internal/controller"
+	testolmwebhook "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/internal/webhook"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -184,19 +182,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: {}},
 		},
@@ -226,14 +220,7 @@ func main() {
 	}
 	// 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)
-		}
-	}
-	// nolint:goconst
-	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
-		if err := webhookv2.SetupTestOperatorWebhookWithManager(mgr); err != nil {
+		if err := testolmwebhook.SetupTestOperatorWebhookWithManager(mgr); err != nil {
 			setupLog.Error(err, "unable to create webhook", "webhook", "TestOperator")
 			os.Exit(1)
 		}
@@ -273,15 +260,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
 }

test/test-operator/v2.0.0/cmd/main.go

@@ -18,8 +18,8 @@ package controller
 
 import (
 	"context"
-	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v2/api/v1"
-	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2/api/v2"
+	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
+	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 	"os"
 	"path/filepath"
 	"testing"

test/test-operator/v2.0.0/internal/controller/suite_test.go

@@ -19,7 +19,9 @@ package controller
 import (
 	"context"
 	"fmt"
-	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v2/api/v1"
+
+	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
+	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 
 	"k8s.io/apimachinery/pkg/api/equality"
 	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
@@ -28,8 +30,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2/api/v2"
 )
 
 const (
@@ -43,9 +43,9 @@ type TestOperatorReconciler struct {
 	Finalizers crfinalizer.Finalizers
 }
 
-// +kubebuilder:rbac:groups=testolm.operator-framework.io,resources=testoperators,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=testolm.operator-framework.io,resources=testoperators/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=testolm.operator-framework.io,resources=testoperators/finalizers,verbs=update
+// +kubebuilder:rbac:groups=testolm.operatorframework.io,resources=testoperators,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=testolm.operatorframework.io,resources=testoperators/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=testolm.operatorframework.io,resources=testoperators/finalizers,verbs=update
 
 func (r *TestOperatorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	l := log.FromContext(ctx).WithName("test-operator")

test/test-operator/v2.0.0/internal/controller/testoperator_controller.go

@@ -28,7 +28,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2/api/v2"
+	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 )
 
 var _ = Describe("TestOperator Controller", func() {