From e8b66f875247e5dca030705c35cf2d13196dcc4c Mon Sep 17 00:00:00 2001 From: Kidswiss <7460550+Kidswiss@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:43:07 +0000 Subject: [PATCH 1/2] [create-pull-request] automated change --- class/defaults.yml | 4 ++++ tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../apiserver/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ tests/golden/billing/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../golden/billing/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ .../appcat/appcat/10_function_appcat.yaml | 4 ++++ .../appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ .../appcat/appcat/10_function_appcat.yaml | 4 ++++ .../appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../cloudscale/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ .../golden/controllers/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../controllers/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ .../appcat/appcat/controllers/appcat/30_deployment.yaml | 4 ++++ tests/golden/defaults/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../defaults/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ .../appcat/appcat/10_function_appcat.yaml | 4 ++++ .../appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ .../appcat/appcat/10_function_appcat.yaml | 4 ++++ .../appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../exoscale/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ tests/golden/minio/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../golden/minio/appcat/appcat/21_composition_vshn_minio.yaml | 4 ++++ tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ .../minio/appcat/appcat/controllers/appcat/30_deployment.yaml | 4 ++++ tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ tests/golden/openshift/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../openshift/appcat/appcat/21_composition_vshn_postgres.yaml | 4 ++++ .../openshift/appcat/appcat/21_composition_vshn_redis.yaml | 4 ++++ .../openshift/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ tests/golden/vshn/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../vshn/appcat/appcat/21_composition_vshn_keycloak.yaml | 4 ++++ .../vshn/appcat/appcat/21_composition_vshn_mariadb.yaml | 4 ++++ .../vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml | 4 ++++ .../vshn/appcat/appcat/21_composition_vshn_postgres.yaml | 4 ++++ .../golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml | 4 ++++ tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml | 4 ++++ .../vshn/appcat/appcat/controllers/appcat/30_deployment.yaml | 4 ++++ tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml | 4 ++++ ...s_v1_deployment_appcat-sliexporter-controller-manager.yaml | 4 ++++ 49 files changed, 196 insertions(+) diff --git a/class/defaults.yml b/class/defaults.yml index c150d476..a5d54235 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,11 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat +<<<<<<< HEAD tag: v4.92.8 +======= + tag: fix/legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- a/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 3156df1a..719387c9 100644 --- a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- a/tests/golden/billing/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/billing/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- a/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 9d0e2cbf..341edc06 100644 --- a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- 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,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- 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,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 9d0e2cbf..341edc06 100644 --- a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- 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,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- 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,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 9d0e2cbf..341edc06 100644 --- a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- a/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- a/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- a/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 64ef1065..77e2694d 100644 --- a/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,11 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 9d0e2cbf..341edc06 100644 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- 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,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- 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,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 9d0e2cbf..341edc06 100644 --- a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- 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,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- 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,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 9d0e2cbf..341edc06 100644 --- a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- a/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 143d1054..d69a5ad9 100644 --- a/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index eb896c67..65584d49 100644 --- a/tests/golden/minio/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/minio/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index dcdf5119..b9f69827 100644 --- a/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml @@ -38,7 +38,11 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) 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 index 3156df1a..719387c9 100644 --- a/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml index 64ef1065..77e2694d 100644 --- a/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,11 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml index c9ffde49..e8b483b5 100644 --- a/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,11 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) name: sla-reporter resources: limits: diff --git a/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index f3393f07..86114ed0 100644 --- a/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml index eb896c67..65584d49 100644 --- a/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) runtimeConfigRef: name: function-appcat diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml index 426206a6..06f987a7 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml @@ -40,7 +40,11 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'false' +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml index 97a2a911..e4f92caa 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml @@ -569,7 +569,11 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml index 143d1054..d69a5ad9 100644 --- a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 14231475..8d1faa2f 100644 --- a/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml index eb896c67..65584d49 100644 --- a/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,10 @@ kind: Function metadata: name: function-appcat spec: +<<<<<<< HEAD package: ghcr.io/vshn/appcat:v4.92.8-func +======= + package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func +>>>>>>> 3a6454c3 ([create-pull-request] automated change) runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml index 90f0c131..a4b5aad6 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -38,7 +38,11 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml index f66e89bd..a2f7b747 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -38,7 +38,11 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml index 7e5c23ce..5d5f3a97 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -38,7 +38,11 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging nginx.ingress.kubernetes.io/enable-cors: "true" diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml index b4ceba8f..1c1668fe 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml @@ -40,7 +40,11 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml index a14af3dc..ae9ef35f 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml @@ -595,7 +595,11 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com +<<<<<<< HEAD imageTag: v4.92.8 +======= + imageTag: fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml index 143d1054..d69a5ad9 100644 --- a/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,11 @@ 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.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml index 64ef1065..77e2694d 100644 --- a/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,11 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml index 5d51f887..6eccefa4 100644 --- a/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,11 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) name: sla-reporter resources: limits: diff --git a/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 893bfbbd..ba3eb261 100644 --- a/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,11 @@ spec: value: "true" - name: APPCAT_SLI_VSHNMARIADB value: "true" +<<<<<<< HEAD image: ghcr.io/vshn/appcat:v4.92.8 +======= + image: ghcr.io/vshn/appcat:fix_legacy_make_targets +>>>>>>> 3a6454c3 ([create-pull-request] automated change) livenessProbe: httpGet: path: /healthz From 72c851e9d05470068d0cebdf37494a477f89ad32 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 10 Sep 2024 08:06:53 +0000 Subject: [PATCH 2/2] Update tag --- class/defaults.yml | 6 +----- .../golden/apiserver/appcat/appcat/10_function_appcat.yaml | 6 +----- .../apiserver/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- tests/golden/billing/appcat/appcat/10_function_appcat.yaml | 6 +----- .../billing/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- .../appcat/appcat/10_function_appcat.yaml | 6 +----- .../appcat/appcat/apiserver/30_deployment.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- .../appcat/appcat/10_function_appcat.yaml | 6 +----- .../appcat/appcat/apiserver/30_deployment.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- .../golden/cloudscale/appcat/appcat/10_function_appcat.yaml | 6 +----- .../cloudscale/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- .../controllers/appcat/appcat/10_function_appcat.yaml | 6 +----- .../controllers/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 6 +----- tests/golden/defaults/appcat/appcat/10_function_appcat.yaml | 6 +----- .../defaults/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- .../appcat/appcat/10_function_appcat.yaml | 6 +----- .../appcat/appcat/apiserver/30_deployment.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- .../appcat/appcat/10_function_appcat.yaml | 6 +----- .../appcat/appcat/apiserver/30_deployment.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml | 6 +----- .../exoscale/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- tests/golden/minio/appcat/appcat/10_function_appcat.yaml | 6 +----- .../minio/appcat/appcat/21_composition_vshn_minio.yaml | 6 +----- .../golden/minio/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 6 +----- .../golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- .../golden/openshift/appcat/appcat/10_function_appcat.yaml | 6 +----- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +----- .../openshift/appcat/appcat/21_composition_vshn_redis.yaml | 6 +----- .../openshift/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- tests/golden/vshn/appcat/appcat/10_function_appcat.yaml | 6 +----- .../vshn/appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +----- .../vshn/appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +----- .../vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +----- .../vshn/appcat/appcat/21_composition_vshn_postgres.yaml | 6 +----- .../vshn/appcat/appcat/21_composition_vshn_redis.yaml | 6 +----- .../golden/vshn/appcat/appcat/apiserver/30_deployment.yaml | 6 +----- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 6 +----- .../golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml | 6 +----- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 6 +----- 49 files changed, 49 insertions(+), 245 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index a5d54235..8e1cb73b 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,11 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat -<<<<<<< HEAD - tag: v4.92.8 -======= - tag: fix/legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + tag: v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index 719387c9..31ddf9a3 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 341edc06..0b068de4 100644 --- a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/billing/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 341edc06..0b068de4 100644 --- a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/cloudscale-metrics-collector-cloud/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 341edc06..0b068de4 100644 --- a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/cloudscale-metrics-collector-managed/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 77e2694d..8ebc6d65 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 341edc06..0b068de4 100644 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/defaults/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 341edc06..0b068de4 100644 --- a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/exoscale-metrics-collector-cloud/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 341edc06..0b068de4 100644 --- a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/exoscale-metrics-collector-managed/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index d69a5ad9..1b0b991a 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 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 index 65584d49..bba6ae8e 100644 --- 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.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-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 index b9f69827..33ceefa6 100644 --- a/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml @@ -38,11 +38,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 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 index 719387c9..31ddf9a3 100644 --- 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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml index 77e2694d..8ebc6d65 100644 --- a/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/minio/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml index e8b483b5..d081f46a 100644 --- a/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,11 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds -<<<<<<< HEAD - image: ghcr.io/vshn/appcat:v4.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 name: sla-reporter resources: limits: diff --git a/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 86114ed0..9cc0a50c 100644 --- a/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/minio/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml index 65584d49..bba6ae8e 100644 --- a/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml @@ -3,10 +3,6 @@ kind: Function metadata: name: function-appcat spec: -<<<<<<< HEAD - package: ghcr.io/vshn/appcat:v4.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml index 06f987a7..f56ab660 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml @@ -40,11 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'false' -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml index e4f92caa..986eddd1 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml @@ -569,11 +569,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml index d69a5ad9..1b0b991a 100644 --- a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/openshift/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 8d1faa2f..357ab21c 100644 --- a/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/openshift/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml index 65584d49..bba6ae8e 100644 --- a/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml @@ -3,10 +3,6 @@ kind: Function metadata: name: function-appcat spec: -<<<<<<< HEAD - package: ghcr.io/vshn/appcat:v4.92.8-func -======= - package: ghcr.io/vshn/appcat:fix_legacy_make_targets-func ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + package: ghcr.io/vshn/appcat:v4.92.9-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml index a4b5aad6..d7a43dd1 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -38,11 +38,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml index a2f7b747..0e891133 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -38,11 +38,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml index 5d5f3a97..f3db5082 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -38,11 +38,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging nginx.ingress.kubernetes.io/enable-cors: "true" diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml index 1c1668fe..c4929267 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml @@ -40,11 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml index ae9ef35f..80df7f16 100644 --- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml @@ -595,11 +595,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com -<<<<<<< HEAD - imageTag: v4.92.8 -======= - imageTag: fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + imageTag: v4.92.9 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml index d69a5ad9..1b0b991a 100644 --- a/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml index 77e2694d..8ebc6d65 100644 --- a/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn/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.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml index 6eccefa4..8f63e24b 100644 --- a/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,11 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds -<<<<<<< HEAD - image: ghcr.io/vshn/appcat:v4.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 name: sla-reporter resources: limits: diff --git a/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index ba3eb261..a22ba3f7 100644 --- a/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,11 +36,7 @@ spec: value: "true" - name: APPCAT_SLI_VSHNMARIADB value: "true" -<<<<<<< HEAD - image: ghcr.io/vshn/appcat:v4.92.8 -======= - image: ghcr.io/vshn/appcat:fix_legacy_make_targets ->>>>>>> 3a6454c3 ([create-pull-request] automated change) + image: ghcr.io/vshn/appcat:v4.92.9 livenessProbe: httpGet: path: /healthz