Update tag

vshn · Nov 15, 2024 · ed2010e · ed2010e
1 parent 641003f
commit ed2010e
Show file tree

Hide file tree

Showing 50 changed files with 50 additions and 246 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -55,7 +55,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: fix/invalid_backup_refs
+        tag: v4.105.2
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

diff --git a/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/tests/golden/billing/appcat/appcat/10_function_appcat.yaml b/tests/golden/billing/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,11 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.105.1
-=======
-        image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+        image: ghcr.io/vshn/appcat:v4.105.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,11 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.105.1
-=======
-        image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+        image: ghcr.io/vshn/appcat:v4.105.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,11 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.105.1
-=======
-        image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+        image: ghcr.io/vshn/appcat:v4.105.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,11 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,11 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.105.1
-=======
-        image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+        image: ghcr.io/vshn/appcat:v4.105.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,11 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.105.1
-=======
-        image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+        image: ghcr.io/vshn/appcat:v4.105.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,11 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-<<<<<<< HEAD
-        image: ghcr.io/vshn/appcat:v4.105.1
-=======
-        image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+        image: ghcr.io/vshn/appcat:v4.105.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml b/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/tests/golden/minio/appcat/appcat/10_function_appcat.yaml b/tests/golden/minio/appcat/appcat/10_function_appcat.yaml
@@ -3,10 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-<<<<<<< HEAD
-  package: ghcr.io/vshn/appcat:v4.105.1-func
-=======
-  package: ghcr.io/vshn/appcat:fix_invalid_backup_refs-func
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+  package: ghcr.io/vshn/appcat:v4.105.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -39,11 +39,7 @@ spec:
           emailAlertingSmtpFromAddress: [email protected]
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
-<<<<<<< HEAD
-          imageTag: v4.105.1
-=======
-          imageTag: fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          imageTag: v4.105.2
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io

diff --git a/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml
@@ -29,11 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-<<<<<<< HEAD
-          image: ghcr.io/vshn/appcat:v4.105.1
-=======
-          image: ghcr.io/vshn/appcat:fix_invalid_backup_refs
->>>>>>> 4de876b4 ([create-pull-request] automated change)
+          image: ghcr.io/vshn/appcat:v4.105.2
           livenessProbe:
             failureThreshold: 3
             httpGet: