Merge pull request #1116 from vshn/fix-maintenance-cnpg

Fix service id in cnpg

Author: zugao

component/vshn_postgres_cnpg.jsonnet

@@ -50,6 +50,11 @@ local composition =
   common.SyncOptions +
   common.vshnMetaVshnDBaas('PostgreSQL', 'standalone', 'true', pgPlans) +
   {
+    metadata+: {
+      labels+: {
+        'metadata.appcat.vshn.io/serviceID': common.VSHNServiceID(serviceName),
+      },
+    },
     spec: {
       compositeTypeRef: {
         apiVersion: 'vshn.appcat.vshn.io/v1',

tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml

@@ -16,7 +16,7 @@ metadata:
   labels:
     metadata.appcat.vshn.io/offered: 'true'
     metadata.appcat.vshn.io/revision: master-f17ade7914225bd5368fe7c06593f1c3ba082606
-    metadata.appcat.vshn.io/serviceID: vshn-postgresql
+    metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg
     name: vshnpostgrescnpg.vshn.appcat.vshn.io
   name: vshnpostgrescnpg.vshn.appcat.vshn.io
 spec:

tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml

@@ -16,7 +16,7 @@ metadata:
   labels:
     metadata.appcat.vshn.io/offered: 'true'
     metadata.appcat.vshn.io/revision: debug-f17ade7914225bd5368fe7c06593f1c3ba082606
-    metadata.appcat.vshn.io/serviceID: vshn-postgresql
+    metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg
     name: vshnpostgrescnpg.vshn.appcat.vshn.io
   name: vshnpostgrescnpg.vshn.appcat.vshn.io
 spec:

tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml

@@ -16,7 +16,7 @@ metadata:
   labels:
     metadata.appcat.vshn.io/offered: 'true'
     metadata.appcat.vshn.io/revision: master-f17ade7914225bd5368fe7c06593f1c3ba082606
-    metadata.appcat.vshn.io/serviceID: vshn-postgresql
+    metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg
     name: vshnpostgrescnpg.vshn.appcat.vshn.io
   name: vshnpostgrescnpg.vshn.appcat.vshn.io
 spec:

tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml

@@ -16,7 +16,7 @@ metadata:
   labels:
     metadata.appcat.vshn.io/offered: 'true'
     metadata.appcat.vshn.io/revision: master-f17ade7914225bd5368fe7c06593f1c3ba082606
-    metadata.appcat.vshn.io/serviceID: vshn-postgresql
+    metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg
     name: vshnpostgrescnpg.vshn.appcat.vshn.io
   name: vshnpostgrescnpg.vshn.appcat.vshn.io
 spec: