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
2 changes: 1 addition & 1 deletion class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: change/kc-customenvvarref
tag: cruft/reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
spec:
package: ghcr.io/vshn/appcat:change_kc-customenvvarref-func
package: ghcr.io/vshn/appcat:cruft_reject-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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
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-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: master-cruft_reject
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-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: master-cruft_reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
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-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: master-cruft_reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
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-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: master-cruft_reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -42,7 +42,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
mode: standalone
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-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: master-cruft_reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -49,7 +49,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
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-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: master-cruft_reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
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 @@ -17,7 +17,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: master-cruft_reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -46,7 +46,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
mode: standalone
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:change_kc-customenvvarref
image: ghcr.io/vshn/appcat:cruft_reject
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
env:
- name: PLANS_NAMESPACE
value: syn-appcat
image: ghcr.io/vshn/appcat:change_kc-customenvvarref
image: ghcr.io/vshn/appcat:cruft_reject
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: change/kc-customenvvarref
function-revision: cruft/reject
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: change/kc-customenvvarref
function-revision: cruft/reject
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:change_kc-customenvvarref
image: ghcr.io/vshn/appcat:cruft_reject
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-change-kc-customenvvarref
name: function-appcat-master-cruft-reject
spec:
package: ghcr.io/vshn/appcat:change_kc-customenvvarref-func
package: ghcr.io/vshn/appcat:cruft_reject-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:change_kc-customenvvarref
image: ghcr.io/vshn/appcat:cruft_reject
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: change/kc-customenvvarref
function-revision: cruft/reject
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: change/kc-customenvvarref
function-revision: cruft/reject
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:change_kc-customenvvarref
image: ghcr.io/vshn/appcat:cruft_reject
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-change-kc-customenvvarref
name: function-appcat-debug-cruft-reject
spec:
package: ghcr.io/vshn/appcat:change_kc-customenvvarref-func
package: ghcr.io/vshn/appcat:cruft_reject-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-change-kc-customenvvarref
name: function-appcat-debug-cruft-reject
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-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: debug-cruft_reject
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: lpg
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: debug-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: debug-cruft_reject
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-debug-change-kc-customenvvarref
name: function-appcat-debug-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
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: lpg
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: debug-change_kc-customenvvarref
metadata.appcat.vshn.io/revision: debug-cruft_reject
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-debug-change-kc-customenvvarref
name: function-appcat-debug-cruft-reject
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: change_kc-customenvvarref
imageTag: cruft_reject
ingress_annotations: |
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
cert-manager.io/cluster-issuer: letsencrypt-staging
Expand Down
Loading
Loading