Add providerConf ignore

vshn · Sep 30, 2024 · 326678a · 326678a
1 parent eddffb1
commit 326678a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/pkg/comp-functions/functions/common/backup/backup.go b/pkg/comp-functions/functions/common/backup/backup.go
@@ -56,6 +56,9 @@ func createObjectBucket(ctx context.Context, comp common.InfoGetter, svc *runtim
 	ob := &appcatv1.XObjectBucket{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: comp.GetName() + "-backup",
+			Labels: map[string]string{
+				runtime.ProviderConfigIgnoreLabel: "true",
+			},
 		},
 		Spec: appcatv1.XObjectBucketSpec{
 			Parameters: appcatv1.ObjectBucketParameters{

diff --git a/pkg/comp-functions/functions/vshnpostgres/postgresql_deploy.go b/pkg/comp-functions/functions/vshnpostgres/postgresql_deploy.go
@@ -454,6 +454,9 @@ func createObjectBucket(comp *vshnv1.VSHNPostgreSQL, svc *runtime.ServiceRuntime
 	xObjectBucket := &appcatv1.XObjectBucket{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: comp.GetName(),
+			Labels: map[string]string{
+				runtime.ProviderConfigIgnoreLabel: "true",
+			},
 		},
 		Spec: appcatv1.XObjectBucketSpec{
 			Parameters: appcatv1.ObjectBucketParameters{

diff --git a/pkg/comp-functions/functions/vshnpostgres/user_management.go b/pkg/comp-functions/functions/vshnpostgres/user_management.go
@@ -60,6 +60,9 @@ func addUser(comp *vshnv1.VSHNPostgreSQL, svc *runtime.ServiceRuntime, username
 			Annotations: map[string]string{
 				"crossplane.io/external-name": username,
 			},
+			Labels: map[string]string{
+				runtime.ProviderConfigIgnoreLabel: "true",
+			},
 		},
 		Spec: pgv1alpha1.RoleSpec{
 			ForProvider: pgv1alpha1.RoleParameters{
@@ -209,6 +212,9 @@ func addDatabase(comp *vshnv1.VSHNPostgreSQL, svc *runtime.ServiceRuntime, name
 			Annotations: map[string]string{
 				"crossplane.io/external-name": name,
 			},
+			Labels: map[string]string{
+				runtime.ProviderConfigIgnoreLabel: "true",
+			},
 		},
 		Spec: pgv1alpha1.DatabaseSpec{
 			ForProvider: pgv1alpha1.DatabaseParameters{},
@@ -241,6 +247,9 @@ func addGrants(comp *vshnv1.VSHNPostgreSQL, svc *runtime.ServiceRuntime, usernam
 	grant := &pgv1alpha1.Grant{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: fmt.Sprintf("%s-%s-%s-grants", comp.GetName(), username, dbname),
+			Labels: map[string]string{
+				runtime.ProviderConfigIgnoreLabel: "true",
+			},
 		},
 		Spec: pgv1alpha1.GrantSpec{
 			ForProvider: pgv1alpha1.GrantParameters{

diff --git a/pkg/comp-functions/runtime/function_mgr.go b/pkg/comp-functions/runtime/function_mgr.go
@@ -53,7 +53,7 @@ const (
 	ProtectsAnnotation        = "appcat.vshn.io/protects"
 	EventForwardAnnotation    = "appcat.vshn.io/forward-events-to"
 	providerConfigLabel       = "appcat.vshn.io/provider-config"
-	providerConfigIgnoreLabel = "appcat.vshn.io/ignore-config"
+	ProviderConfigIgnoreLabel = "appcat.vshn.io/ignore-config"
 )
 
 // Step describes a single change within a service.
@@ -1271,7 +1271,7 @@ func (s *ServiceRuntime) setProviderConfigs() error {
 	configName := s.observedComposite.GetLabels()[providerConfigLabel]
 
 	for i := range s.desiredResources {
-		if _, exists := s.desiredResources[i].Resource.GetLabels()[providerConfigIgnoreLabel]; exists {
+		if _, exists := s.desiredResources[i].Resource.GetLabels()[ProviderConfigIgnoreLabel]; exists {
 			continue
 		}
 		// we set the providerConfig Ref
@@ -1280,7 +1280,11 @@ func (s *ServiceRuntime) setProviderConfigs() error {
 			return fmt.Errorf("cannot set providerConfig for %s: %w", s.desiredResources[i].Resource.GetName(), err)
 		}
 
-		//TODO: and also the provider-config label in case it's a nested composite
+		// We also propagate the label, so if the resource is a composite, then
+		// it will automagically also set the right providerConfigs.
+		labels := s.desiredResources[i].Resource.GetLabels()
+		labels[providerConfigLabel] = configName
+		s.desiredResources[i].Resource.SetLabels(labels)
 	}
 
 	return nil