Skip to content

Commit c51d720

Browse files
zugaowejdross
zugao
authored and
wejdross
committed
[create-pull-request] automated change
1 parent 923fb7f commit c51d720

File tree

55 files changed

+151
-123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+151
-123
lines changed

Diff for: ‎class/defaults.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ parameters:
5555
appcat:
5656
registry: ghcr.io
5757
repository: vshn/appcat
58-
tag: v4.118.2
58+
tag: id-addon-billing
5959
functionAppcat:
6060
registry: ${appcat:images:appcat:registry}
6161
repository: ${appcat:images:appcat:repository}

Diff for: ‎tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
argocd.argoproj.io/sync-wave: '-40'
77
name: function-appcat
88
spec:
9-
package: ghcr.io/vshn/appcat:v4.118.2-func
9+
package: ghcr.io/vshn/appcat:id-addon-billing-func
1010
runtimeConfigRef:
1111
name: function-appcat

Diff for: ‎tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml

+25-18
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,31 @@ spec:
3737
default: {}
3838
description: Parameters are the configurable fields of a VSHNNextcloud.
3939
properties:
40+
addOns:
41+
description: |-
42+
VSHNNextcloudAddOns are additional components, modules, or extensions that enhances the functionality of VSHN Nextcloud.
43+
Add-ons are designed to provide optional features or capabilities that are not part of the main product but
44+
can be installed as needed. Usually add-on are billed separately.
45+
properties:
46+
office:
47+
description: Office contains settings to control the Collabora
48+
integration.
49+
properties:
50+
enabled:
51+
default: false
52+
description: Enabled enables the Collabora integration.
53+
It will autoconfigure the Collabora server URL in
54+
Your Nextcloud instance.
55+
type: boolean
56+
fqdn:
57+
description: FQDN contains the FQDN of the Collabora
58+
server. This is used to configure the Collabora server
59+
URL in Your Nextcloud instance.
60+
type: string
61+
required:
62+
- enabled
63+
type: object
64+
type: object
4065
backup:
4166
default: {}
4267
description: Backup contains settings to control how the instance
@@ -5614,24 +5639,6 @@ spec:
56145639
default: {}
56155640
description: Service contains nextcloud DBaaS specific properties
56165641
properties:
5617-
collabora:
5618-
description: Collabora contains settings to control the
5619-
Collabora integration.
5620-
properties:
5621-
enabled:
5622-
default: false
5623-
description: Enabled enables the Collabora integration.
5624-
It will autoconfigure the Collabora server URL in
5625-
Your Nextcloud instance.
5626-
type: boolean
5627-
fqdn:
5628-
description: FQDN contains the FQDN of the Collabora
5629-
server. This is used to configure the Collabora server
5630-
URL in Your Nextcloud instance.
5631-
type: string
5632-
required:
5633-
- enabled
5634-
type: object
56355642
fqdn:
56365643
description: |-
56375644
FQDN contains the FQDNs array, which will be used for the ingress.

Diff for: ‎tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
4141
emailAlertingSmtpUsername: [email protected]
4242
ignoreNamespaceForBilling: vshn-test
43-
imageTag: v4.118.2
43+
imageTag: id-addon-billing
4444
ingress_annotations: |
4545
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
4646
cert-manager.io/cluster-issuer: letsencrypt-staging

Diff for: ‎tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
4141
emailAlertingSmtpUsername: [email protected]
4242
ignoreNamespaceForBilling: vshn-test
43-
imageTag: v4.118.2
43+
imageTag: id-addon-billing
4444
isOpenshift: 'false'
4545
maintenanceSA: helm-based-service-maintenance
4646
mode: standalone

Diff for: ‎tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
4646
emailAlertingSmtpUsername: [email protected]
4747
ignoreNamespaceForBilling: vshn-test
48-
imageTag: v4.118.2
48+
imageTag: id-addon-billing
4949
ingress_annotations: |
5050
cert-manager.io/cluster-issuer: letsencrypt-staging
5151
nginx.ingress.kubernetes.io/enable-cors: "true"

Diff for: ‎tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
emailAlertingSmtpUsername: [email protected]
4242
externalDatabaseConnectionsEnabled: 'true'
4343
ignoreNamespaceForBilling: vshn-test
44-
imageTag: v4.118.2
44+
imageTag: id-addon-billing
4545
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
4646
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
4747
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",

Diff for: ‎tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ spec:
597597
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
598598
emailAlertingSmtpUsername: [email protected]
599599
ignoreNamespaceForBilling: vshn-test
600-
imageTag: v4.118.2
600+
imageTag: id-addon-billing
601601
isOpenshift: 'false'
602602
maintenanceSA: helm-based-service-maintenance
603603
ownerGroup: vshn.appcat.vshn.io

Diff for: ‎tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- --secure-port=9443
3030
- --tls-cert-file=/apiserver.local.config/certificates/tls.crt
3131
- --tls-private-key-file=/apiserver.local.config/certificates/tls.key
32-
image: ghcr.io/vshn/appcat:v4.118.2
32+
image: ghcr.io/vshn/appcat:id-addon-billing
3333
livenessProbe:
3434
failureThreshold: 3
3535
httpGet:

Diff for: ‎tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
env:
2424
- name: PLANS_NAMESPACE
2525
value: syn-appcat
26-
image: ghcr.io/vshn/appcat:v4.118.2
26+
image: ghcr.io/vshn/appcat:id-addon-billing
2727
livenessProbe:
2828
httpGet:
2929
path: /healthz

Diff for: ‎tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
envFrom:
3131
- secretRef:
3232
name: appcat-sla-reports-creds
33-
image: ghcr.io/vshn/appcat:v4.118.2
33+
image: ghcr.io/vshn/appcat:id-addon-billing
3434
name: sla-reporter
3535
resources:
3636
limits:

Diff for: ‎tests/golden/defaults/appcat/appcat/10_function_appcat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
argocd.argoproj.io/sync-wave: '-40'
77
name: function-appcat
88
spec:
9-
package: ghcr.io/vshn/appcat:v4.118.2-func
9+
package: ghcr.io/vshn/appcat:id-addon-billing-func
1010
runtimeConfigRef:
1111
name: function-appcat

Diff for: ‎tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- --secure-port=9443
3030
- --tls-cert-file=/apiserver.local.config/certificates/tls.crt
3131
- --tls-private-key-file=/apiserver.local.config/certificates/tls.key
32-
image: ghcr.io/vshn/appcat:v4.118.2
32+
image: ghcr.io/vshn/appcat:id-addon-billing
3333
livenessProbe:
3434
failureThreshold: 3
3535
httpGet:

Diff for: ‎tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- --health-probe-bind-address=:8081
2525
- --metrics-bind-address=127.0.0.1:8080
2626
env: []
27-
image: ghcr.io/vshn/appcat:v4.118.2
27+
image: ghcr.io/vshn/appcat:id-addon-billing
2828
livenessProbe:
2929
httpGet:
3030
path: /healthz

Diff for: ‎tests/golden/dev/appcat/appcat/10_function_appcat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
argocd.argoproj.io/sync-wave: '-40'
77
name: function-appcat
88
spec:
9-
package: ghcr.io/vshn/appcat:v4.118.2-func
9+
package: ghcr.io/vshn/appcat:id-addon-billing-func
1010
runtimeConfigRef:
1111
name: function-appcat

Diff for: ‎tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml

+25-18
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,31 @@ spec:
3737
default: {}
3838
description: Parameters are the configurable fields of a VSHNNextcloud.
3939
properties:
40+
addOns:
41+
description: |-
42+
VSHNNextcloudAddOns are additional components, modules, or extensions that enhances the functionality of VSHN Nextcloud.
43+
Add-ons are designed to provide optional features or capabilities that are not part of the main product but
44+
can be installed as needed. Usually add-on are billed separately.
45+
properties:
46+
office:
47+
description: Office contains settings to control the Collabora
48+
integration.
49+
properties:
50+
enabled:
51+
default: false
52+
description: Enabled enables the Collabora integration.
53+
It will autoconfigure the Collabora server URL in
54+
Your Nextcloud instance.
55+
type: boolean
56+
fqdn:
57+
description: FQDN contains the FQDN of the Collabora
58+
server. This is used to configure the Collabora server
59+
URL in Your Nextcloud instance.
60+
type: string
61+
required:
62+
- enabled
63+
type: object
64+
type: object
4065
backup:
4166
default: {}
4267
description: Backup contains settings to control how the instance
@@ -5614,24 +5639,6 @@ spec:
56145639
default: {}
56155640
description: Service contains nextcloud DBaaS specific properties
56165641
properties:
5617-
collabora:
5618-
description: Collabora contains settings to control the
5619-
Collabora integration.
5620-
properties:
5621-
enabled:
5622-
default: false
5623-
description: Enabled enables the Collabora integration.
5624-
It will autoconfigure the Collabora server URL in
5625-
Your Nextcloud instance.
5626-
type: boolean
5627-
fqdn:
5628-
description: FQDN contains the FQDN of the Collabora
5629-
server. This is used to configure the Collabora server
5630-
URL in Your Nextcloud instance.
5631-
type: string
5632-
required:
5633-
- enabled
5634-
type: object
56355642
fqdn:
56365643
description: |-
56375644
FQDN contains the FQDNs array, which will be used for the ingress.

Diff for: ‎tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
4141
emailAlertingSmtpUsername: [email protected]
4242
ignoreNamespaceForBilling: vshn-test
43-
imageTag: v4.118.2
43+
imageTag: id-addon-billing
4444
ingress_annotations: |
4545
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
4646
cert-manager.io/cluster-issuer: letsencrypt-staging

Diff for: ‎tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
4141
emailAlertingSmtpUsername: [email protected]
4242
ignoreNamespaceForBilling: vshn-test
43-
imageTag: v4.118.2
43+
imageTag: id-addon-billing
4444
isOpenshift: 'false'
4545
maintenanceSA: helm-based-service-maintenance
4646
mode: standalone

Diff for: ‎tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
4646
emailAlertingSmtpUsername: [email protected]
4747
ignoreNamespaceForBilling: vshn-test
48-
imageTag: v4.118.2
48+
imageTag: id-addon-billing
4949
ingress_annotations: |
5050
cert-manager.io/cluster-issuer: letsencrypt-staging
5151
isOpenshift: 'false'

Diff for: ‎tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
emailAlertingSmtpUsername: [email protected]
4242
externalDatabaseConnectionsEnabled: 'true'
4343
ignoreNamespaceForBilling: vshn-test
44-
imageTag: v4.118.2
44+
imageTag: id-addon-billing
4545
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
4646
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
4747
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",

Diff for: ‎tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ spec:
597597
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
598598
emailAlertingSmtpUsername: [email protected]
599599
ignoreNamespaceForBilling: vshn-test
600-
imageTag: v4.118.2
600+
imageTag: id-addon-billing
601601
isOpenshift: 'false'
602602
maintenanceSA: helm-based-service-maintenance
603603
ownerGroup: vshn.appcat.vshn.io

Diff for: ‎tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- --secure-port=9443
3030
- --tls-cert-file=/apiserver.local.config/certificates/tls.crt
3131
- --tls-private-key-file=/apiserver.local.config/certificates/tls.key
32-
image: ghcr.io/vshn/appcat:v4.118.2
32+
image: ghcr.io/vshn/appcat:id-addon-billing
3333
livenessProbe:
3434
failureThreshold: 3
3535
httpGet:

Diff for: ‎tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
env:
2424
- name: PLANS_NAMESPACE
2525
value: syn-appcat
26-
image: ghcr.io/vshn/appcat:v4.118.2
26+
image: ghcr.io/vshn/appcat:id-addon-billing
2727
livenessProbe:
2828
httpGet:
2929
path: /healthz

Diff for: ‎tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
envFrom:
3131
- secretRef:
3232
name: appcat-sla-reports-creds
33-
image: ghcr.io/vshn/appcat:v4.118.2
33+
image: ghcr.io/vshn/appcat:id-addon-billing
3434
name: sla-reporter
3535
resources:
3636
limits:

Diff for: ‎tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- --health-probe-bind-address=:8081
2525
- --metrics-bind-address=127.0.0.1:8080
2626
env: []
27-
image: ghcr.io/vshn/appcat:v4.118.2
27+
image: ghcr.io/vshn/appcat:id-addon-billing
2828
livenessProbe:
2929
httpGet:
3030
path: /healthz

Diff for: ‎tests/golden/exodev/appcat/appcat/10_function_appcat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
argocd.argoproj.io/sync-wave: '-40'
77
name: function-appcat
88
spec:
9-
package: ghcr.io/vshn/appcat:v4.118.2-func
9+
package: ghcr.io/vshn/appcat:id-addon-billing-func
1010
runtimeConfigRef:
1111
name: function-appcat

Diff for: ‎tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- --secure-port=9443
3030
- --tls-cert-file=/apiserver.local.config/certificates/tls.crt
3131
- --tls-private-key-file=/apiserver.local.config/certificates/tls.key
32-
image: ghcr.io/vshn/appcat:v4.118.2
32+
image: ghcr.io/vshn/appcat:id-addon-billing
3333
livenessProbe:
3434
failureThreshold: 3
3535
httpGet:

Diff for: ‎tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
env:
2424
- name: PLANS_NAMESPACE
2525
value: syn-appcat
26-
image: ghcr.io/vshn/appcat:v4.118.2
26+
image: ghcr.io/vshn/appcat:id-addon-billing
2727
livenessProbe:
2828
httpGet:
2929
path: /healthz

Diff for: ‎tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
envFrom:
3131
- secretRef:
3232
name: appcat-sla-reports-creds
33-
image: ghcr.io/vshn/appcat:v4.118.2
33+
image: ghcr.io/vshn/appcat:id-addon-billing
3434
name: sla-reporter
3535
resources:
3636
limits:

Diff for: ‎tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
secretKeyRef:
3131
key: kubeconfig
3232
name: controlclustercredentials
33-
image: ghcr.io/vshn/appcat:v4.118.2
33+
image: ghcr.io/vshn/appcat:id-addon-billing
3434
livenessProbe:
3535
httpGet:
3636
path: /healthz

Diff for: ‎tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
env:
2727
- name: KUBECONFIG
2828
value: /.kube/config
29-
image: ghcr.io/vshn/appcat:v4.118.2
29+
image: ghcr.io/vshn/appcat:id-addon-billing
3030
livenessProbe:
3131
httpGet:
3232
path: /healthz

Diff for: ‎tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
argocd.argoproj.io/sync-wave: '-40'
77
name: function-appcat
88
spec:
9-
package: ghcr.io/vshn/appcat:v4.118.2-func
9+
package: ghcr.io/vshn/appcat:id-addon-billing-func
1010
runtimeConfigRef:
1111
name: function-appcat

0 commit comments

Comments
 (0)