Merge pull request #423 from vshn/feature/webhook_delprot

Implement deletionProtection for the claims
vshn · Jul 29, 2024 · a6c7a84 · a6c7a84
2 parents 9112a83 + 2f154ca
commit a6c7a84
Show file tree

Hide file tree

Showing 83 changed files with 882 additions and 48 deletions.
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -52,7 +52,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.85.0
+        tag: v4.86.0
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

diff --git a/component/component/main.jsonnet b/component/component/main.jsonnet
@@ -84,6 +84,7 @@ local ns = kube.Namespace(params.namespace) {
   metadata+: {
     labels+: {
       'openshift.io/cluster-monitoring': 'true',
+      'appuio.io/organization': 'vshn',
     } + params.namespaceLabels,
     annotations+: params.namespaceAnnotations,
   },

diff --git a/component/tests/golden/apiserver/appcat/appcat/10_appcat_namespace.yaml b/component/tests/golden/apiserver/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/component/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml b/component/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.85.0
+          image: ghcr.io/vshn/appcat:v4.86.0
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/...nt/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_appcat_namespace.yaml b/...nt/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/...ent/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...ent/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.85.0
+        image: ghcr.io/vshn/appcat:v4.86.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/.../tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_appcat_namespace.yaml b/.../tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/...t/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...t/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.85.0
+        image: ghcr.io/vshn/appcat:v4.86.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_appcat_namespace.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/component/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/10_appcat_namespace.yaml b/component/tests/golden/controllers/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/component/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/10_cluster_role.yaml
@@ -51,6 +51,86 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnkeycloaks
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnkeycloaks/status
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnmariadbs
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnmariadbs/status
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnminios
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnminios/status
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnnextclouds
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnnextclouds/status
+    verbs:
+      - get
+      - list
+      - patch
+      - update
+      - watch
   - apiGroups:
       - vshn.appcat.vshn.io
     resources:

diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml
@@ -72,6 +72,90 @@ webhooks:
         resources:
           - persistentvolumeclaims
     sideEffects: None
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      service:
+        name: webhook-service
+        namespace: syn-appcat
+        path: /validate-vshn-appcat-vshn-io-v1-vshnkeycloak
+    failurePolicy: Fail
+    name: vshnkeycloak.vshn.appcat.vshn.io
+    rules:
+      - apiGroups:
+          - vshn.appcat.vshn.io
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+          - DELETE
+        resources:
+          - vshnkeycloaks
+    sideEffects: None
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      service:
+        name: webhook-service
+        namespace: syn-appcat
+        path: /validate-vshn-appcat-vshn-io-v1-vshnmariadb
+    failurePolicy: Fail
+    name: vshnmariadb.vshn.appcat.vshn.io
+    rules:
+      - apiGroups:
+          - vshn.appcat.vshn.io
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+          - DELETE
+        resources:
+          - vshnmariadbs
+    sideEffects: None
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      service:
+        name: webhook-service
+        namespace: syn-appcat
+        path: /validate-vshn-appcat-vshn-io-v1-vshnminio
+    failurePolicy: Fail
+    name: vshnminio.vshn.appcat.vshn.io
+    rules:
+      - apiGroups:
+          - vshn.appcat.vshn.io
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+          - DELETE
+        resources:
+          - vshnminios
+    sideEffects: None
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      service:
+        name: webhook-service
+        namespace: syn-appcat
+        path: /validate-vshn-appcat-vshn-io-v1-vshnnextcloud
+    failurePolicy: Fail
+    name: vshnnextcloud.vshn.appcat.vshn.io
+    rules:
+      - apiGroups:
+          - vshn.appcat.vshn.io
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+          - DELETE
+        resources:
+          - vshnnextclouds
+    sideEffects: None
   - admissionReviewVersions:
       - v1
     clientConfig:
@@ -87,6 +171,8 @@ webhooks:
         apiVersions:
           - v1
         operations:
+          - CREATE
+          - UPDATE
           - DELETE
         resources:
           - vshnredis

diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/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.85.0
+          image: ghcr.io/vshn/appcat:v4.86.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/defaults/appcat/appcat/10_appcat_namespace.yaml b/component/tests/golden/defaults/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/component/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.85.0
+        image: ghcr.io/vshn/appcat:v4.86.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...nent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_appcat_namespace.yaml b/...nent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/...onent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...onent/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.85.0
+        image: ghcr.io/vshn/appcat:v4.86.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...nt/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_appcat_namespace.yaml b/...nt/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_appcat_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   annotations: {}
   labels:
+    appuio.io/organization: vshn
     name: syn-appcat
     openshift.io/cluster-monitoring: 'true'
   name: syn-appcat
diff --git a/...ent/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...ent/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.85.0-func
+  package: ghcr.io/vshn/appcat:v4.86.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.85.0
+        image: ghcr.io/vshn/appcat:v4.86.0
         livenessProbe:
           httpGet:
             path: /healthz