diff --git a/class/defaults.yml b/class/defaults.yml index 694e942bb..0504ad5ca 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -76,7 +76,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: dd2f9d5583c0630db56267221791f023102e036e + tag: customize-alertmanager-user 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 cf853064e..8ef4314c2 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user spec: - package: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e-func + package: ghcr.io/vshn/appcat:customize-alertmanager-user-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_forgejo.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_forgejo.yaml index 7c70070a2..b667fe970 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_forgejo.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_forgejo.yaml @@ -97,21 +97,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5650,21 +5635,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml index bca325357..293290d7f 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -100,21 +100,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5609,21 +5594,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11817,21 +11787,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml index cebf707c6..3cf9d4243 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5892,21 +5877,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 70faaf936..2258efbc9 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5514,21 +5499,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11709,21 +11679,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml index f8f7e2093..086703fce 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -115,21 +115,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -6260,21 +6245,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml index da07d3cb3..c15feca8b 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml @@ -105,21 +105,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5803,21 +5788,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. 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 4d6996b0d..0884e92e0 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 0eabc988e..3e58a064d 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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 120e317cb..34b059d89 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' 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 0304509ea..a280db142 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 8f5dd4e2d..831d8ff9d 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 17c8dbf9a..2fbc76200 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 683c26594..166bea1b5 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 31f7d368e..5e7366bde 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user metadata.appcat.vshn.io/serviceID: vshn-postgresql 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 a7c89676a..929643116 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 238ff3497..271619830 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 947cf8451..59b88233e 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 @@ -38,7 +38,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 fd3ea5536..0ac438be0 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 94952e0ba..ec4a1a3eb 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 4ce30e0e1..c7397ed06 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 cf853064e..8ef4314c2 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user spec: - package: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e-func + package: ghcr.io/vshn/appcat:customize-alertmanager-user-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 7b10bcd82..4fabc64e7 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 fd3ea5536..0ac438be0 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 94952e0ba..ec4a1a3eb 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 5950b0941..96cf1c06a 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user imagePullPolicy: IfNotPresent 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 33dedd50b..617304efa 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user spec: - package: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e-func + package: ghcr.io/vshn/appcat:customize-alertmanager-user-func packagePullPolicy: Always runtimeConfigRef: name: enable-proxy diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_forgejo.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_forgejo.yaml index 949ed5eb6..87a689aa2 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_forgejo.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_forgejo.yaml @@ -97,21 +97,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5648,21 +5633,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml index 177c4e860..f3c151a65 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -100,21 +100,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5609,21 +5594,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11814,21 +11784,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml index 50009f90e..4ac39f5e4 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5890,21 +5875,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 025f18875..d518f03bd 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5514,21 +5499,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11706,21 +11676,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml index e11f1225c..e4b9b4f71 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -115,21 +115,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -6258,21 +6243,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml index 2170f7977..afcf8dded 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml @@ -105,21 +105,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5801,21 +5786,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml index 9ace71f70..5dd469e3e 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user 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 3bc94ad10..e4d395b6c 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user 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 afc321608..9f731b061 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' 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 546aab323..eee001edd 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 2c1d88dfd..3d176cd4c 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 d4478b20b..ee58f317e 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 a55f932ce..34df13571 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 7601bf393..46dd631db 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user metadata.appcat.vshn.io/serviceID: vshn-postgresql 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 f07270e7e..d4d8a234b 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: debug-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-debug-customize-alertmanager-user input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 15485516e..1bc0ddbdf 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 701924427..afe2de1cf 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -38,7 +38,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 9e947e94a..0abc0c73a 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 76af0c8a5..0c1ecb12d 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 4ce30e0e1..c7397ed06 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 fb1d41fbc..f3ac5de8e 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 cf853064e..8ef4314c2 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user spec: - package: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e-func + package: ghcr.io/vshn/appcat:customize-alertmanager-user-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 862300955..782170c76 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 d4dc56570..f309abac4 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 550d1b45d..9a0242e89 100644 --- a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -38,7 +38,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 fd3ea5536..0ac438be0 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 94952e0ba..ec4a1a3eb 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 4ce30e0e1..c7397ed06 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 eba8f037f..d60c61dd7 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 @@ -43,7 +43,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 7623cc346..ea2941f1e 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 cf853064e..8ef4314c2 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user spec: - package: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e-func + package: ghcr.io/vshn/appcat:customize-alertmanager-user-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_forgejo.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_forgejo.yaml index 7c70070a2..b667fe970 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_forgejo.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_forgejo.yaml @@ -97,21 +97,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5650,21 +5635,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml index bca325357..293290d7f 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -100,21 +100,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5609,21 +5594,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11817,21 +11787,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml index cebf707c6..3cf9d4243 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5892,21 +5877,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_minio.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_minio.yaml index d2c72c81b..ac2c079c9 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_minio.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_minio.yaml @@ -96,21 +96,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5618,21 +5603,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 70faaf936..2258efbc9 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5514,21 +5499,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11709,21 +11679,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml index f8f7e2093..086703fce 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -115,21 +115,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -6260,21 +6245,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml index da07d3cb3..c15feca8b 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml @@ -105,21 +105,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5803,21 +5788,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. 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 44fbd6ab4..53e4b6fcf 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 862300955..782170c76 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 4d6996b0d..0884e92e0 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 0eabc988e..3e58a064d 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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 af3ed6dd9..fe3f02613 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' 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 fd6f4123a..f61173ff6 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 666e80571..78aaf0c6c 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: bitnamilegacy - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 253e02eb7..71e585032 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net/ - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 3160f9d12..0f9337468 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 df32419b9..da806b2e7 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 830a961a2..61a2aa203 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user metadata.appcat.vshn.io/serviceID: vshn-postgresql 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 03703388c..88a100002 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: vshn - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 448dc4eb2..5e601cf81 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 9e81122e9..365b7f321 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 @@ -38,7 +38,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 ad08bd17a..51f4fcc3b 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 d793f89cb..689d06967 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 4ce30e0e1..c7397ed06 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 5950b0941..96cf1c06a 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 cf853064e..8ef4314c2 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user spec: - package: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e-func + package: ghcr.io/vshn/appcat:customize-alertmanager-user-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_forgejo.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_forgejo.yaml index 7c70070a2..b667fe970 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_forgejo.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_forgejo.yaml @@ -97,21 +97,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5650,21 +5635,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml index bca325357..293290d7f 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -100,21 +100,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5609,21 +5594,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11817,21 +11787,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml index cebf707c6..3cf9d4243 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5892,21 +5877,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_minio.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_minio.yaml index d2c72c81b..ac2c079c9 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_minio.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_minio.yaml @@ -96,21 +96,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5618,21 +5603,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 70faaf936..2258efbc9 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -108,21 +108,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5514,21 +5499,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -11709,21 +11679,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml index f8f7e2093..086703fce 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -115,21 +115,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -6260,21 +6245,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml index da07d3cb3..c15feca8b 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml @@ -105,21 +105,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. @@ -5803,21 +5788,6 @@ spec: - saturday - sunday type: string - disableAppcatRelease: - default: false - description: |- - DisableAppcatRelease disables automatic AppCat composition revision rollouts during maintenance windows. - When enabled, the instance will not automatically receive new AppCat composition revisions - which may contain bug fixes, security patches, and new features. - WARNING: Strongly discouraged - may leave instance without security patches and bug fixes. - type: boolean - disableServiceMaintenance: - default: false - description: |- - DisableServiceMaintenance disables automatic service version updates during maintenance windows. - When enabled, the version specified in spec.parameters.service.version is used as the target version. - WARNING: User takes full responsibility for version management and security updates. - type: boolean timeOfDay: description: |- TimeOfDay for installing updates in UTC. 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 44fbd6ab4..53e4b6fcf 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 862300955..782170c76 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 4d6996b0d..0884e92e0 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user 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 0eabc988e..3e58a064d 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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 fad3b2638..41decfa38 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' 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 de01af83b..018d90d08 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 ac47a418e..5980f60fe 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 e387fceca..37391a54f 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 061fee107..1a47d3ecf 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 1c87efb16..1fe5d7df5 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 6b71c6a45..63040e8a3 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user metadata.appcat.vshn.io/serviceID: vshn-postgresql 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -51,7 +51,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 2934b05cb..17f2d540f 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-dd2f9d5583c0630db56267221791f023102e036e + metadata.appcat.vshn.io/revision: master-customize-alertmanager-user 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-dd2f9d5583c0630db56267221791f023102e036e + name: function-appcat-master-customize-alertmanager-user input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: dd2f9d5583c0630db56267221791f023102e036e + imageTag: customize-alertmanager-user 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 448dc4eb2..5e601cf81 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 9e81122e9..365b7f321 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 @@ -38,7 +38,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 ad08bd17a..51f4fcc3b 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 d793f89cb..689d06967 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: dd2f9d5583c0630db56267221791f023102e036e + function-revision: customize-alertmanager-user 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 4ce30e0e1..c7397ed06 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user 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 5950b0941..96cf1c06a 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:dd2f9d5583c0630db56267221791f023102e036e + image: ghcr.io/vshn/appcat:customize-alertmanager-user imagePullPolicy: IfNotPresent livenessProbe: httpGet: