From d7abef72b229c814e3b0b2bf2257a086b4d75f9e Mon Sep 17 00:00:00 2001 From: TheBigLee <9610820+TheBigLee@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:55:06 +0000 Subject: [PATCH 1/2] [create-pull-request] automated change --- class/defaults.yml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/10_webhooks.yaml | 19 +++++++++++++++++++ .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/21_composition_vshn_minio.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/10_webhooks.yaml | 19 +++++++++++++++++++ .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/10_webhooks.yaml | 19 +++++++++++++++++++ .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- 52 files changed, 106 insertions(+), 49 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 859e87a2a..f7be70a27 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: v4.97.2 + tag: spks/deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml index 496dabee2..d705f0dd6 100644 --- a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/billing/appcat/appcat/10_function_appcat.yaml b/tests/golden/billing/appcat/appcat/10_function_appcat.yaml index a3d28457b..8ac74bb29 100644 --- a/tests/golden/billing/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/billing/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 100644 --- a/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index b55c45675..9e9737652 100644 --- a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml index a3d28457b..8ac74bb29 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 b55c45675..9e9737652 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 b55c45675..9e9737652 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 100644 --- a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 100644 --- a/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml b/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml index c5d80d360..8d942a46b 100644 --- a/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml +++ b/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml @@ -91,6 +91,25 @@ webhooks: resources: - persistentvolumeclaims sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-helm-crossplane-io-v1beta1-release + failurePolicy: Fail + name: releases.vshn.appcat.vshn.io + rules: + - apiGroups: + - helm.crossplane.io + apiVersions: + - v1beta1 + operations: + - DELETE + resources: + - releases + sideEffects: None - admissionReviewVersions: - v1 clientConfig: 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 cbfc1c38a..b581d4ab9 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,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 b55c45675..9e9737652 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 b55c45675..9e9737652 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 b55c45675..9e9737652 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 100644 --- a/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/minio/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/minio/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-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 b1e44a793..9d2e88d98 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.97.2 + imageTag: spks_deletion_protection 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 496dabee2..d705f0dd6 100644 --- a/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml b/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml index c5d80d360..8d942a46b 100644 --- a/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml +++ b/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml @@ -91,6 +91,25 @@ webhooks: resources: - persistentvolumeclaims sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-helm-crossplane-io-v1beta1-release + failurePolicy: Fail + name: releases.vshn.appcat.vshn.io + rules: + - apiGroups: + - helm.crossplane.io + apiVersions: + - v1beta1 + operations: + - DELETE + resources: + - releases + sideEffects: None - admissionReviewVersions: - v1 clientConfig: 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 cbfc1c38a..b581d4ab9 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,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 856a5a8ca..e8061819a 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,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 974650541..eb3ecb8c5 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml index d2071ce76..021ab4449 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'false' - imageTag: v4.97.2 + imageTag: spks_deletion_protection initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml index c25ab7c27..16d51a075 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml @@ -569,7 +569,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.97.2 + imageTag: spks_deletion_protection isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml index 0bb9f23e3..234629d98 100644 --- a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 72405ccbe..7201025ce 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 a3d28457b..8ac74bb29 100644 --- a/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.97.2-func + package: ghcr.io/vshn/appcat:spks_deletion_protection-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 9dc5c02e4..28f7a1293 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.97.2 + imageTag: spks_deletion_protection 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 8a66cf354..cc7bf2e70 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.97.2 + imageTag: spks_deletion_protection 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 5de251236..e38573a33 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.97.2 + imageTag: spks_deletion_protection 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 1da1cbd34..4508d1cec 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,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' - imageTag: v4.97.2 + imageTag: spks_deletion_protection 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 a1a35a7b2..3621519c4 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.97.2 + imageTag: spks_deletion_protection 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 0bb9f23e3..234629d98 100644 --- a/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml b/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml index c5d80d360..8d942a46b 100644 --- a/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml +++ b/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml @@ -91,6 +91,25 @@ webhooks: resources: - persistentvolumeclaims sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-helm-crossplane-io-v1beta1-release + failurePolicy: Fail + name: releases.vshn.appcat.vshn.io + rules: + - apiGroups: + - helm.crossplane.io + apiVersions: + - v1beta1 + operations: + - DELETE + resources: + - releases + sideEffects: None - admissionReviewVersions: - v1 clientConfig: 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 cbfc1c38a..b581d4ab9 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,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 5b9d771fa..e1f4f41c7 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,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection 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 4b38ea3dc..28909f7f7 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,7 @@ spec: value: "true" - name: APPCAT_SLI_VSHNMARIADB value: "true" - image: ghcr.io/vshn/appcat:v4.97.2 + image: ghcr.io/vshn/appcat:spks_deletion_protection livenessProbe: httpGet: path: /healthz From 86499b9b71cc858e07497bbb6f43ef810702fa72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 30 Oct 2024 11:59:01 +0000 Subject: [PATCH 2/2] Update tag --- class/defaults.yml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/10_cluster_role.yaml | 71 +++++++++++--- .../controllers/appcat/10_webhooks.yaml | 95 +++++++++++++++++++ .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/21_composition_vshn_minio.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/10_cluster_role.yaml | 71 +++++++++++--- .../controllers/appcat/10_webhooks.yaml | 95 +++++++++++++++++++ .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/20_xrd_vshn_postgres.yaml | 2 + .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/20_xrd_vshn_keycloak.yaml | 2 + .../appcat/appcat/20_xrd_vshn_mariadb.yaml | 43 +++++++++ .../appcat/appcat/20_xrd_vshn_nextcloud.yaml | 2 + .../appcat/appcat/20_xrd_vshn_postgres.yaml | 2 + .../appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/10_cluster_role.yaml | 71 +++++++++++--- .../controllers/appcat/10_webhooks.yaml | 95 +++++++++++++++++++ .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- 60 files changed, 556 insertions(+), 91 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index f7be70a27..96ae137f8 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: spks/deletion_protection + tag: v4.101.0 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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml index d705f0dd6..168af37a1 100644 --- a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/billing/appcat/appcat/10_function_appcat.yaml b/tests/golden/billing/appcat/appcat/10_function_appcat.yaml index 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/billing/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/billing/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 100644 --- a/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 9e9737652..17953715d 100644 --- a/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/billing/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.0 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml index 8ac74bb29..907f0b5b5 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 9e9737652..17953715d 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 9e9737652..17953715d 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 100644 --- a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 100644 --- a/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/controllers/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/controllers/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 882d0d030..7dd92056c 100644 --- a/tests/golden/controllers/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/controllers/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -38,11 +38,65 @@ rules: - update - watch - apiGroups: - - kubernetes.crossplane.io + - syn.tools resources: - - objects + - compositemariadbdatabaseinstances verbs: - - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbinstances/status + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbuserinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositeredisinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositeredisinstances/status + verbs: + - get + - list + - patch + - update + - watch - apiGroups: - vshn.appcat.vshn.io resources: @@ -141,17 +195,6 @@ rules: - patch - update - watch - - apiGroups: - - vshn.appcat.vshn.io - resources: - - xvshnpostgresqls/finalizers - verbs: - - create - - get - - list - - patch - - update - - watch - apiGroups: - vshn.appcat.vshn.io resources: diff --git a/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml b/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml index 8d942a46b..eb4d92ccf 100644 --- a/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml +++ b/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml @@ -5,6 +5,44 @@ metadata: cert-manager.io/inject-ca-from: syn-appcat/webhook-certificate name: appcat-validation webhooks: + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-database + failurePolicy: Fail + name: databases.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - databases + sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-grant + failurePolicy: Fail + name: grants.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - grants + sideEffects: None - admissionReviewVersions: - v1 clientConfig: @@ -47,6 +85,44 @@ webhooks: resources: - objectbuckets sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-kubernetes-crossplane-io-v1alpha2-object + failurePolicy: Fail + name: objects.vshn.appcat.vshn.io + rules: + - apiGroups: + - kubernetes.crossplane.io + apiVersions: + - v1alpha2 + operations: + - DELETE + resources: + - objects + sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-kubernetes-crossplane-io-v1alpha1-object + failurePolicy: Fail + name: objectsv1alpha1.vshn.appcat.vshn.io + rules: + - apiGroups: + - kubernetes.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - objects + sideEffects: None - admissionReviewVersions: - v1 clientConfig: @@ -110,6 +186,25 @@ webhooks: resources: - releases sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-user + failurePolicy: Fail + name: users.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - users + sideEffects: None - admissionReviewVersions: - v1 clientConfig: 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 b581d4ab9..29dac36cd 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,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 9e9737652..17953715d 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 9e9737652..17953715d 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 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,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 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,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 9e9737652..17953715d 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 100644 --- a/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/minio/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/minio/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.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 9d2e88d98..45efe791f 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: spks_deletion_protection + imageTag: v4.101.0 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 d705f0dd6..168af37a1 100644 --- a/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/minio/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/minio/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 882d0d030..7dd92056c 100644 --- a/tests/golden/minio/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/minio/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -38,11 +38,65 @@ rules: - update - watch - apiGroups: - - kubernetes.crossplane.io + - syn.tools resources: - - objects + - compositemariadbdatabaseinstances verbs: - - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbinstances/status + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbuserinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositeredisinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositeredisinstances/status + verbs: + - get + - list + - patch + - update + - watch - apiGroups: - vshn.appcat.vshn.io resources: @@ -141,17 +195,6 @@ rules: - patch - update - watch - - apiGroups: - - vshn.appcat.vshn.io - resources: - - xvshnpostgresqls/finalizers - verbs: - - create - - get - - list - - patch - - update - - watch - apiGroups: - vshn.appcat.vshn.io resources: diff --git a/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml b/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml index 8d942a46b..eb4d92ccf 100644 --- a/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml +++ b/tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml @@ -5,6 +5,44 @@ metadata: cert-manager.io/inject-ca-from: syn-appcat/webhook-certificate name: appcat-validation webhooks: + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-database + failurePolicy: Fail + name: databases.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - databases + sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-grant + failurePolicy: Fail + name: grants.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - grants + sideEffects: None - admissionReviewVersions: - v1 clientConfig: @@ -47,6 +85,44 @@ webhooks: resources: - objectbuckets sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-kubernetes-crossplane-io-v1alpha2-object + failurePolicy: Fail + name: objects.vshn.appcat.vshn.io + rules: + - apiGroups: + - kubernetes.crossplane.io + apiVersions: + - v1alpha2 + operations: + - DELETE + resources: + - objects + sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-kubernetes-crossplane-io-v1alpha1-object + failurePolicy: Fail + name: objectsv1alpha1.vshn.appcat.vshn.io + rules: + - apiGroups: + - kubernetes.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - objects + sideEffects: None - admissionReviewVersions: - v1 clientConfig: @@ -110,6 +186,25 @@ webhooks: resources: - releases sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-user + failurePolicy: Fail + name: users.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - users + sideEffects: None - admissionReviewVersions: - v1 clientConfig: 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 b581d4ab9..29dac36cd 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,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 e8061819a..5725fc00a 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,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 eb3ecb8c5..41bad537f 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/openshift/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/openshift/appcat/appcat/20_xrd_vshn_postgres.yaml index 2885b64a6..235050985 100644 --- a/tests/golden/openshift/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/openshift/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -5699,6 +5699,8 @@ spec: description: Service contains PostgreSQL DBaaS specific properties properties: access: + description: Access defines additional users and databases + for this instance. items: properties: database: diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml index 021ab4449..172b74bc3 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'false' - imageTag: spks_deletion_protection + imageTag: v4.101.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/openshift/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml index 16d51a075..d5566ff92 100644 --- a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml @@ -569,7 +569,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: spks_deletion_protection + imageTag: v4.101.0 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml index 234629d98..e6d4540f5 100644 --- a/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 7201025ce..26ee5d9ee 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,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 8ac74bb29..907f0b5b5 100644 --- a/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:spks_deletion_protection-func + package: ghcr.io/vshn/appcat:v4.101.0-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_keycloak.yaml index 952a455e5..e4dcaa3ed 100644 --- a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -11723,6 +11723,8 @@ spec: properties properties: access: + description: Access defines additional users and + databases for this instance. items: properties: database: diff --git a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_mariadb.yaml index 4baa6de34..0fb493c28 100644 --- a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -5606,6 +5606,49 @@ spec: default: {} description: Service contains MariaDB DBaaS specific properties properties: + access: + description: Access defines additional users and databases + for this instance. + items: + properties: + database: + description: Database is the name of the database + to create, defaults to user. + type: string + privileges: + description: |- + Privileges specifies the privileges to grant the user. Please check + the database's docs for available privileges. + items: + type: string + type: array + user: + description: |- + User specifies the username. If all other fields are left empty + then a new database with the same name and all permissions will be created. + type: string + writeConnectionSecretToRef: + description: |- + WriteConnectionSecretToReference specifies the namespace and name of a + Secret to which any connection details for this user should + be written. + If not specified, a secret with the name $claimname-$username will be + created in the namespace where the claim is located. + properties: + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - name + - namespace + type: object + required: + - user + type: object + type: array mariadbSettings: description: MariadbSettings contains additional MariaDB settings. diff --git a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_nextcloud.yaml index d6538d732..b17192448 100644 --- a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -11686,6 +11686,8 @@ spec: properties properties: access: + description: Access defines additional users and + databases for this instance. items: properties: database: diff --git a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml index 2885b64a6..235050985 100644 --- a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -5699,6 +5699,8 @@ spec: description: Service contains PostgreSQL DBaaS specific properties properties: access: + description: Access defines additional users and databases + for this instance. items: properties: database: 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 28f7a1293..86d479ab6 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: spks_deletion_protection + imageTag: v4.101.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 cc7bf2e70..34d076509 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: spks_deletion_protection + imageTag: v4.101.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 e38573a33..c507b0933 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: spks_deletion_protection + imageTag: v4.101.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 4508d1cec..4f7ba933b 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,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' - imageTag: spks_deletion_protection + imageTag: v4.101.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 3621519c4..aeeada0ac 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,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: spks_deletion_protection + imageTag: v4.101.0 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 234629d98..e6d4540f5 100644 --- a/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +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 - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.0 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/vshn/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 882d0d030..7dd92056c 100644 --- a/tests/golden/vshn/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/vshn/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -38,11 +38,65 @@ rules: - update - watch - apiGroups: - - kubernetes.crossplane.io + - syn.tools resources: - - objects + - compositemariadbdatabaseinstances verbs: - - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbinstances/status + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositemariadbuserinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositeredisinstances + verbs: + - get + - list + - patch + - update + - watch + - apiGroups: + - syn.tools + resources: + - compositeredisinstances/status + verbs: + - get + - list + - patch + - update + - watch - apiGroups: - vshn.appcat.vshn.io resources: @@ -141,17 +195,6 @@ rules: - patch - update - watch - - apiGroups: - - vshn.appcat.vshn.io - resources: - - xvshnpostgresqls/finalizers - verbs: - - create - - get - - list - - patch - - update - - watch - apiGroups: - vshn.appcat.vshn.io resources: diff --git a/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml b/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml index 8d942a46b..eb4d92ccf 100644 --- a/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml +++ b/tests/golden/vshn/appcat/appcat/controllers/appcat/10_webhooks.yaml @@ -5,6 +5,44 @@ metadata: cert-manager.io/inject-ca-from: syn-appcat/webhook-certificate name: appcat-validation webhooks: + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-database + failurePolicy: Fail + name: databases.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - databases + sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-grant + failurePolicy: Fail + name: grants.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - grants + sideEffects: None - admissionReviewVersions: - v1 clientConfig: @@ -47,6 +85,44 @@ webhooks: resources: - objectbuckets sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-kubernetes-crossplane-io-v1alpha2-object + failurePolicy: Fail + name: objects.vshn.appcat.vshn.io + rules: + - apiGroups: + - kubernetes.crossplane.io + apiVersions: + - v1alpha2 + operations: + - DELETE + resources: + - objects + sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-kubernetes-crossplane-io-v1alpha1-object + failurePolicy: Fail + name: objectsv1alpha1.vshn.appcat.vshn.io + rules: + - apiGroups: + - kubernetes.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - objects + sideEffects: None - admissionReviewVersions: - v1 clientConfig: @@ -110,6 +186,25 @@ webhooks: resources: - releases sideEffects: None + - admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: syn-appcat + path: /validate-mysql-sql-crossplane-io-v1alpha1-user + failurePolicy: Fail + name: users.mysql.vshn.appcat.vshn.io + rules: + - apiGroups: + - mysql.sql.crossplane.io + apiVersions: + - v1alpha1 + operations: + - DELETE + resources: + - users + sideEffects: None - admissionReviewVersions: - v1 clientConfig: 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 b581d4ab9..29dac36cd 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,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 e1f4f41c7..4a204765e 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,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.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 28909f7f7..695f132ed 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,7 @@ spec: value: "true" - name: APPCAT_SLI_VSHNMARIADB value: "true" - image: ghcr.io/vshn/appcat:spks_deletion_protection + image: ghcr.io/vshn/appcat:v4.101.0 livenessProbe: httpGet: path: /healthz