Skip to content

Commit f889793

Browse files
authored
Merge pull request #960 from vshn/fix/version-defaults
Fix version in defaults
2 parents 77e2c6c + b141418 commit f889793

File tree

84 files changed

+210
-210
lines changed

Some content is hidden

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

84 files changed

+210
-210
lines changed

class/defaults.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ parameters:
7272
appcat:
7373
registry: ghcr.io
7474
repository: vshn/appcat
75-
tag: fix/nextcloud-cronjob
75+
tag: v4.171.1
7676
functionAppcat:
7777
registry: ${appcat:images:appcat:registry}
7878
repository: ${appcat:images:appcat:repository}

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

Lines changed: 12 additions & 12 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-fix-nextcloud-cronjob
7+
name: function-appcat-master-v4-171-1
88
spec:
9-
package: ghcr.io/vshn/appcat:fix_nextcloud-cronjob-func
9+
package: ghcr.io/vshn/appcat:v4.171.1-func
1010
packagePullPolicy: IfNotPresent
1111
runtimeConfigRef:
1212
name: function-appcat
@@ -18,9 +18,9 @@ metadata:
1818
annotations:
1919
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
2020
argocd.argoproj.io/sync-wave: '-40'
21-
name: function-appcat-v3-54-1-v4-168-1
21+
name: function-appcat-v3-54-2-v4-168-2
2222
spec:
23-
package: ghcr.io/vshn/appcat:v4.168.1-func
23+
package: ghcr.io/vshn/appcat:v4.168.2-func
2424
packagePullPolicy: IfNotPresent
2525
runtimeConfigRef:
2626
name: function-appcat
@@ -32,9 +32,9 @@ metadata:
3232
annotations:
3333
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
3434
argocd.argoproj.io/sync-wave: '-40'
35-
name: function-appcat-v3-54-2-v4-168-2
35+
name: function-appcat-v3-55-0-v4-169-0
3636
spec:
37-
package: ghcr.io/vshn/appcat:v4.168.2-func
37+
package: ghcr.io/vshn/appcat:v4.169.0-func
3838
packagePullPolicy: IfNotPresent
3939
runtimeConfigRef:
4040
name: function-appcat
@@ -46,9 +46,9 @@ metadata:
4646
annotations:
4747
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
4848
argocd.argoproj.io/sync-wave: '-40'
49-
name: function-appcat-v3-55-0-v4-169-0
49+
name: function-appcat-v3-56-0-v4-170-0
5050
spec:
51-
package: ghcr.io/vshn/appcat:v4.169.0-func
51+
package: ghcr.io/vshn/appcat:v4.170.0-func
5252
packagePullPolicy: IfNotPresent
5353
runtimeConfigRef:
5454
name: function-appcat
@@ -60,9 +60,9 @@ metadata:
6060
annotations:
6161
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
6262
argocd.argoproj.io/sync-wave: '-40'
63-
name: function-appcat-v3-56-0-v4-170-0
63+
name: function-appcat-v3-57-0-v4-171-0
6464
spec:
65-
package: ghcr.io/vshn/appcat:v4.170.0-func
65+
package: ghcr.io/vshn/appcat:v4.171.0-func
6666
packagePullPolicy: IfNotPresent
6767
runtimeConfigRef:
6868
name: function-appcat
@@ -74,9 +74,9 @@ metadata:
7474
annotations:
7575
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
7676
argocd.argoproj.io/sync-wave: '-40'
77-
name: function-appcat-v3-57-0-v4-171-0
77+
name: function-appcat-v3-57-1-fix_nextcloud-cronjob
7878
spec:
79-
package: ghcr.io/vshn/appcat:v4.171.0-func
79+
package: ghcr.io/vshn/appcat:fix_nextcloud-func
8080
packagePullPolicy: IfNotPresent
8181
runtimeConfigRef:
8282
name: function-appcat

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-fix-nextcloud-cronjob
24+
name: function-appcat-master-v4-171-1
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-fix_nextcloud-cronjob
16+
metadata.appcat.vshn.io/revision: master-v4.171.1
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-fix_nextcloud-cronjob
16+
metadata.appcat.vshn.io/revision: master-v4.171.1
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-fix-nextcloud-cronjob
27+
name: function-appcat-master-v4-171-1
2828
input:
2929
apiVersion: v1
3030
data:
@@ -43,7 +43,7 @@ spec:
4343
emailAlertingSmtpUsername: [email protected]
4444
ignoreNamespaceForBilling: vshn-test
4545
imageRegistry: code.forgejo.org
46-
imageTag: fix_nextcloud-cronjob
46+
imageTag: v4.171.1
4747
ingress_annotations: |
4848
cert-manager.io/cluster-issuer: letsencrypt-production
4949
isOpenshift: 'false'

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-fix_nextcloud-cronjob
16+
metadata.appcat.vshn.io/revision: master-v4.171.1
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-fix-nextcloud-cronjob
27+
name: function-appcat-master-v4-171-1
2828
input:
2929
apiVersion: v1
3030
data:
@@ -43,7 +43,7 @@ spec:
4343
emailAlertingSmtpUsername: [email protected]
4444
ignoreNamespaceForBilling: vshn-test
4545
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
46-
imageTag: fix_nextcloud-cronjob
46+
imageTag: v4.171.1
4747
ingress_annotations: |
4848
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
4949
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-fix_nextcloud-cronjob
16+
metadata.appcat.vshn.io/revision: master-v4.171.1
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-fix-nextcloud-cronjob
27+
name: function-appcat-master-v4-171-1
2828
input:
2929
apiVersion: v1
3030
data:
@@ -43,7 +43,7 @@ spec:
4343
ignoreNamespaceForBilling: vshn-test
4444
imageRegistry: docker.io
4545
imageRepositoryPrefix: bitnamilegacy
46-
imageTag: fix_nextcloud-cronjob
46+
imageTag: v4.171.1
4747
isOpenshift: 'false'
4848
maintenanceSA: helm-based-service-maintenance
4949
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-fix_nextcloud-cronjob
16+
metadata.appcat.vshn.io/revision: master-v4.171.1
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-fix-nextcloud-cronjob
27+
name: function-appcat-master-v4-171-1
2828
input:
2929
apiVersion: v1
3030
data:
@@ -49,7 +49,7 @@ spec:
4949
emailAlertingSmtpUsername: [email protected]
5050
ignoreNamespaceForBilling: vshn-test
5151
imageRegistry: docker.io
52-
imageTag: fix_nextcloud-cronjob
52+
imageTag: v4.171.1
5353
ingress_annotations: |
5454
cert-manager.io/cluster-issuer: letsencrypt-staging
5555
nginx.ingress.kubernetes.io/enable-cors: "true"

tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
metadata.appcat.vshn.io/zone: rma1
1616
labels:
1717
metadata.appcat.vshn.io/offered: 'true'
18-
metadata.appcat.vshn.io/revision: master-fix_nextcloud-cronjob
18+
metadata.appcat.vshn.io/revision: master-v4.171.1
1919
metadata.appcat.vshn.io/serviceID: vshn-postgresql
2020
name: vshnpostgres.vshn.appcat.vshn.io
2121
name: vshnpostgres.vshn.appcat.vshn.io
@@ -26,7 +26,7 @@ spec:
2626
mode: Pipeline
2727
pipeline:
2828
- functionRef:
29-
name: function-appcat-master-fix-nextcloud-cronjob
29+
name: function-appcat-master-v4-171-1
3030
input:
3131
apiVersion: v1
3232
data:
@@ -46,7 +46,7 @@ spec:
4646
emailAlertingSmtpUsername: [email protected]
4747
externalDatabaseConnectionsEnabled: 'true'
4848
ignoreNamespaceForBilling: vshn-test
49-
imageTag: fix_nextcloud-cronjob
49+
imageTag: v4.171.1
5050
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
5151
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
5252
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",

tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
metadata.appcat.vshn.io/zone: rma1
1616
labels:
1717
metadata.appcat.vshn.io/offered: 'true'
18-
metadata.appcat.vshn.io/revision: master-fix_nextcloud-cronjob
18+
metadata.appcat.vshn.io/revision: master-v4.171.1
1919
metadata.appcat.vshn.io/serviceID: vshn-postgresql
2020
name: vshnpostgrescnpg.vshn.appcat.vshn.io
2121
name: vshnpostgrescnpg.vshn.appcat.vshn.io
@@ -26,7 +26,7 @@ spec:
2626
mode: Pipeline
2727
pipeline:
2828
- functionRef:
29-
name: function-appcat-master-fix-nextcloud-cronjob
29+
name: function-appcat-master-v4-171-1
3030
input:
3131
apiVersion: v1
3232
data:
@@ -46,7 +46,7 @@ spec:
4646
emailAlertingSmtpUsername: [email protected]
4747
externalDatabaseConnectionsEnabled: 'true'
4848
ignoreNamespaceForBilling: vshn-test
49-
imageTag: fix_nextcloud-cronjob
49+
imageTag: v4.171.1
5050
isOpenshift: 'false'
5151
kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
5252
loadbalancerAnnotations: |

0 commit comments

Comments
 (0)