Fix merge reference in workflow

class/defaults.yml

@@ -72,7 +72,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        tag: fix-merge-ref-job
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml

@@ -4,9 +4,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+  name: function-appcat-master-fix-merge-ref-job
 spec:
-  package: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3-func
+  package: ghcr.io/vshn/appcat:fix-merge-ref-job-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat

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

@@ -21,7 +21,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:

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

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-codey
     name: codey.io
   name: codey.io

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

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-forgejo
     name: vshnforgejo.vshn.appcat.vshn.io
   name: vshnforgejo.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: code.forgejo.org
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-production
           isOpenshift: 'false'

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

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-keycloak
     name: vshnkeycloak.vshn.appcat.vshn.io
   name: vshnkeycloak.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           ingress_annotations: |
             nginx.ingress.kubernetes.io/backend-protocol: HTTPS
             cert-manager.io/cluster-issuer: letsencrypt-staging

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

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-mariadb
     name: vshnmariadb.vshn.appcat.vshn.io
   name: vshnmariadb.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
           imageRepositoryPrefix: bitnamilegacy
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100

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

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-nextcloud
     name: vshnnextcloud.vshn.appcat.vshn.io
   name: vshnnextcloud.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -49,7 +49,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-staging
             nginx.ingress.kubernetes.io/enable-cors: "true"

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

@@ -15,7 +15,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-postgresql
     name: vshnpostgres.vshn.appcat.vshn.io
   name: vshnpostgres.vshn.appcat.vshn.io
@@ -26,7 +26,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -46,7 +46,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
             "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
             {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",

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

@@ -15,7 +15,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-postgresql
     name: vshnpostgrescnpg.vshn.appcat.vshn.io
   name: vshnpostgrescnpg.vshn.appcat.vshn.io
@@ -26,7 +26,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -46,7 +46,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           isOpenshift: 'false'
           kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
           loadbalancerAnnotations: |

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

@@ -17,7 +17,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: master-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-redis
     name: vshnredis.vshn.appcat.vshn.io
   name: vshnredis.vshn.appcat.vshn.io
@@ -28,7 +28,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-master-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -47,7 +47,7 @@ spec:
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
           imageRepositoryPrefix: bitnamilegacy
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           isOpenshift: 'false'
           kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
           maintenanceSA: helm-based-service-maintenance

tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml

@@ -31,7 +31,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-          image: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          image: ghcr.io/vshn/appcat:fix-merge-ref-job
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 3

tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml

@@ -27,7 +27,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          image: ghcr.io/vshn/appcat:fix-merge-ref-job
           imagePullPolicy: IfNotPresent
           livenessProbe:
             httpGet:

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml

@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        function-revision: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        function-revision: fix-merge-ref-job
       labels:
         app: crossplane
         app.kubernetes.io/component: cloud-infrastructure-controller

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml

@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        function-revision: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        function-revision: fix-merge-ref-job
       labels:
         app: crossplane-rbac-manager
         app.kubernetes.io/component: cloud-infrastructure-controller

tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml

@@ -30,7 +30,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: appcat-sla-reports-creds
-              image: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+              image: ghcr.io/vshn/appcat:fix-merge-ref-job
               name: sla-reporter
               resources:
                 limits:

tests/golden/defaults/appcat/appcat/10_function_appcat.yaml

@@ -4,9 +4,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-master-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+  name: function-appcat-master-fix-merge-ref-job
 spec:
-  package: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3-func
+  package: ghcr.io/vshn/appcat:fix-merge-ref-job-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat

tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml

@@ -31,7 +31,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-          image: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          image: ghcr.io/vshn/appcat:fix-merge-ref-job
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 3

tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml

@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        function-revision: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        function-revision: fix-merge-ref-job
       labels:
         app: crossplane
         app.kubernetes.io/component: cloud-infrastructure-controller

tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml

@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        function-revision: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        function-revision: fix-merge-ref-job
       labels:
         app: crossplane-rbac-manager
         app.kubernetes.io/component: cloud-infrastructure-controller

tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml

@@ -25,7 +25,7 @@ spec:
             - --health-probe-bind-address=:8081
             - --metrics-bind-address=127.0.0.1:8080
           env: []
-          image: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          image: ghcr.io/vshn/appcat:fix-merge-ref-job
           imagePullPolicy: IfNotPresent
           livenessProbe:
             httpGet:

tests/golden/dev/appcat/appcat/10_function_appcat.yaml

@@ -4,9 +4,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-debug-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+  name: function-appcat-debug-fix-merge-ref-job
 spec:
-  package: ghcr.io/vshn/appcat:56a380c3dbae1750ae14a783f27c7ef4ff5fddf3-func
+  package: ghcr.io/vshn/appcat:fix-merge-ref-job-func
   packagePullPolicy: Always
   runtimeConfigRef:
     name: enable-proxy

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

@@ -21,7 +21,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-debug-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-debug-fix-merge-ref-job
       input:
         apiVersion: v1
         data:

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

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: lpg
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: debug-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: debug-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-codey
     name: codey.io
   name: codey.io

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

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: lpg
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: debug-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+    metadata.appcat.vshn.io/revision: debug-fix-merge-ref-job
     metadata.appcat.vshn.io/serviceID: vshn-forgejo
     name: vshnforgejo.vshn.appcat.vshn.io
   name: vshnforgejo.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-debug-56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+        name: function-appcat-debug-fix-merge-ref-job
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: code.forgejo.org
-          imageTag: 56a380c3dbae1750ae14a783f27c7ef4ff5fddf3
+          imageTag: fix-merge-ref-job
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-production
           isOpenshift: 'false'