Disable data migration and fix linting issues (#2984)

Dynatrace · Apr 9, 2024 · 57a3a5b · 57a3a5b
1 parent adc15cd
commit 57a3a5b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/cmd/csi/init/builder.go b/cmd/csi/init/builder.go
@@ -74,16 +74,17 @@ func (builder CommandBuilder) buildRun() func(*cobra.Command, []string) error {
 			return err
 		}
 
-		// new schema
-		conn, err := metadata.NewDBAccess(dtcsi.MetadataAccessPath)
-		if err != nil {
-			return err
-		}
-		// new migrations
-		err = conn.SchemaMigration(signalHandler)
-		if err != nil {
-			return err
-		}
+		// DISABLED UNTIL RELEASE 1.2
+		// // new schema
+		// conn, err := metadata.NewDBAccess(dtcsi.MetadataAccessPath)
+		// if err != nil {
+		// 	return err
+		// }
+		// // new migrations
+		// err = conn.SchemaMigration(signalHandler)
+		// if err != nil {
+		// 	return err
+		// }
 
 		csiOptions := dtcsi.CSIOptions{
 			NodeId:   nodeId,

diff --git a/pkg/api/v1alpha1/dynakube/dynakube_types.go b/pkg/api/v1alpha1/dynakube/dynakube_types.go
@@ -1,6 +1,8 @@
 // +kubebuilder:object:generate=true
 // +groupName=dynatrace.com
 // +versionName=v1alpha1
+//
+//nolint:revive
 package dynakube
 
 import (

diff --git a/pkg/api/v1alpha1/dynakube/helpers.go b/pkg/api/v1alpha1/dynakube/helpers.go
@@ -56,7 +56,7 @@ func (dk *DynaKube) ActiveGateImage() string {
 
 	registry := buildImageRegistry(dk.Spec.APIURL)
 
-	return fmt.Sprintf("%s/linux/activegate:latest", registry)
+	return registry + "/linux/activegate:latest"
 }
 
 // ImmutableOneAgentImage returns the immutable OneAgent image to be used with the dk DynaKube instance.