wip

Author: Jorres

api/v1alpha1/storage_webhook.go

@@ -117,23 +117,6 @@ func (r *StorageDefaulter) Default(ctx context.Context, obj runtime.Object) erro
 	storage := obj.(*Storage)
 	storagelog.Info("default", "name", storage.Name)
 
-	// We call BuildConfiguration even if operatorSync is false
-	// because without the yaml.Marshal(yaml.Unmarshal()) sequence,
-	// spec.configuration value (through kubelet apply json conversion)
-	// produces diff like this:
-	// - a:
-	// -   - b
-	// + "a:\n  - b"
-	configuration, err := BuildConfiguration(storage, nil)
-	if err != nil {
-		return err
-	}
-	storage.Spec.Configuration = string(configuration)
-
-	if !storage.Spec.OperatorSync {
-		return nil
-	}
-
 	if storage.Spec.OperatorConnection != nil {
 		if storage.Spec.OperatorConnection.Oauth2TokenExchange != nil {
 			if storage.Spec.OperatorConnection.Oauth2TokenExchange.SignAlg == "" {
@@ -193,6 +176,12 @@ func (r *StorageDefaulter) Default(ctx context.Context, obj runtime.Object) erro
 		storage.Spec.Domain = DefaultDatabaseDomain
 	}
 
+	configuration, err := BuildConfiguration(storage, nil)
+	if err != nil {
+		return err
+	}
+	storage.Spec.Configuration = string(configuration)
+
 	return nil
 }