Update Otterize CRD versions following changes to the intents operator (

#226)
otterize · Jul 17, 2024 · abba149 · abba149
1 parent 7d80f75
commit abba149
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/src/go.mod b/src/go.mod
diff --git a/src/go.sum b/src/go.sum
diff --git a/src/kafka-watcher/cmd/main.go b/src/kafka-watcher/cmd/main.go
@@ -37,10 +37,7 @@ func main() {
 		TimestampFormat: time.RFC3339,
 	})
 	errgrp, errGroupCtx := errgroup.WithContext(signals.SetupSignalHandler())
-	clusterUID, err := clusterutils.GetOrCreateClusterUID(errGroupCtx)
-	if err != nil {
-		logrus.WithError(err).Panic("Failed fetching cluster UID")
-	}
+	clusterUID := clusterutils.GetOrCreateClusterUID(errGroupCtx)
 	componentinfo.SetGlobalContextId(telemetrysender.Anonymize(clusterUID))
 	errorreporter.Init("kafka-watcher", version.Version())
 	defer errorreporter.AutoNotify()
@@ -53,6 +50,7 @@ func main() {
 	mode := viper.GetString(config.KafkaLogReadModeKey)
 
 	var watcher logwatcher2.Watcher
+	var err error
 
 	switch mode {
 	case config.FileReadMode:

diff --git a/src/mapper/cmd/main.go b/src/mapper/cmd/main.go
@@ -36,9 +36,9 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	otterizev1 "github.com/otterize/intents-operator/src/operator/api/v1"
 	otterizev1alpha2 "github.com/otterize/intents-operator/src/operator/api/v1alpha2"
 	otterizev1alpha3 "github.com/otterize/intents-operator/src/operator/api/v1alpha3"
+	otterizev1beta1 "github.com/otterize/intents-operator/src/operator/api/v1beta1"
 	"github.com/otterize/intents-operator/src/shared/serviceidresolver"
 	"github.com/otterize/intents-operator/src/shared/telemetries/telemetriesgql"
 	"github.com/otterize/intents-operator/src/shared/telemetries/telemetrysender"
@@ -69,7 +69,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(otterizev1alpha2.AddToScheme(scheme))
 	utilruntime.Must(otterizev1alpha3.AddToScheme(scheme))
-	utilruntime.Must(otterizev1.AddToScheme(scheme))
+	utilruntime.Must(otterizev1beta1.AddToScheme(scheme))
 	utilruntime.Must(otterizev2alpha1.AddToScheme(scheme))
 }
 
@@ -94,10 +94,7 @@ func main() {
 	})
 	signalHandlerCtx := ctrl.SetupSignalHandler()
 
-	clusterUID, err := clusterutils.GetOrCreateClusterUID(signalHandlerCtx)
-	if err != nil {
-		logrus.WithError(err).Panic("Failed fetching cluster UID")
-	}
+	clusterUID := clusterutils.GetOrCreateClusterUID(signalHandlerCtx)
 
 	componentinfo.SetGlobalContextId(telemetrysender.Anonymize(clusterUID))
 

diff --git a/src/sniffer/cmd/main.go b/src/sniffer/cmd/main.go
@@ -35,10 +35,7 @@ func main() {
 		TimestampFormat: time.RFC3339,
 	})
 	errgrp, errGroupCtx := errgroup.WithContext(signals.SetupSignalHandler())
-	clusterUID, err := clusterutils.GetOrCreateClusterUID(errGroupCtx)
-	if err != nil {
-		logrus.WithError(err).Panic("Failed fetching cluster UID")
-	}
+	clusterUID := clusterutils.GetOrCreateClusterUID(errGroupCtx)
 	componentinfo.SetGlobalContextId(telemetrysender.Anonymize(clusterUID))
 	errorreporter.Init("sniffer", version.Version())
 	defer errorreporter.AutoNotify()
@@ -87,7 +84,7 @@ func main() {
 		return snifferInstance.RunForever(errGroupCtx)
 	})
 
-	err = errgrp.Wait()
+	err := errgrp.Wait()
 	if err != nil && !errors.Is(err, http.ErrServerClosed) {
 		logrus.WithError(err).Panic("Error when running server or HTTP server")
 	}