Skip to content
Merged
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
2 changes: 1 addition & 1 deletion class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
tag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
spec:
package: ghcr.io/vshn/appcat:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a-func
package: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97-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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand All @@ -48,7 +48,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
metadata.appcat.vshn.io/serviceID: vshn-garage
name: vshngarage.vshn.appcat.vshn.io
name: vshngarage.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand All @@ -47,7 +47,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: ''
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand All @@ -50,7 +50,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand All @@ -48,7 +48,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageRepositoryPrefix: bitnamilegacy
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand Down Expand Up @@ -55,7 +55,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand All @@ -51,7 +51,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
metadata.appcat.vshn.io/serviceID: vshn-postgresql
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand All @@ -51,7 +51,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: master-eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
input:
apiVersion: v1
data:
Expand All @@ -52,7 +52,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: ghcr.io
imageRepositoryPrefix: vshn
imageTag: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
imageTag: eb065df0ae7088724adf6b08e29133ce75531e97
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:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
image: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
}
- name: CROSSPLANE_EXTRA_RESOURCES
value: ''
image: ghcr.io/vshn/appcat:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
image: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97
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: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
function-revision: eb065df0ae7088724adf6b08e29133ce75531e97
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: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
function-revision: eb065df0ae7088724adf6b08e29133ce75531e97
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:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
image: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97
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-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-master-eb065df0ae7088724adf6b08e29133ce75531e97
spec:
package: ghcr.io/vshn/appcat:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a-func
package: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97-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:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
image: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97
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: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
function-revision: eb065df0ae7088724adf6b08e29133ce75531e97
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: 2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
function-revision: eb065df0ae7088724adf6b08e29133ce75531e97
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:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
image: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/dev/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-debug-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-debug-eb065df0ae7088724adf6b08e29133ce75531e97
spec:
package: ghcr.io/vshn/appcat:2db8de5a8a14d3352b4a592ad35a45f9ecb2918a-func
package: ghcr.io/vshn/appcat:eb065df0ae7088724adf6b08e29133ce75531e97-func
packagePullPolicy: Always
runtimeConfigRef:
name: enable-proxy
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-debug-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
name: function-appcat-debug-eb065df0ae7088724adf6b08e29133ce75531e97
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: lpg
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: debug-2db8de5a8a14d3352b4a592ad35a45f9ecb2918a
metadata.appcat.vshn.io/revision: debug-eb065df0ae7088724adf6b08e29133ce75531e97
metadata.appcat.vshn.io/serviceID: vshn-codey
name: codey.io
name: codey.io
Expand Down
Loading
Loading