fixup! fixup! add createOrUpdateExportDataUploadJob

charts/mantle/templates/deployment.yaml

@@ -67,6 +67,12 @@ spec:
             {{- with .Values.controller.overwriteMBCSchedule }}
             - --overwrite-mbc-schedule={{ . }}
             {{- end }}
+            {{- with .Values.controller.objectStorageBucketName }}
+            - --object-storage-bucket-name={{ . }}
+            {{- end }}
+            {{- with .Values.controller.objectStorageEndpoint}}
+            - --object-storage-endpoint={{ . }}
+            {{- end }}
           env:
             - name: POD_NAME
               valueFrom:

cmd/controller/main.go

@@ -120,6 +120,12 @@ func checkCommandlineArgs() error {
 		if caCertConfigMapSrc != "" && caCertKeySrc == "" {
 			return errors.New("--ca-cert-key must be specified if --role is 'primary' or 'secondary', and --ca-cert-configmap is specified")
 		}
+		if objectStorageBucketName == "" {
+			return errors.New("--object-storage-bucket-name must be specified if --role is 'primary' or 'secondary'")
+		}
+		if objectStorageEndpoint == "" {
+			return errors.New("--object-storage-endpoint must be specified if --role is 'primary' or 'secondary'")
+		}
 	default:
 		return fmt.Errorf("role should be one of 'standalone', 'primary', or 'secondary': %s", role)
 	}
@@ -144,14 +150,6 @@ func setupReconcilers(mgr manager.Manager, primarySettings *controller.PrimarySe
 		caCertConfigMap = &caCertConfigMapSrc
 	}
 
-	if objectStorageBucketName == "" {
-		return errors.New("--object-storage-bucket-name must be specified")
-	}
-
-	if objectStorageEndpoint == "" {
-		return errors.New("--object-storage-endpoint must be specified")
-	}
-
 	backupReconciler := controller.NewMantleBackupReconciler(
 		mgr.GetClient(),
 		mgr.GetScheme(),

test/e2e/testdata/values-mantle-primary-template.yaml

@@ -1,3 +1,5 @@
 controller:
   role: primary
   mantleServiceEndpoint: {ENDPOINT}
+  objectStorageBucketName: dummy
+  objectStorageEndpoint: dummy

test/e2e/testdata/values-mantle-secondary.yaml

@@ -3,6 +3,8 @@ controller:
   mantleServiceEndpoint: ":58080"
   ports:
     - containerPort: 58080
+  objectStorageBucketName: dummy
+  objectStorageEndpoint: dummy
 
 secondaryService:
   type: NodePort