Merge pull request #409 from vshn/fix/svc_mode_parameter

Add parameter for the service mode.
vshn · Jul 19, 2024 · 641131d · 641131d
2 parents 665ff01 + 45013c8
commit 641131d
Show file tree

Hide file tree

Showing 37 changed files with 41 additions and 36 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.83.1
+        tag: v4.83.2
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

diff --git a/component/component/vshn_appcat_services.jsonnet b/component/component/vshn_appcat_services.jsonnet
@@ -96,6 +96,7 @@ local vshn_appcat_service(name, serviceParams) =
                 },
                 data: {
                         serviceName: name,
+                        mode: serviceParams.mode,
                         imageTag: common.GetAppCatImageTag(),
                         chartRepository: params.charts[name].source,
                         chartVersion: params.charts[name].version,

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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-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.83.1
+          image: ghcr.io/vshn/appcat:v4.83.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-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.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-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.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-func
   runtimeConfigRef:
     name: function-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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-func
   runtimeConfigRef:
     name: function-appcat
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.83.1
+          image: ghcr.io/vshn/appcat:v4.83.2
           livenessProbe:
             httpGet:
               path: /healthz

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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-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.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-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.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-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.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml b/component/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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml b/component/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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -38,11 +38,12 @@ spec:
           emailAlertingSmtpFromAddress: [email protected]
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
-          imageTag: v4.83.1
+          imageTag: v4.83.2
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io
           minioChartVersion: 5.0.13
+          mode: distributed
           ownerGroup: vshn.appcat.vshn.io
           ownerKind: XVSHNMinio
           ownerVersion: v1

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

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

diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/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.83.1
+              image: ghcr.io/vshn/appcat:v4.83.2
               name: sla-reporter
               resources:
                 limits:

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.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/component/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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-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.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml b/component/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.83.1-func
+  package: ghcr.io/vshn/appcat:v4.83.2-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml
@@ -38,12 +38,13 @@ spec:
           emailAlertingSmtpFromAddress: [email protected]
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
-          imageTag: v4.83.1
+          imageTag: v4.83.2
           ingress_annotations: |
             nginx.ingress.kubernetes.io/backend-protocol: HTTPS
             cert-manager.io/cluster-issuer: letsencrypt-staging
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
+          mode: standalone
           ownerGroup: vshn.appcat.vshn.io
           ownerKind: XVSHNKeycloak
           ownerVersion: v1

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml
@@ -38,9 +38,10 @@ spec:
           emailAlertingSmtpFromAddress: [email protected]
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
-          imageTag: v4.83.1
+          imageTag: v4.83.2
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
+          mode: standalone
           ownerGroup: vshn.appcat.vshn.io
           ownerKind: XVSHNMariaDB
           ownerVersion: v1

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml
@@ -38,13 +38,14 @@ spec:
           emailAlertingSmtpFromAddress: [email protected]
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
-          imageTag: v4.83.1
+          imageTag: v4.83.2
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-staging
             nginx.ingress.kubernetes.io/enable-cors: "true"
             nginx.ingress.kubernetes.io/cors-allow-headers: "X-Forwarded-For"
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
+          mode: standalone
           ownerGroup: vshn.appcat.vshn.io
           ownerKind: XVSHNNextcloud
           ownerVersion: v1

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
-          imageTag: v4.83.1
+          imageTag: v4.83.2
           initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
             "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
             {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml
@@ -595,7 +595,7 @@ spec:
           emailAlertingSmtpFromAddress: [email protected]
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
-          imageTag: v4.83.1
+          imageTag: v4.83.2
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           ownerGroup: vshn.appcat.vshn.io

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

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

diff --git a/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/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.83.1
+              image: ghcr.io/vshn/appcat:v4.83.2
               name: sla-reporter
               resources:
                 limits:

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: "true"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "true"
-        image: ghcr.io/vshn/appcat:v4.83.1
+        image: ghcr.io/vshn/appcat:v4.83.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/package/main.yaml b/package/main.yaml
@@ -7,7 +7,7 @@ parameters:
     image:
       registry: ghcr.io
       repository: vshn/appcat
-      tag: v4.83.1
+      tag: v4.83.2
   components:
     appcat:
       url: https://github.com/vshn/component-appcat.git