Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PR for appcat on disableConnectionPooling #539

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PR for appcat on disableConnectionPooling #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be58a0e
[create-pull-request] automated change
wejdross Nov 15, 2024
dca31b5
Update tag
github-actions[bot] Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion class/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: v4.104.0
tag: v4.106.0
functionAppcat:
registry: ${appcat:images:appcat:registry}
repository: ${appcat:images:appcat:repository}
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/billing/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/controllers/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
env:
- name: PLANS_NAMESPACE
value: syn-appcat
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
emailAlertingSmtpFromAddress: [email protected]
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
emailAlertingSmtpUsername: [email protected]
imageTag: v4.104.0
imageTag: v4.106.0
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
minioChartRepository: https://charts.min.io
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
env:
- name: PLANS_NAMESPACE
value: syn-appcat
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
envFrom:
- secretRef:
name: appcat-sla-reports-creds
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
name: sla-reporter
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.104.0-func
package: ghcr.io/vshn/appcat:v4.106.0-func
runtimeConfigRef:
name: function-appcat
14 changes: 14 additions & 0 deletions tests/golden/openshift/appcat/appcat/20_xrd_vshn_nextcloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5615,11 +5615,19 @@ spec:
description: Service contains nextcloud DBaaS specific properties
properties:
collabora:
description: Collabora contains settings to control the
Collabora integration.
properties:
enabled:
default: false
description: Enabled enables the Collabora integration.
It will autoconfigure the Collabora server URL in
Your Nextcloud instance.
type: boolean
fqdn:
description: FQDN contains the FQDN of the Collabora
server. This is used to configure the Collabora server
URL in Your Nextcloud instance.
type: string
required:
- enabled
Expand Down Expand Up @@ -11697,6 +11705,12 @@ spec:
description: Service contains PostgreSQL DBaaS specific
properties
properties:
DisablePgBouncer:
default: false
description: Disable connection pooling service
PgBouncer. All connections will go straight to
PostgreSQL instance.
type: boolean
access:
description: Access defines additional users and
databases for this instance.
Expand Down
5 changes: 5 additions & 0 deletions tests/golden/openshift/appcat/appcat/20_xrd_vshn_postgres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5698,6 +5698,11 @@ spec:
default: {}
description: Service contains PostgreSQL DBaaS specific properties
properties:
DisablePgBouncer:
default: false
description: Disable connection pooling service PgBouncer.
All connections will go straight to PostgreSQL instance.
type: boolean
access:
description: Access defines additional users and databases
for this instance.
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/21_composition_vshn_nextcloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
emailAlertingSmtpFromAddress: [email protected]
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
emailAlertingSmtpUsername: [email protected]
imageTag: v4.104.0
imageTag: v4.106.0
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-production
isOpenshift: 'true'
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
emailAlertingSmtpUsername: [email protected]
externalDatabaseConnectionsEnabled: 'false'
imageTag: v4.104.0
imageTag: v4.106.0
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ spec:
emailAlertingSmtpFromAddress: [email protected]
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
emailAlertingSmtpUsername: [email protected]
imageTag: v4.104.0
imageTag: v4.106.0
isOpenshift: 'true'
maintenanceSA: helm-based-service-maintenance
ownerGroup: vshn.appcat.vshn.io
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.104.0
image: ghcr.io/vshn/appcat:v4.106.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
Loading