From 8a35e6110a061037ab37bfafd5d263a2c136ff83 Mon Sep 17 00:00:00 2001 From: mdnix <43579204+mdnix@users.noreply.github.com> Date: Tue, 12 May 2026 08:58:58 +0000 Subject: [PATCH] [create-pull-request] automated change --- class/defaults.yml | 2 +- .../control-plane/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- tests/golden/defaults/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../defaults/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../golden/dev-talos/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../dev-talos/appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../dev-talos/appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../dev-talos/appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../dev-talos/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/dev/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/appcat/21_composition_objectstorage_garage.yaml | 2 +- .../golden/dev/appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../dev/appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../golden/dev/appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../dev/appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/exodev/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/21_composition_objectstorage_exoscale.yaml | 2 +- .../exodev/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../exodev/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/21_composition_objectstorage_cloudscale.yaml | 2 +- .../appcat/21_composition_objectstorage_exoscale.yaml | 2 +- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../vshn-managed/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/21_composition_objectstorage_cloudscale.yaml | 2 +- .../appcat/21_composition_objectstorage_exoscale.yaml | 2 +- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_minio.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../vshn-managed/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- 105 files changed, 196 insertions(+), 196 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 3f6fd8ded..a2f87e548 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -94,7 +94,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + tag: fix/cnpg-antiaffinity functionAppcat: registry: ${appcat:images:appcat:registry} repository: ${appcat:images:appcat:repository} diff --git a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml b/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml index 33c544709..387a0adbe 100644 --- a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml index 884a93e2a..108b8dfa4 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml index 84b6ecc56..1ec94e4c0 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml index 24d323006..218c26baa 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml index a1700d0f8..6bc11f095 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml index 6300ca1df..bb3487c7b 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml index 9cfeff5ce..30475ab87 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml index 2bf7c9578..af08cfb56 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging nginx.ingress.kubernetes.io/enable-cors: "true" diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml index 280d37cb5..9b83f8621 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 52c7bfe97..9fcf33b01 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml index 63a987bdf..2a2b1e228 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml index 2322990b7..adc6d07da 100644 --- a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml @@ -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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml index e60b86990..4f96fdfc6 100644 --- a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index 0e2025d8c..57bea47e6 100644 --- a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index cbfad7d30..c675bb40a 100644 --- a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml index c8299593d..cfe9dca8e 100644 --- a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity name: sla-reporter resources: limits: diff --git a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml index 33c544709..387a0adbe 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml index 25c597550..6c9865557 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml @@ -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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index 0e2025d8c..57bea47e6 100644 --- a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index cbfad7d30..c675bb40a 100644 --- a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index a67cb6fb7..b1121d02c 100644 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml index 2a3e8d6a6..581a4be44 100644 --- a/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity-func packagePullPolicy: Always runtimeConfigRef: name: enable-proxy diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml index 773f782cf..6875fc717 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml index 2eeb39f20..8dcaddef6 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml index 3dac24068..5a18e803c 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml index 0ff97badb..91ee775d3 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml index e0f5acb2e..3ddfc2c8b 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml index e975c250d..1eccb6539 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml index 585029b59..aa01d604f 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'false' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml index 46b2e290b..a4d2b7192 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: httpGatewayName: http-gateway httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index c78a2c4d6..c762f05a4 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: httpGatewayName: http-gateway httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml index f3e8240d2..0d646f3be 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml index 7bfa026aa..89fa4318f 100644 --- a/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml @@ -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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml index b5b53ff87..7262e08eb 100644 --- a/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -44,7 +44,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index 5853d59c5..105c64990 100644 --- a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index c6333557a..232502750 100644 --- a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml index c8299593d..cfe9dca8e 100644 --- a/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity name: sla-reporter resources: limits: diff --git a/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index cb4918776..27201751f 100644 --- a/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml index 2a3e8d6a6..581a4be44 100644 --- a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity-func packagePullPolicy: Always runtimeConfigRef: name: enable-proxy diff --git a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml index 77e468931..ff498802b 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml index 2eeb39f20..8dcaddef6 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml index 6575ff4d1..b831ffe6d 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml index fc5f43fef..6f4086ec0 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml index 1154986f2..64f6c50aa 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml index 2222cc398..0f94f28d4 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml index 3a02538b9..8680294b2 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml index 807aac75c..3624b8837 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 021144f4a..89f578dbf 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml index 94c989bbb..b72693a32 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml index 7bfa026aa..89fa4318f 100644 --- a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml @@ -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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml index 0fef85a60..2d9d0d863 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index f7ad9468c..07f48e74c 100644 --- a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 0ee6b72d2..ec7f098a7 100644 --- a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml index c8299593d..cfe9dca8e 100644 --- a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity name: sla-reporter resources: limits: diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index cb4918776..27201751f 100644 --- a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml b/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml index 33c544709..387a0adbe 100644 --- a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml index a13201be1..26eb6d28a 100644 --- a/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -22,7 +22,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml index 123f3260e..10157cb2c 100644 --- a/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml @@ -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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml index b3d59d5ea..af25fa187 100644 --- a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index 0e2025d8c..57bea47e6 100644 --- a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index cbfad7d30..c675bb40a 100644 --- a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml index c8299593d..cfe9dca8e 100644 --- a/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity name: sla-reporter resources: limits: diff --git a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml index 44b37f767..12a8081bd 100644 --- a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -44,7 +44,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index eff78a844..da11d155c 100644 --- a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -27,7 +27,7 @@ spec: env: - name: KUBECONFIG value: /.kube/config - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml index 33c544709..387a0adbe 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml index 3ad663092..d828ef850 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml index a13201be1..26eb6d28a 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -22,7 +22,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml index 884a93e2a..108b8dfa4 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml index 84b6ecc56..1ec94e4c0 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml index 97431f479..8a7f9e1df 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml index a86cd066d..a67d06751 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml index 11d0129a0..06740299b 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml index 21b4c1f0c..afee4d187 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml index f08ae943f..98279d339 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'false' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-minio name: vshnminio.vshn.appcat.vshn.io name: vshnminio.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net/ - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/minio/minio/tags/?page_size=100 diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml index 60bc72927..369b9c22b 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml index 1cb998011..2a9718cb4 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 45ea215b5..09e872424 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml index 7cfd59d55..80ff62a1c 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml index 04c368971..cf8d1d68c 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml @@ -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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml index 22acbccb9..b39fca440 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index f817dfe6d..397d5a37c 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 5aec4c417..b4823871d 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml index c8299593d..cfe9dca8e 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index a67cb6fb7..b1121d02c 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml index 33c544709..387a0adbe 100644 --- a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml index 3ad663092..d828ef850 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml index a13201be1..26eb6d28a 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -22,7 +22,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml index 884a93e2a..108b8dfa4 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml index 84b6ecc56..1ec94e4c0 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml index 403cb4ad7..d0ddcdd74 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml index b12f71b22..455ebf503 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml index a488d4075..9dfc8a986 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml index daf428ab5..01c381a8f 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml index 97f052c73..504a12c67 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'false' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-minio name: vshnminio.vshn.appcat.vshn.io name: vshnminio.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/minio/minio/tags/?page_size=100 diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml index b8d104de6..364f3c7a2 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml index 0c54cdd0c..dde032052 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 097ef537d..813de1068 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml index d1db3b836..c4c0c02c7 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-fix_cnpg-antiaffinity metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-fix-cnpg-antiaffinity input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: fix_cnpg-antiaffinity isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml index 04c368971..cf8d1d68c 100644 --- a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml @@ -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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml index 22acbccb9..b39fca440 100644 --- a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index f817dfe6d..397d5a37c 100644 --- a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 5aec4c417..b4823871d 100644 --- a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: fix/cnpg-antiaffinity labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml index c8299593d..cfe9dca8e 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index a67cb6fb7..b1121d02c 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:fix_cnpg-antiaffinity imagePullPolicy: IfNotPresent livenessProbe: httpGet: