Skip to content

Commit f4db65b

Browse files
mikeshootzzgithub-actions[bot]
mikeshootzz
authored and
github-actions[bot]
committed
[create-pull-request] automated change
1 parent ebfb804 commit f4db65b

File tree

92 files changed

+318
-162
lines changed

Some content is hidden

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

92 files changed

+318
-162
lines changed

‎class/defaults.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ parameters:
8787
appcat:
8888
registry: ghcr.io
8989
repository: vshn/appcat
90-
tag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
90+
tag: proxysql-resources
9191
functionAppcat:
9292
registry: ${appcat:images:appcat:registry}
9393
repository: ${appcat:images:appcat:repository}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
66
argocd.argoproj.io/sync-wave: '-40'
7-
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
7+
name: function-appcat-master-proxysql-resources
88
spec:
9-
package: ghcr.io/vshn/appcat:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a-func
9+
package: ghcr.io/vshn/appcat:proxysql-resources-func
1010
packagePullPolicy: IfNotPresent
1111
runtimeConfigRef:
1212
name: function-appcat

‎tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5468,6 +5468,45 @@ spec:
54685468
description: MariadbSettings contains additional MariaDB
54695469
settings.
54705470
type: string
5471+
proxySQL:
5472+
default: {}
5473+
description: |-
5474+
ProxySQL contains settings to configure the ProxySQL instance.
5475+
ProxySQL is deployed when instances > 1 to provide load balancing and seamless failover.
5476+
properties:
5477+
resources:
5478+
default: {}
5479+
description: Resources defines resource limits and requests
5480+
for the ProxySQL container.
5481+
properties:
5482+
limits:
5483+
description: Limits defines the resource limits
5484+
for the ProxySQL container.
5485+
properties:
5486+
cpu:
5487+
description: CPU defines the amount of Kubernetes
5488+
CPUs for the ProxySQL container (e.g. "500m").
5489+
type: string
5490+
memory:
5491+
description: Memory defines the amount of memory
5492+
for the ProxySQL container (e.g. "256Mi").
5493+
type: string
5494+
type: object
5495+
requests:
5496+
description: Requests defines the resource requests
5497+
for the ProxySQL container.
5498+
properties:
5499+
cpu:
5500+
description: CPU defines the amount of Kubernetes
5501+
CPUs for the ProxySQL container (e.g. "500m").
5502+
type: string
5503+
memory:
5504+
description: Memory defines the amount of memory
5505+
for the ProxySQL container (e.g. "256Mi").
5506+
type: string
5507+
type: object
5508+
type: object
5509+
type: object
54715510
serviceLevel:
54725511
default: besteffort
54735512
description: ServiceLevel defines the service level of this

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
mode: Pipeline
2222
pipeline:
2323
- functionRef:
24-
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
24+
name: function-appcat-master-proxysql-resources
2525
input:
2626
apiVersion: v1
2727
data:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
metadata.appcat.vshn.io/zone: rma1
1414
labels:
1515
metadata.appcat.vshn.io/offered: 'true'
16-
metadata.appcat.vshn.io/revision: master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
16+
metadata.appcat.vshn.io/revision: master-proxysql-resources
1717
metadata.appcat.vshn.io/serviceID: vshn-codey
1818
name: codey.io
1919
name: codey.io

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
metadata.appcat.vshn.io/zone: rma1
1414
labels:
1515
metadata.appcat.vshn.io/offered: 'true'
16-
metadata.appcat.vshn.io/revision: master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
16+
metadata.appcat.vshn.io/revision: master-proxysql-resources
1717
metadata.appcat.vshn.io/serviceID: vshn-forgejo
1818
name: vshnforgejo.vshn.appcat.vshn.io
1919
name: vshnforgejo.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
2424
mode: Pipeline
2525
pipeline:
2626
- functionRef:
27-
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
27+
name: function-appcat-master-proxysql-resources
2828
input:
2929
apiVersion: v1
3030
data:
@@ -48,7 +48,7 @@ spec:
4848
emailAlertingSmtpUsername: appcat@appuio.cloud
4949
ignoreNamespaceForBilling: vshn-test
5050
imageRegistry: code.forgejo.org
51-
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
51+
imageTag: proxysql-resources
5252
ingress_annotations: |
5353
cert-manager.io/cluster-issuer: letsencrypt-production
5454
isOpenshift: 'false'

‎tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
metadata.appcat.vshn.io/zone: rma1
1414
labels:
1515
metadata.appcat.vshn.io/offered: 'true'
16-
metadata.appcat.vshn.io/revision: master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
16+
metadata.appcat.vshn.io/revision: master-proxysql-resources
1717
metadata.appcat.vshn.io/serviceID: vshn-garage
1818
name: vshngarage.vshn.appcat.vshn.io
1919
name: vshngarage.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
2424
mode: Pipeline
2525
pipeline:
2626
- functionRef:
27-
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
27+
name: function-appcat-master-proxysql-resources
2828
input:
2929
apiVersion: v1
3030
data:
@@ -47,7 +47,7 @@ spec:
4747
emailAlertingSmtpUsername: appcat@appuio.cloud
4848
ignoreNamespaceForBilling: vshn-test
4949
imageRegistry: ''
50-
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
50+
imageTag: proxysql-resources
5151
isOpenshift: 'false'
5252
maintenanceSA: helm-based-service-maintenance
5353
maintenanceURL: ''

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
metadata.appcat.vshn.io/zone: rma1
1414
labels:
1515
metadata.appcat.vshn.io/offered: 'true'
16-
metadata.appcat.vshn.io/revision: master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
16+
metadata.appcat.vshn.io/revision: master-proxysql-resources
1717
metadata.appcat.vshn.io/serviceID: vshn-keycloak
1818
name: vshnkeycloak.vshn.appcat.vshn.io
1919
name: vshnkeycloak.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
2424
mode: Pipeline
2525
pipeline:
2626
- functionRef:
27-
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
27+
name: function-appcat-master-proxysql-resources
2828
input:
2929
apiVersion: v1
3030
data:
@@ -50,7 +50,7 @@ spec:
5050
emailAlertingSmtpUsername: appcat@appuio.cloud
5151
ignoreNamespaceForBilling: vshn-test
5252
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
53-
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
53+
imageTag: proxysql-resources
5454
ingress_annotations: |
5555
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
5656
cert-manager.io/cluster-issuer: letsencrypt-staging

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
metadata.appcat.vshn.io/zone: rma1
1414
labels:
1515
metadata.appcat.vshn.io/offered: 'true'
16-
metadata.appcat.vshn.io/revision: master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
16+
metadata.appcat.vshn.io/revision: master-proxysql-resources
1717
metadata.appcat.vshn.io/serviceID: vshn-mariadb
1818
name: vshnmariadb.vshn.appcat.vshn.io
1919
name: vshnmariadb.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
2424
mode: Pipeline
2525
pipeline:
2626
- functionRef:
27-
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
27+
name: function-appcat-master-proxysql-resources
2828
input:
2929
apiVersion: v1
3030
data:
@@ -48,7 +48,7 @@ spec:
4848
ignoreNamespaceForBilling: vshn-test
4949
imageRegistry: docker.io
5050
imageRepositoryPrefix: bitnamilegacy
51-
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
51+
imageTag: proxysql-resources
5252
isOpenshift: 'false'
5353
maintenanceSA: helm-based-service-maintenance
5454
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
metadata.appcat.vshn.io/zone: rma1
1414
labels:
1515
metadata.appcat.vshn.io/offered: 'true'
16-
metadata.appcat.vshn.io/revision: master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
16+
metadata.appcat.vshn.io/revision: master-proxysql-resources
1717
metadata.appcat.vshn.io/serviceID: vshn-nextcloud
1818
name: vshnnextcloud.vshn.appcat.vshn.io
1919
name: vshnnextcloud.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
2424
mode: Pipeline
2525
pipeline:
2626
- functionRef:
27-
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
27+
name: function-appcat-master-proxysql-resources
2828
input:
2929
apiVersion: v1
3030
data:
@@ -55,7 +55,7 @@ spec:
5555
emailAlertingSmtpUsername: appcat@appuio.cloud
5656
ignoreNamespaceForBilling: vshn-test
5757
imageRegistry: docker.io
58-
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
58+
imageTag: proxysql-resources
5959
ingress_annotations: |
6060
cert-manager.io/cluster-issuer: letsencrypt-staging
6161
nginx.ingress.kubernetes.io/enable-cors: "true"

0 commit comments

Comments
 (0)