Fixed platform detection in webhook

Author: owais

api/v1alpha1/splunkotelagent_webhook.go

@@ -18,12 +18,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/signalfx/splunk-otel-operator/pkg/platform"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+
+	"github.com/signalfx/splunk-otel-operator/internal/config"
+	"github.com/signalfx/splunk-otel-operator/pkg/platform"
 )
 
 const (
@@ -35,10 +37,10 @@ const (
 // log is for logging in this package.
 var agentlog = logf.Log.WithName("splunkotelagent-resource")
 
-var currentPlatform platform.Platform = platform.Unknown
+var cfg *config.Config
 
-func (r *SplunkOtelAgent) SetupWebhookWithManager(mgr ctrl.Manager, platform platform.Platform) error {
-	currentPlatform = platform
+func (r *SplunkOtelAgent) SetupWebhookWithManager(mgr ctrl.Manager, c *config.Config) error {
+	cfg = c
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
 		Complete()
@@ -271,7 +273,7 @@ func (r *SplunkOtelAgent) defaultClusterReceiver() {
 	}
 
 	if spec.Config == "" {
-		if currentPlatform == platform.OpenShift {
+		if cfg.Platform() == platform.OpenShift {
 			spec.Config = defaultClusterReceiverConfigOpenshift
 		} else {
 			spec.Config = defaultClusterReceiverConfig

main.go

@@ -154,16 +154,10 @@ func main() {
 	}
 
 	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
-		if err = (&v1alpha1.SplunkOtelAgent{}).SetupWebhookWithManager(mgr, cfg.Platform()); err != nil {
+		if err = (&v1alpha1.SplunkOtelAgent{}).SetupWebhookWithManager(mgr, &cfg); err != nil {
 			setupLog.Error(err, "unable to create webhook", "webhook", "SplunkOtelAgent")
 			os.Exit(1)
 		}
-
-		/*
-			mgr.GetWebhookServer().Register("/mutate-v1-pod", &webhook.Admission{
-				Handler: podinjector.NewPodSidecarInjector(cfg, ctrl.Log.WithName("sidecar"), mgr.GetClient()),
-			})
-		*/
 	}
 	// +kubebuilder:scaffold:builder