From 77e867a5b36f98493433e386401e78e0729aaa83 Mon Sep 17 00:00:00 2001 From: Simon Beck Date: Tue, 13 Aug 2024 09:20:20 +0200 Subject: [PATCH 1/2] Add Nextcloud backup API --- class/defaults.yml | 2 +- tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml | 4 ++++ .../apiserver/appcat/appcat/apiserver/30_deployment.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/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 ++++ 44 files changed, 173 insertions(+), 1 deletion(-) diff --git a/class/defaults.yml b/class/defaults.yml index 8a1d06788..185032fed 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: v4.91.0 + tag: add/nextcloud_api 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4e025dc59..2ab409aa4 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) livenessProbe: failureThreshold: 3 httpGet: 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 dbc52ab55..6cc9cc69a 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 dbc52ab55..6cc9cc69a 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 337aa96ef..4de9d5060 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 dbc52ab55..6cc9cc69a 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 dbc52ab55..6cc9cc69a 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 dbc52ab55..6cc9cc69a 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 90fc6cdd0..a48b51c93 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.91.0 +======= + imageTag: add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4e025dc59..2ab409aa4 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 337aa96ef..4de9d5060 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 32a397530..cfe47c155 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 615818578..c6e5fc2cb 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) runtimeConfigRef: name: function-appcat diff --git a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml index aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 dbc52ab55..6cc9cc69a 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 4c4b74df8..cff42b6ab 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.91.0-func +======= + package: ghcr.io/vshn/appcat:add_nextcloud_api-func +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 bb410c083..37cffc623 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.91.0 +======= + imageTag: add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 9f256faf9..7e9b9d1dc 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.91.0 +======= + imageTag: add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 94f205388..c2abc64c2 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.91.0 +======= + imageTag: add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 ca2577eda..248de4218 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.91.0 +======= + imageTag: add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 e1c718e7f..3ad96106f 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.91.0 +======= + imageTag: add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 aff8cdda0..7b68ca6f3 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 337aa96ef..4de9d5060 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 ae1365760..c8f5d60d5 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) 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 8f78e59b0..c0bc92a51 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.91.0 +======= + image: ghcr.io/vshn/appcat:add_nextcloud_api +>>>>>>> c10c0bc7 (Add Nextcloud backup API) livenessProbe: httpGet: path: /healthz From b5fa8de10194b9f8d4b79c04b89bfb5d1609f93d Mon Sep 17 00:00:00 2001 From: Simon Beck Date: Tue, 13 Aug 2024 13:10:29 +0200 Subject: [PATCH 2/2] Adjust name for apiserver ClusterRole Due to the RBAC generator this could have lead to a clash in names. --- class/defaults.yml | 2 +- component/appcat_apiserver.jsonnet | 6 ++- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- .../controllers/appcat/30_deployment.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../appcat/21_composition_vshn_minio.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- .../controllers/appcat/30_deployment.yaml | 6 +-- .../appcat/sla_reporter/01_cronjob.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- .../appcat/appcat/10_function_appcat.yaml | 6 +-- .../appcat/21_composition_vshn_keycloak.yaml | 6 +-- .../appcat/21_composition_vshn_mariadb.yaml | 6 +-- .../appcat/21_composition_vshn_nextcloud.yaml | 6 +-- .../appcat/21_composition_vshn_postgres.yaml | 6 +-- .../appcat/21_composition_vshn_redis.yaml | 6 +-- .../apiserver/10_cluster_role_api_server.yaml | 40 ++++++++++++++++++- .../apiserver/10_cluster_role_binding.yaml | 6 +-- .../appcat/apiserver/30_deployment.yaml | 6 +-- .../controllers/appcat/30_deployment.yaml | 6 +-- .../appcat/sla_reporter/01_cronjob.yaml | 6 +-- ...appcat-sliexporter-controller-manager.yaml | 6 +-- 69 files changed, 553 insertions(+), 265 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 185032fed..5c2197171 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: add/nextcloud_api + tag: v4.92.0 functionAppcat: registry: ${appcat:images:appcat:registry} repository: ${appcat:images:appcat:repository} diff --git a/component/appcat_apiserver.jsonnet b/component/appcat_apiserver.jsonnet index bacc88b17..5f267bf0f 100644 --- a/component/appcat_apiserver.jsonnet +++ b/component/appcat_apiserver.jsonnet @@ -46,7 +46,11 @@ local serviceAccount = loadManifest('service-account.yaml') { }, }; -local clusterRoleAPIServer = loadManifest('role.yaml'); +local clusterRoleAPIServer = loadManifest('role.yaml') { + metadata+: { + name: 'appcat-apiserver', + }, +}; local clusterRoleBinding = kube.ClusterRoleBinding(clusterRoleAPIServer.metadata.name) { roleRef: { diff --git a/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml index cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_binding.yaml index a5e26b0c9..2fde11607 100644 --- a/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml index 2ab409aa4..ed35a3e55 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 livenessProbe: failureThreshold: 3 httpGet: 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver 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 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 6cc9cc69a..cb025b9d5 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver 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 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 6cc9cc69a..cb025b9d5 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml index 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/controllers/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml index 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 4de9d5060..e5710bf56 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml index 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 6cc9cc69a..cb025b9d5 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver 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 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 6cc9cc69a..cb025b9d5 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver 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 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 6cc9cc69a..cb025b9d5 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/exoscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml index 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-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 a48b51c93..b5874318d 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.91.0 -======= - imageTag: add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + imageTag: v4.92.0 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io diff --git a/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_binding.yaml index a5e26b0c9..2fde11607 100644 --- a/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/minio/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml index 2ab409aa4..ed35a3e55 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 4de9d5060..e5710bf56 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cfe47c155..93cdd3609 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 c6e5fc2cb..e8728d9a3 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/openshift/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml index 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 6cc9cc69a..cb025b9d5 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 cff42b6ab..2a6db8f16 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.91.0-func -======= - package: ghcr.io/vshn/appcat:add_nextcloud_api-func ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + package: ghcr.io/vshn/appcat:v4.92.0-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 37cffc623..30601d05c 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.91.0 -======= - imageTag: add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + imageTag: v4.92.0 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 7e9b9d1dc..06dda172e 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.91.0 -======= - imageTag: add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + imageTag: v4.92.0 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 c2abc64c2..38c4b55ca 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.91.0 -======= - imageTag: add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + imageTag: v4.92.0 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 248de4218..a3390d853 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.91.0 -======= - imageTag: add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + imageTag: v4.92.0 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 3ad96106f..8c1dc89a7 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.91.0 -======= - imageTag: add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + imageTag: v4.92.0 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_api_server.yaml index fa2a2a75c..cb04eae71 100644 --- a/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_api_server.yaml +++ b/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_api_server.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: appcat + name: appcat-apiserver rules: - apiGroups: - '' @@ -72,7 +72,45 @@ rules: - vshn.appcat.vshn.io resources: - vshnmariadbs + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - vshnpostgresqls + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - vshnredis + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: + - xvshnnextclouds + verbs: + - get + - list + - watch + - apiGroups: + - vshn.appcat.vshn.io + resources: - xvshnpostgresqls verbs: - get diff --git a/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_binding.yaml index 942f95125..829c4fd16 100644 --- a/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_binding.yaml +++ b/tests/golden/vshn/appcat/appcat/apiserver/10_cluster_role_binding.yaml @@ -3,12 +3,12 @@ kind: ClusterRoleBinding metadata: annotations: {} labels: - name: appcat - name: appcat + name: appcat-apiserver + name: appcat-apiserver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: appcat + name: appcat-apiserver subjects: - kind: ServiceAccount name: appcat-apiserver diff --git a/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml index 7b68ca6f3..e80226faf 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 4de9d5060..e5710bf56 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 c8f5d60d5..39780c6dd 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 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 c0bc92a51..d0be7fdbc 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.91.0 -======= - image: ghcr.io/vshn/appcat:add_nextcloud_api ->>>>>>> c10c0bc7 (Add Nextcloud backup API) + image: ghcr.io/vshn/appcat:v4.92.0 livenessProbe: httpGet: path: /healthz