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: v4.166.0
tag: fix-release-after-merge
functionAppcat:
registry: ${appcat:images:appcat:registry}
repository: ${appcat:images:appcat:repository}
Expand Down
20 changes: 10 additions & 10 deletions tests/golden/control-plane/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-v4-166-0
name: function-appcat-master-fix-release-after-merge
spec:
package: ghcr.io/vshn/appcat:v4.166.0-func
package: ghcr.io/vshn/appcat:fix-release-after-merge-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -18,9 +18,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-50-8-v4-164-0
name: function-appcat-v3-51-0-v4-165-0
spec:
package: ghcr.io/vshn/appcat:v4.164.0-func
package: ghcr.io/vshn/appcat:v4.165.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-51-0-v4-165-0
name: function-appcat-v3-51-1-v4-165-1
spec:
package: ghcr.io/vshn/appcat:v4.165.0-func
package: ghcr.io/vshn/appcat:v4.165.1-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,9 +46,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-51-1-v4-165-1
name: function-appcat-v3-52-0-v4-166-0
spec:
package: ghcr.io/vshn/appcat:v4.165.1-func
package: ghcr.io/vshn/appcat:v4.166.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -60,7 +60,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-52-0-v4-166-0
name: function-appcat-v3-52-1-v4-166-0
spec:
package: ghcr.io/vshn/appcat:v4.166.0-func
packagePullPolicy: IfNotPresent
Expand All @@ -74,7 +74,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-52-1-v4-166-0
name: function-appcat-v3-52-2-v4-166-0
spec:
package: ghcr.io/vshn/appcat:v4.166.0-func
packagePullPolicy: IfNotPresent
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-v4-166-0
name: function-appcat-master-fix-release-after-merge
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-v4.166.0
metadata.appcat.vshn.io/revision: master-fix-release-after-merge
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-v4.166.0
metadata.appcat.vshn.io/revision: master-fix-release-after-merge
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-v4-166-0
name: function-appcat-master-fix-release-after-merge
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: v4.166.0
imageTag: fix-release-after-merge
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-v4.166.0
metadata.appcat.vshn.io/revision: master-fix-release-after-merge
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-v4-166-0
name: function-appcat-master-fix-release-after-merge
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: v4.166.0
imageTag: fix-release-after-merge
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-v4.166.0
metadata.appcat.vshn.io/revision: master-fix-release-after-merge
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-v4-166-0
name: function-appcat-master-fix-release-after-merge
input:
apiVersion: v1
data:
Expand All @@ -42,7 +42,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: v4.166.0
imageTag: fix-release-after-merge
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-v4.166.0
metadata.appcat.vshn.io/revision: master-fix-release-after-merge
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-v4-166-0
name: function-appcat-master-fix-release-after-merge
input:
apiVersion: v1
data:
Expand All @@ -49,7 +49,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: v4.166.0
imageTag: fix-release-after-merge
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-v4.166.0
metadata.appcat.vshn.io/revision: master-fix-release-after-merge
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-v4-166-0
name: function-appcat-master-fix-release-after-merge
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: v4.166.0
imageTag: fix-release-after-merge
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-v4.166.0
metadata.appcat.vshn.io/revision: master-fix-release-after-merge
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-v4-166-0
name: function-appcat-master-fix-release-after-merge
input:
apiVersion: v1
data:
Expand All @@ -46,7 +46,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: v4.166.0
imageTag: fix-release-after-merge
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:v4.166.0
image: ghcr.io/vshn/appcat:fix-release-after-merge
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:v4.166.0
image: ghcr.io/vshn/appcat:fix-release-after-merge
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: v4.166.0
function-revision: fix-release-after-merge
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: v4.166.0
function-revision: fix-release-after-merge
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:v4.166.0
image: ghcr.io/vshn/appcat:fix-release-after-merge
name: sla-reporter
resources:
limits:
Expand Down
20 changes: 10 additions & 10 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-v4-166-0
name: function-appcat-master-fix-release-after-merge
spec:
package: ghcr.io/vshn/appcat:v4.166.0-func
package: ghcr.io/vshn/appcat:fix-release-after-merge-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -18,9 +18,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-50-8-v4-164-0
name: function-appcat-v3-51-0-v4-165-0
spec:
package: ghcr.io/vshn/appcat:v4.164.0-func
package: ghcr.io/vshn/appcat:v4.165.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-51-0-v4-165-0
name: function-appcat-v3-51-1-v4-165-1
spec:
package: ghcr.io/vshn/appcat:v4.165.0-func
package: ghcr.io/vshn/appcat:v4.165.1-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,9 +46,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-51-1-v4-165-1
name: function-appcat-v3-52-0-v4-166-0
spec:
package: ghcr.io/vshn/appcat:v4.165.1-func
package: ghcr.io/vshn/appcat:v4.166.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -60,7 +60,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-52-0-v4-166-0
name: function-appcat-v3-52-1-v4-166-0
spec:
package: ghcr.io/vshn/appcat:v4.166.0-func
packagePullPolicy: IfNotPresent
Expand All @@ -74,7 +74,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-52-1-v4-166-0
name: function-appcat-v3-52-2-v4-166-0
spec:
package: ghcr.io/vshn/appcat:v4.166.0-func
packagePullPolicy: IfNotPresent
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:v4.166.0
image: ghcr.io/vshn/appcat:fix-release-after-merge
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: v4.166.0
function-revision: fix-release-after-merge
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: v4.166.0
function-revision: fix-release-after-merge
labels:
app: crossplane-rbac-manager
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Loading
Loading