test fixes

redpanda-data · Nov 16, 2023 · 867d5e9 · 867d5e9
1 parent d893601
commit 867d5e9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/src/go/cluster-to-redpanda-migration/pkg/migration/configurations.go b/src/go/cluster-to-redpanda-migration/pkg/migration/configurations.go
@@ -37,10 +37,6 @@ func migrateTieredConfigs(configs map[string]string, rp *v1alpha1.Redpanda) {
 		storage.Tiered = &v1alpha1.Tiered{}
 	}
 
-	if storage.Tiered.Config == nil {
-		storage.Tiered.Config = &v1alpha1.TieredConfig{}
-	}
-
 	tieredConfig := &v1alpha1.TieredConfig{}
 	tieredMap := make(map[string]interface{}, 0)
 	for k, v := range configs {

diff --git a/src/go/cluster-to-redpanda-migration/tests/data/00-console-rp_output.yaml b/src/go/cluster-to-redpanda-migration/tests/data/00-console-rp_output.yaml
@@ -14,13 +14,13 @@ spec:
         append_chunk_size: 40960
         segment_appender_flush_timeout_ms: 1003
     console:
-      config:
+      configMap:
+        create: false
+      console:
         connect:
           enabled: false
         server:
           listenPort: 8080
-      configMap:
-        create: false
       deployment:
         create: false
       enabled: true
@@ -60,17 +60,18 @@ spec:
           min: 1250Mi
     statefulset:
       additionalRedpandaCmdFlags:
-        - --reserve-memory=100M
         - --abort-on-seastar-bad-alloc
         - --dump-memory-diagnostics-on-alloc-failure-kind=all
+        - --reserve-memory=100M
       replicas: 2
     storage:
       persistentVolume:
         enabled: true
         size: 100Gi
-      tieredConfig:
-        cloud_storage_bucket: ""
-        cloud_storage_region: ""
+      tiered:
+        config:
+          cloud_storage_bucket: null
+          cloud_storage_region: null
     tls:
       enabled: false
 status: {}
diff --git a/src/go/cluster-to-redpanda-migration/tests/data/01-console-admin-api-rp_output.yaml b/src/go/cluster-to-redpanda-migration/tests/data/01-console-admin-api-rp_output.yaml
@@ -14,13 +14,13 @@ spec:
         append_chunk_size: 40960
         segment_appender_flush_timeout_ms: 1003
     console:
-      config:
+      configMap:
+        create: false
+      console:
         connect:
           enabled: false
         server:
           listenPort: 8080
-      configMap:
-        create: false
       deployment:
         create: false
       enabled: true
@@ -72,9 +72,10 @@ spec:
       persistentVolume:
         enabled: true
         size: 100Gi
-      tieredConfig:
-        cloud_storage_bucket: ""
-        cloud_storage_region: ""
+      tiered:
+        config:
+          cloud_storage_bucket: null
+          cloud_storage_region: null
     tls:
       certs:
         adminapi-internal-0:

diff --git a/src/go/cluster-to-redpanda-migration/tests/data/02-console-kafka-mtls-rp_output.yaml b/src/go/cluster-to-redpanda-migration/tests/data/02-console-kafka-mtls-rp_output.yaml
@@ -14,13 +14,13 @@ spec:
         append_chunk_size: 40960
         segment_appender_flush_timeout_ms: 1003
     console:
-      config:
+      configMap:
+        create: false
+      console:
         connect:
           enabled: false
         server:
           listenPort: 8080
-      configMap:
-        create: false
       deployment:
         create: false
       enabled: true
@@ -76,9 +76,10 @@ spec:
       persistentVolume:
         enabled: true
         size: 100Gi
-      tieredConfig:
-        cloud_storage_bucket: ""
-        cloud_storage_region: ""
+      tiered:
+        config:
+          cloud_storage_bucket: null
+          cloud_storage_region: null
     tls:
       certs:
         kafka-internal-0:

diff --git a/src/go/cluster-to-redpanda-migration/tests/data/complex_cluster_001_output.yaml b/src/go/cluster-to-redpanda-migration/tests/data/complex_cluster_001_output.yaml
@@ -111,12 +111,13 @@ spec:
         enabled: true
         size: 2550Gi
         storageClass: local-path
-      tieredConfig:
-        cloud_storage_bucket: ""
-        cloud_storage_enable_remote_read: true
-        cloud_storage_enable_remote_write: true
-        cloud_storage_region: ""
-        cloud_storage_segment_max_upload_interval_sec: 3600
+      tiered:
+        config:
+          cloud_storage_bucket: null
+          cloud_storage_enable_remote_read: true
+          cloud_storage_enable_remote_write: true
+          cloud_storage_region: null
+          cloud_storage_segment_max_upload_interval_sec: 3600
     tls:
       certs:
         http-default: