Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ parameters:
chartName: vshnpostgresql
garage:
source: https://charts.appcat.ch/
version: 0.0.1
version: 0.0.2
chartName: vshngaragecluster
garageBucket:
source: https://charts.appcat.ch/
Expand Down Expand Up @@ -87,7 +87,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
tag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
functionAppcat:
registry: ${appcat:images:appcat:registry}
repository: ${appcat:images:appcat:repository}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
spec:
package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func
package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-codey
name: codey.io
name: codey.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-forgejo
name: vshnforgejo.vshn.appcat.vshn.io
name: vshnforgejo.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand All @@ -47,7 +47,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-production
isOpenshift: 'false'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-garage
name: vshngarage.vshn.appcat.vshn.io
name: vshngarage.vshn.appcat.vshn.io
Expand All @@ -24,14 +24,14 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
billingEnabled: 'false'
bucketRegion: lpg
chartRepository: https://charts.appcat.ch/
chartVersion: 0.0.1
chartVersion: 0.0.2
cloudProvider: cloudscale
clusterName: c-green-test-1234
controlNamespace: syn-appcat-control
Expand All @@ -46,7 +46,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: ''
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
maintenanceURL: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-keycloak
name: vshnkeycloak.vshn.appcat.vshn.io
name: vshnkeycloak.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand All @@ -49,7 +49,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
ingress_annotations: |
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
cert-manager.io/cluster-issuer: letsencrypt-staging
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-mariadb
name: vshnmariadb.vshn.appcat.vshn.io
name: vshnmariadb.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand All @@ -47,7 +47,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageRepositoryPrefix: bitnamilegacy
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-nextcloud
name: vshnnextcloud.vshn.appcat.vshn.io
name: vshnnextcloud.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand Down Expand Up @@ -55,7 +55,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-staging
nginx.ingress.kubernetes.io/enable-cors: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-postgresql
name: vshnpostgres.vshn.appcat.vshn.io
name: vshnpostgres.vshn.appcat.vshn.io
Expand All @@ -26,7 +26,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand All @@ -50,7 +50,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg
name: vshnpostgrescnpg.vshn.appcat.vshn.io
name: vshnpostgrescnpg.vshn.appcat.vshn.io
Expand All @@ -26,7 +26,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand All @@ -50,7 +50,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
isOpenshift: 'false'
kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
loadbalancerAnnotations: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f
metadata.appcat.vshn.io/serviceID: vshn-redis
name: vshnredis.vshn.appcat.vshn.io
name: vshnredis.vshn.appcat.vshn.io
Expand All @@ -28,7 +28,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
input:
apiVersion: v1
data:
Expand All @@ -52,7 +52,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: ghcr.io
imageRepositoryPrefix: vshn
imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f
isOpenshift: 'false'
kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
maintenanceSA: helm-based-service-maintenance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
}
- name: CROSSPLANE_EXTRA_RESOURCES
value: ''
image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f
labels:
app: crossplane
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f
labels:
app: crossplane-rbac-manager
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f
name: sla-reporter
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f
spec:
package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func
package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f
labels:
app: crossplane
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f
labels:
app: crossplane-rbac-manager
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- --health-probe-bind-address=:8081
- --metrics-bind-address=127.0.0.1:8080
env: []
image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b
image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Loading
Loading