Merge pull request #955 from vshn/appcat/507/fix/nextcloud-cronjob

Fixed affinity for nextcloud cronjob to be scheduled on the same node

Author: mikeshootzz

class/defaults.yml

@@ -72,7 +72,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.171.0
+        tag: fix/nextcloud-cronjob
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

component/provider.jsonnet

@@ -232,7 +232,7 @@ local providerRBAC = {
       {
         apiGroups: [ 'batch' ],
         resources: [ 'jobs', 'cronjobs' ],
-        verbs: [ 'get', 'list', 'watch', 'create', 'delete' ],
+        verbs: [ 'get', 'list', 'watch', 'create', 'delete', 'update', 'patch' ],
       },
       {
         apiGroups: [ 'monitoring.coreos.com' ],

tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml

@@ -4,9 +4,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-master-v4-171-0
+  name: function-appcat-master-fix-nextcloud-cronjob
 spec:
-  package: ghcr.io/vshn/appcat:v4.171.0-func
+  package: ghcr.io/vshn/appcat:fix_nextcloud-cronjob-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -18,9 +18,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-54-0-v4-168-0
+  name: function-appcat-v3-54-1-v4-168-1
 spec:
-  package: ghcr.io/vshn/appcat:v4.168.0-func
+  package: ghcr.io/vshn/appcat:v4.168.1-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -32,9 +32,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-54-1-v4-168-1
+  name: function-appcat-v3-54-2-v4-168-2
 spec:
-  package: ghcr.io/vshn/appcat:v4.168.1-func
+  package: ghcr.io/vshn/appcat:v4.168.2-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -46,9 +46,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-54-2-v4-168-2
+  name: function-appcat-v3-55-0-v4-169-0
 spec:
-  package: ghcr.io/vshn/appcat:v4.168.2-func
+  package: ghcr.io/vshn/appcat:v4.169.0-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -60,9 +60,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-55-0-v4-169-0
+  name: function-appcat-v3-56-0-v4-170-0
 spec:
-  package: ghcr.io/vshn/appcat:v4.169.0-func
+  package: ghcr.io/vshn/appcat:v4.170.0-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -74,9 +74,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-56-0-v4-170-0
+  name: function-appcat-v3-57-0-v4-171-0
 spec:
-  package: ghcr.io/vshn/appcat:v4.170.0-func
+  package: ghcr.io/vshn/appcat:v4.171.0-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat

tests/golden/control-plane/appcat/appcat/10_provider_helm.yaml

@@ -144,6 +144,8 @@ rules:
       - watch
       - create
       - delete
+      - update
+      - patch
   - apiGroups:
       - monitoring.coreos.com
     resources:

tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml

@@ -21,7 +21,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-171-0
+        name: function-appcat-master-fix-nextcloud-cronjob
       input:
         apiVersion: v1
         data:

tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.171.0
+    metadata.appcat.vshn.io/revision: master-fix_nextcloud-cronjob
     metadata.appcat.vshn.io/serviceID: vshn-codey
     name: codey.io
   name: codey.io

tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.171.0
+    metadata.appcat.vshn.io/revision: master-fix_nextcloud-cronjob
     metadata.appcat.vshn.io/serviceID: vshn-forgejo
     name: vshnforgejo.vshn.appcat.vshn.io
   name: vshnforgejo.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-171-0
+        name: function-appcat-master-fix-nextcloud-cronjob
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: code.forgejo.org
-          imageTag: v4.171.0
+          imageTag: fix_nextcloud-cronjob
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-production
           isOpenshift: 'false'

tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.171.0
+    metadata.appcat.vshn.io/revision: master-fix_nextcloud-cronjob
     metadata.appcat.vshn.io/serviceID: vshn-keycloak
     name: vshnkeycloak.vshn.appcat.vshn.io
   name: vshnkeycloak.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-171-0
+        name: function-appcat-master-fix-nextcloud-cronjob
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
-          imageTag: v4.171.0
+          imageTag: fix_nextcloud-cronjob
           ingress_annotations: |
             nginx.ingress.kubernetes.io/backend-protocol: HTTPS
             cert-manager.io/cluster-issuer: letsencrypt-staging

tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.171.0
+    metadata.appcat.vshn.io/revision: master-fix_nextcloud-cronjob
     metadata.appcat.vshn.io/serviceID: vshn-mariadb
     name: vshnmariadb.vshn.appcat.vshn.io
   name: vshnmariadb.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-171-0
+        name: function-appcat-master-fix-nextcloud-cronjob
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
           imageRepositoryPrefix: bitnamilegacy
-          imageTag: v4.171.0
+          imageTag: fix_nextcloud-cronjob
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100

tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.171.0
+    metadata.appcat.vshn.io/revision: master-fix_nextcloud-cronjob
     metadata.appcat.vshn.io/serviceID: vshn-nextcloud
     name: vshnnextcloud.vshn.appcat.vshn.io
   name: vshnnextcloud.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-171-0
+        name: function-appcat-master-fix-nextcloud-cronjob
       input:
         apiVersion: v1
         data:
@@ -49,7 +49,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
-          imageTag: v4.171.0
+          imageTag: fix_nextcloud-cronjob
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-staging
             nginx.ingress.kubernetes.io/enable-cors: "true"