Merge pull request #442 from vshn/add/nextcloud_api

Add Nextcloud backup API
vshn · Aug 13, 2024 · 2091b87 · 2091b87
2 parents b63c333 + b5fa8de
commit 2091b87
Show file tree

Hide file tree

Showing 69 changed files with 553 additions and 93 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -55,7 +55,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.91.0
+        tag: v4.92.0
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

diff --git a/component/appcat_apiserver.jsonnet b/component/appcat_apiserver.jsonnet
@@ -46,7 +46,11 @@ local serviceAccount = loadManifest('service-account.yaml') {
   },
 };
 
-local clusterRoleAPIServer = loadManifest('role.yaml');
+local clusterRoleAPIServer = loadManifest('role.yaml') {
+  metadata+: {
+    name: 'appcat-apiserver',
+  },
+};
 
 local clusterRoleBinding = kube.ClusterRoleBinding(clusterRoleAPIServer.metadata.name) {
   roleRef: {

diff --git a/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.91.0-func
+  package: ghcr.io/vshn/appcat:v4.92.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_api_server.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: appcat
+  name: appcat-apiserver
 rules:
   - apiGroups:
       - ''
@@ -72,7 +72,45 @@ rules:
       - vshn.appcat.vshn.io
     resources:
       - vshnmariadbs
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnpostgresqls
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - vshnredis
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - xvshnpostgresqls
     verbs:
       - get

diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/10_cluster_role_binding.yaml
@@ -3,12 +3,12 @@ kind: ClusterRoleBinding
 metadata:
   annotations: {}
   labels:
-    name: appcat
-  name: appcat
+    name: appcat-apiserver
+  name: appcat-apiserver
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: appcat
+  name: appcat-apiserver
 subjects:
   - kind: ServiceAccount
     name: appcat-apiserver

diff --git a/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml
@@ -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.91.0
+          image: ghcr.io/vshn/appcat:v4.92.0
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.91.0-func
+  package: ghcr.io/vshn/appcat:v4.92.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/...loudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/...loudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_api_server.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: appcat
+  name: appcat-apiserver
 rules:
   - apiGroups:
       - ''
@@ -72,7 +72,45 @@ rules:
       - vshn.appcat.vshn.io
     resources:
       - vshnmariadbs
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnpostgresqls
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - vshnredis
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - xvshnpostgresqls
     verbs:
       - get

diff --git a/...n/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/...n/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/10_cluster_role_binding.yaml
@@ -3,12 +3,12 @@ kind: ClusterRoleBinding
 metadata:
   annotations: {}
   labels:
-    name: appcat
-  name: appcat
+    name: appcat-apiserver
+  name: appcat-apiserver
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: appcat
+  name: appcat-apiserver
 subjects:
   - kind: ServiceAccount
     name: appcat-apiserver

diff --git a/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml
@@ -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.91.0
+          image: ghcr.io/vshn/appcat:v4.92.0
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.91.0
+        image: ghcr.io/vshn/appcat:v4.92.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.91.0-func
+  package: ghcr.io/vshn/appcat:v4.92.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/...udscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/...udscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_api_server.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: appcat
+  name: appcat-apiserver
 rules:
   - apiGroups:
       - ''
@@ -72,7 +72,45 @@ rules:
       - vshn.appcat.vshn.io
     resources:
       - vshnmariadbs
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnpostgresqls
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - vshnredis
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - xvshnpostgresqls
     verbs:
       - get

diff --git a/...cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/...cloudscale-metrics-collector-managed/appcat/appcat/apiserver/10_cluster_role_binding.yaml
@@ -3,12 +3,12 @@ kind: ClusterRoleBinding
 metadata:
   annotations: {}
   labels:
-    name: appcat
-  name: appcat
+    name: appcat-apiserver
+  name: appcat-apiserver
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: appcat
+  name: appcat-apiserver
 subjects:
   - kind: ServiceAccount
     name: appcat-apiserver

diff --git a/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml
@@ -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.91.0
+          image: ghcr.io/vshn/appcat:v4.92.0
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.91.0
+        image: ghcr.io/vshn/appcat:v4.92.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.91.0-func
+  package: ghcr.io/vshn/appcat:v4.92.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_api_server.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: appcat
+  name: appcat-apiserver
 rules:
   - apiGroups:
       - ''
@@ -72,7 +72,45 @@ rules:
       - vshn.appcat.vshn.io
     resources:
       - vshnmariadbs
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - vshnpostgresqls
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - vshnredis
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
+      - xvshnnextclouds
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - vshn.appcat.vshn.io
+    resources:
       - xvshnpostgresqls
     verbs:
       - get

diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/10_cluster_role_binding.yaml
@@ -3,12 +3,12 @@ kind: ClusterRoleBinding
 metadata:
   annotations: {}
   labels:
-    name: appcat
-  name: appcat
+    name: appcat-apiserver
+  name: appcat-apiserver
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: appcat
+  name: appcat-apiserver
 subjects:
   - kind: ServiceAccount
     name: appcat-apiserver

diff --git a/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml
@@ -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.91.0
+          image: ghcr.io/vshn/appcat:v4.92.0
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.91.0-func
+  package: ghcr.io/vshn/appcat:v4.92.0-func
   runtimeConfigRef:
     name: function-appcat