Fix

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

apis/v1beta1/collector_webhook.go

@@ -17,7 +17,6 @@ package v1beta1
 import (
 	"context"
 	"fmt"
-	ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
 	"strings"
 
 	"github.com/go-logr/logr"
@@ -31,7 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
-	//ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
+	ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
 	"github.com/open-telemetry/opentelemetry-operator/internal/rbac"
 )
 

config/webhook/manifests.yaml

@@ -64,26 +64,6 @@ webhooks:
     resources:
     - opampbridges
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector
-  failurePolicy: Fail
-  name: mopentelemetrycollector.kb.io
-  rules:
-  - apiGroups:
-    - opentelemetry.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - opentelemetrycollectors
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
@@ -226,42 +206,3 @@ webhooks:
     resources:
     - opampbridges
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
-  failurePolicy: Fail
-  name: vopentelemetrycollectorcreateupdate.kb.io
-  rules:
-  - apiGroups:
-    - opentelemetry.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - opentelemetrycollectors
-  sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
-  failurePolicy: Ignore
-  name: vopentelemetrycollectordelete.kb.io
-  rules:
-  - apiGroups:
-    - opentelemetry.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - DELETE
-    resources:
-    - opentelemetrycollectors
-  sideEffects: None

controllers/suite_test.go

@@ -166,10 +166,6 @@ func TestMain(m *testing.M) {
 	}
 	reviewer := rbac.NewReviewer(clientset)
 
-	//if err = v1alpha1.SetupCollectorWebhook(mgr, config.New(), reviewer); err != nil {
-	//	fmt.Printf("failed to SetupWebhookWithManager: %v", err)
-	//	os.Exit(1)
-	//}
 	if err = v1beta1.SetupCollectorWebhook(mgr, config.New(), reviewer); err != nil {
 		fmt.Printf("failed to SetupWebhookWithManager: %v", err)
 		os.Exit(1)