From c6c0f2bec86e61f44710745f1d99ea175454fb7b Mon Sep 17 00:00:00 2001 From: Gabriel Saratura Date: Mon, 3 Jun 2024 15:10:58 +0200 Subject: [PATCH 1/5] Add event forwarding for object storage --- component/component/objectstorage.jsonnet | 18 ++++++++++--- ..._composition_objectstorage_cloudscale.yaml | 26 +++++++++++++++++-- ...21_composition_objectstorage_exoscale.yaml | 26 +++++++++++++++++-- ...21_composition_objectstorage_exoscale.yaml | 26 +++++++++++++++++-- 4 files changed, 86 insertions(+), 10 deletions(-) diff --git a/component/component/objectstorage.jsonnet b/component/component/objectstorage.jsonnet index 764d2c145..879839baa 100644 --- a/component/component/objectstorage.jsonnet +++ b/component/component/objectstorage.jsonnet @@ -26,13 +26,19 @@ local xrd = xrds.XRDFromCRD( ] ); +local eventForwarder = { + annotations+: { + 'appcat.vshn.io/forward-events-to': '', + }, +}; + local compositionCloudscale = local compParams = objStoParams.compositions.cloudscale; local baseUser = { apiVersion: 'cloudscale.crossplane.io/v1', kind: 'ObjectsUser', - metadata: {}, + metadata: {} + eventForwarder, spec: { forProvider: { displayName: '', @@ -54,7 +60,7 @@ local compositionCloudscale = local baseBucket = { apiVersion: 'cloudscale.crossplane.io/v1', kind: 'Bucket', - metadata: {}, + metadata: {} + eventForwarder, spec: { forProvider: { bucketName: '', @@ -87,6 +93,7 @@ local compositionCloudscale = comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'metadata.name'), comp.ToCompositeFieldPath('status.conditions', 'status.accessUserConditions'), comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'spec.writeConnectionSecretToRef.name'), + comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'cloudscale.crossplane.io/v1/ObjectsUser/%s/%s'), { type: 'CombineFromComposite', toFieldPath: 'spec.forProvider.displayName', @@ -121,6 +128,7 @@ local compositionCloudscale = comp.FromCompositeFieldPath('spec.parameters.bucketName', 'spec.forProvider.bucketName'), comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'spec.forProvider.credentialsSecretRef.name'), comp.FromCompositeFieldPath('spec.parameters.bucketDeletionPolicy', 'spec.forProvider.bucketDeletionPolicy'), + comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'cloudscale.crossplane.io/v1/Bucket/%s/%s'), comp.FromCompositeFieldPath('spec.parameters.region', 'spec.forProvider.region') { transforms: [ { @@ -145,7 +153,7 @@ local compositionExoscale = local IAMKeyBase = { apiVersion: 'exoscale.crossplane.io/v1', kind: 'IAMKey', - metadata: {}, + metadata: {} + eventForwarder, spec: { forProvider: { keyName: '', @@ -170,7 +178,7 @@ local compositionExoscale = local bucketBase = { apiVersion: 'exoscale.crossplane.io/v1', kind: 'Bucket', - metadata: {}, + metadata: {} + eventForwarder, spec: { forProvider: { bucketName: '', @@ -200,6 +208,7 @@ local compositionExoscale = patches: [ comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'metadata.name'), comp.ToCompositeFieldPath('status.conditions', 'status.accessUserConditions'), + comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'exoscale.crossplane.io/v1/IAMKey/%s/%s'), comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'spec.writeConnectionSecretToRef.name'), { type: 'CombineFromComposite', @@ -237,6 +246,7 @@ local compositionExoscale = comp.FromCompositeFieldPath('spec.parameters.bucketName', 'spec.forProvider.bucketName'), comp.FromCompositeFieldPath('spec.parameters.region', 'spec.forProvider.zone'), comp.FromCompositeFieldPath('spec.parameters.bucketDeletionPolicy', 'spec.forProvider.bucketDeletionPolicy'), + comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'exoscale.crossplane.io/v1/Bucket/%s/%s'), ], }, ], diff --git a/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml b/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml index 058595c6f..604e0d32c 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml @@ -22,7 +22,9 @@ spec: - base: apiVersion: cloudscale.crossplane.io/v1 kind: ObjectsUser - metadata: {} + metadata: + annotations: + appcat.vshn.io/forward-events-to: '' spec: forProvider: displayName: '' @@ -51,6 +53,15 @@ spec: - fromFieldPath: metadata.labels[crossplane.io/composite] toFieldPath: spec.writeConnectionSecretToRef.name type: FromCompositeFieldPath + - combine: + strategy: string + string: + fmt: cloudscale.crossplane.io/v1/ObjectsUser/%s/%s + variables: + - fromFieldPath: metadata.labels[crossplane.io/claim-namespace] + - fromFieldPath: metadata.labels[crossplane.io/claim-name] + toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to] + type: CombineFromComposite - combine: strategy: string string: @@ -68,7 +79,9 @@ spec: - base: apiVersion: cloudscale.crossplane.io/v1 kind: Bucket - metadata: {} + metadata: + annotations: + appcat.vshn.io/forward-events-to: '' spec: forProvider: bucketDeletionPolicy: '' @@ -107,6 +120,15 @@ spec: - fromFieldPath: spec.parameters.bucketDeletionPolicy toFieldPath: spec.forProvider.bucketDeletionPolicy type: FromCompositeFieldPath + - combine: + strategy: string + string: + fmt: cloudscale.crossplane.io/v1/Bucket/%s/%s + variables: + - fromFieldPath: metadata.labels[crossplane.io/claim-namespace] + - fromFieldPath: metadata.labels[crossplane.io/claim-name] + toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to] + type: CombineFromComposite - fromFieldPath: spec.parameters.region toFieldPath: spec.forProvider.region transforms: diff --git a/component/tests/golden/exoscale/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/component/tests/golden/exoscale/appcat/appcat/21_composition_objectstorage_exoscale.yaml index 68ce4f903..a7bc98130 100644 --- a/component/tests/golden/exoscale/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/component/tests/golden/exoscale/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -23,7 +23,9 @@ spec: - base: apiVersion: exoscale.crossplane.io/v1 kind: IAMKey - metadata: {} + metadata: + annotations: + appcat.vshn.io/forward-events-to: '' spec: forProvider: keyName: '' @@ -51,6 +53,15 @@ spec: - fromFieldPath: status.conditions toFieldPath: status.accessUserConditions type: ToCompositeFieldPath + - combine: + strategy: string + string: + fmt: exoscale.crossplane.io/v1/IAMKey/%s/%s + variables: + - fromFieldPath: metadata.labels[crossplane.io/claim-namespace] + - fromFieldPath: metadata.labels[crossplane.io/claim-name] + toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to] + type: CombineFromComposite - fromFieldPath: metadata.labels[crossplane.io/composite] toFieldPath: spec.writeConnectionSecretToRef.name type: FromCompositeFieldPath @@ -72,7 +83,9 @@ spec: - base: apiVersion: exoscale.crossplane.io/v1 kind: Bucket - metadata: {} + metadata: + annotations: + appcat.vshn.io/forward-events-to: '' spec: forProvider: bucketDeletionPolicy: '' @@ -109,4 +122,13 @@ spec: - fromFieldPath: spec.parameters.bucketDeletionPolicy toFieldPath: spec.forProvider.bucketDeletionPolicy type: FromCompositeFieldPath + - combine: + strategy: string + string: + fmt: exoscale.crossplane.io/v1/Bucket/%s/%s + variables: + - fromFieldPath: metadata.labels[crossplane.io/claim-namespace] + - fromFieldPath: metadata.labels[crossplane.io/claim-name] + toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to] + type: CombineFromComposite writeConnectionSecretsToNamespace: crossplane-system diff --git a/component/tests/golden/openshift/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/component/tests/golden/openshift/appcat/appcat/21_composition_objectstorage_exoscale.yaml index 8917d2f88..2e8f84894 100644 --- a/component/tests/golden/openshift/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/component/tests/golden/openshift/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -23,7 +23,9 @@ spec: - base: apiVersion: exoscale.crossplane.io/v1 kind: IAMKey - metadata: {} + metadata: + annotations: + appcat.vshn.io/forward-events-to: '' spec: forProvider: keyName: '' @@ -51,6 +53,15 @@ spec: - fromFieldPath: status.conditions toFieldPath: status.accessUserConditions type: ToCompositeFieldPath + - combine: + strategy: string + string: + fmt: exoscale.crossplane.io/v1/IAMKey/%s/%s + variables: + - fromFieldPath: metadata.labels[crossplane.io/claim-namespace] + - fromFieldPath: metadata.labels[crossplane.io/claim-name] + toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to] + type: CombineFromComposite - fromFieldPath: metadata.labels[crossplane.io/composite] toFieldPath: spec.writeConnectionSecretToRef.name type: FromCompositeFieldPath @@ -72,7 +83,9 @@ spec: - base: apiVersion: exoscale.crossplane.io/v1 kind: Bucket - metadata: {} + metadata: + annotations: + appcat.vshn.io/forward-events-to: '' spec: forProvider: bucketDeletionPolicy: '' @@ -109,4 +122,13 @@ spec: - fromFieldPath: spec.parameters.bucketDeletionPolicy toFieldPath: spec.forProvider.bucketDeletionPolicy type: FromCompositeFieldPath + - combine: + strategy: string + string: + fmt: exoscale.crossplane.io/v1/Bucket/%s/%s + variables: + - fromFieldPath: metadata.labels[crossplane.io/claim-namespace] + - fromFieldPath: metadata.labels[crossplane.io/claim-name] + toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to] + type: CombineFromComposite writeConnectionSecretsToNamespace: syn-crossplane From 512e47840e7744710335ffffd734d97633e8962f Mon Sep 17 00:00:00 2001 From: Gabriel Saratura Date: Tue, 4 Jun 2024 10:00:12 +0200 Subject: [PATCH 2/5] Add event forwarding for external object storage --- .../vshn/appcat/appcat/21_composition_objectstorage_minio.yaml | 2 ++ .../golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml | 1 + .../golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml | 1 + .../golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml | 1 + .../vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml | 1 + .../golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml | 1 + component/tests/vshn.yml | 2 +- 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml index e3b7e0126..dbfcea099 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -26,6 +26,7 @@ spec: apiVersion: v1 data: providerConfig: minio + proxyEndpoint: host.docker.internal:9443 serviceName: miniobucket kind: ConfigMap metadata: @@ -63,6 +64,7 @@ spec: apiVersion: v1 data: providerConfig: minio-cluster + proxyEndpoint: host.docker.internal:9443 serviceName: miniobucket kind: ConfigMap metadata: diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml index 04ce0a185..14d6a0f86 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -50,6 +50,7 @@ spec: true, "memory": "2Gi"}}, "standard-4": {"size": {"cpu": "1", "disk": "16Gi", "enabled": true, "memory": "4Gi"}}, "standard-8": {"size": {"cpu": "2", "disk": "16Gi", "enabled": true, "memory": "8Gi"}}}' + proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' registry_password: '' registry_username: '' diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml index a2cc7ede1..52fd0424c 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -50,6 +50,7 @@ spec: {"size": {"cpu": "125m", "disk": "16Gi", "enabled": true, "memory": "512Mi"}}, "standard-8": {"size": {"cpu": "2", "disk": "16Gi", "enabled": true, "memory": "8Gi"}}}' + proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' restoreSA: mariadbrestoreserviceaccount serviceName: mariadb diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml index 130159963..a10779741 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml @@ -661,6 +661,7 @@ spec: ownerGroup: vshn.appcat.vshn.io ownerKind: XVSHNPostgreSQL ownerVersion: v1 + proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' serviceName: postgresql sgNamespace: stackgres diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml index b62058101..10d6e2a01 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml @@ -763,6 +763,7 @@ spec: ownerGroup: vshn.appcat.vshn.io ownerKind: XVSHNPostgreSQL ownerVersion: v1 + proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' serviceName: postgresql sgNamespace: stackgres diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml index 2798a99ad..a1b9e4a20 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml @@ -601,6 +601,7 @@ spec: ownerGroup: vshn.appcat.vshn.io ownerKind: XVSHNRedis ownerVersion: v1 + proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' restoreSA: redisrestoreserviceaccount serviceName: redis diff --git a/component/tests/vshn.yml b/component/tests/vshn.yml index 7374c44db..ff1b60fc8 100644 --- a/component/tests/vshn.yml +++ b/component/tests/vshn.yml @@ -22,7 +22,7 @@ parameters: appcat: grpcEndpoint: host.docker.internal:9443 - proxyFunction: false + proxyFunction: true quotasEnabled: false appuioManaged: false From 8ce202ea5d29e96352270001d27867254d8781ad Mon Sep 17 00:00:00 2001 From: Gabriel Saratura Date: Tue, 4 Jun 2024 11:15:49 +0200 Subject: [PATCH 3/5] Update appcat image --- component/class/defaults.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/class/defaults.yml b/component/class/defaults.yml index 2e41a634c..eaffddebc 100644 --- a/component/class/defaults.yml +++ b/component/class/defaults.yml @@ -49,7 +49,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: v4.74.0 + tag: v4.75.0 apiserver: registry: ghcr.io repository: vshn/appcat-apiserver From c6ae5c3f21812ad1082e064a64ecd152755b5ee4 Mon Sep 17 00:00:00 2001 From: Gabriel Saratura Date: Tue, 4 Jun 2024 11:52:22 +0200 Subject: [PATCH 4/5] Fxi golden tests --- .../vshn/appcat/appcat/21_composition_objectstorage_minio.yaml | 2 -- .../golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml | 1 - .../golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml | 1 - .../golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml | 1 - .../vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml | 1 - .../golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml | 1 - component/tests/vshn.yml | 2 +- 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml index dbfcea099..e3b7e0126 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -26,7 +26,6 @@ spec: apiVersion: v1 data: providerConfig: minio - proxyEndpoint: host.docker.internal:9443 serviceName: miniobucket kind: ConfigMap metadata: @@ -64,7 +63,6 @@ spec: apiVersion: v1 data: providerConfig: minio-cluster - proxyEndpoint: host.docker.internal:9443 serviceName: miniobucket kind: ConfigMap metadata: diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml index 14d6a0f86..04ce0a185 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -50,7 +50,6 @@ spec: true, "memory": "2Gi"}}, "standard-4": {"size": {"cpu": "1", "disk": "16Gi", "enabled": true, "memory": "4Gi"}}, "standard-8": {"size": {"cpu": "2", "disk": "16Gi", "enabled": true, "memory": "8Gi"}}}' - proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' registry_password: '' registry_username: '' diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml index 52fd0424c..a2cc7ede1 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -50,7 +50,6 @@ spec: {"size": {"cpu": "125m", "disk": "16Gi", "enabled": true, "memory": "512Mi"}}, "standard-8": {"size": {"cpu": "2", "disk": "16Gi", "enabled": true, "memory": "8Gi"}}}' - proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' restoreSA: mariadbrestoreserviceaccount serviceName: mariadb diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml index a10779741..130159963 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml @@ -661,7 +661,6 @@ spec: ownerGroup: vshn.appcat.vshn.io ownerKind: XVSHNPostgreSQL ownerVersion: v1 - proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' serviceName: postgresql sgNamespace: stackgres diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml index 10d6e2a01..b62058101 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml @@ -763,7 +763,6 @@ spec: ownerGroup: vshn.appcat.vshn.io ownerKind: XVSHNPostgreSQL ownerVersion: v1 - proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' serviceName: postgresql sgNamespace: stackgres diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml index a1b9e4a20..2798a99ad 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml @@ -601,7 +601,6 @@ spec: ownerGroup: vshn.appcat.vshn.io ownerKind: XVSHNRedis ownerVersion: v1 - proxyEndpoint: host.docker.internal:9443 quotasEnabled: 'false' restoreSA: redisrestoreserviceaccount serviceName: redis diff --git a/component/tests/vshn.yml b/component/tests/vshn.yml index ff1b60fc8..7374c44db 100644 --- a/component/tests/vshn.yml +++ b/component/tests/vshn.yml @@ -22,7 +22,7 @@ parameters: appcat: grpcEndpoint: host.docker.internal:9443 - proxyFunction: true + proxyFunction: false quotasEnabled: false appuioManaged: false From 1b60521c17b566fac8e79bb26c30c49bad7a4046 Mon Sep 17 00:00:00 2001 From: Gabriel Saratura Date: Wed, 5 Jun 2024 16:00:08 +0200 Subject: [PATCH 5/5] Update golden tests --- .../golden/apiserver/appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../golden/cloudscale/appcat/appcat/10_function_appcat.yaml | 2 +- .../golden/controllers/appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../tests/golden/defaults/appcat/appcat/10_function_appcat.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml | 2 +- .../tests/golden/minio/appcat/appcat/10_function_appcat.yaml | 2 +- .../golden/minio/appcat/appcat/21_composition_vshn_minio.yaml | 2 +- .../minio/appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../golden/openshift/appcat/appcat/10_function_appcat.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../tests/golden/vshn/appcat/appcat/10_function_appcat.yaml | 2 +- .../golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- .../golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml | 2 +- .../golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../vshn/appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index e8acf2bcb..11528c4fc 100644 --- a/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index e8acf2bcb..11528c4fc 100644 --- a/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml index 73259de36..34b9c3359 100644 --- a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index e8acf2bcb..11528c4fc 100644 --- a/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index e8acf2bcb..11528c4fc 100644 --- a/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index e8acf2bcb..11528c4fc 100644 --- a/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml index 5387b784e..32438c937 100644 --- a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml +++ b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml @@ -28,7 +28,7 @@ spec: data: controlNamespace: syn-appcat-control defaultPlan: standard-1 - imageTag: v4.74.0 + imageTag: v4.75.0 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io diff --git a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml index 73259de36..34b9c3359 100644 --- a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml index 6a7dac0c1..80eb01991 100644 --- a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 name: sla-reporter resources: limits: diff --git a/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 710c3615e..377e48ae8 100644 --- a/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index e8acf2bcb..11528c4fc 100644 --- a/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNMARIADB value: "false" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml index 1522338cf..e79599ccc 100644 --- a/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml @@ -3,6 +3,6 @@ kind: Function metadata: name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.74.0-func + package: ghcr.io/vshn/appcat:v4.75.0-func runtimeConfigRef: name: function-appcat diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml index 04ce0a185..cf151ae73 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -37,7 +37,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.74.0 + imageTag: v4.75.0 ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml index a2cc7ede1..bce0dd7be 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -37,7 +37,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.74.0 + imageTag: v4.75.0 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml index 130159963..4497ab7e6 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml @@ -654,7 +654,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' - imageTag: v4.74.0 + imageTag: v4.75.0 isOpenshift: 'false' loadbalancerAnnotations: | foo: bar diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml index b62058101..8e257d200 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml @@ -756,7 +756,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' - imageTag: v4.74.0 + imageTag: v4.75.0 isOpenshift: 'false' loadbalancerAnnotations: | foo: bar diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml index 2798a99ad..a9b02d208 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml @@ -595,7 +595,7 @@ spec: emailAlertingSmtpFromAddress: myuser@example.com emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com - imageTag: v4.74.0 + imageTag: v4.75.0 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml index 73259de36..34b9c3359 100644 --- a/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml index 85b343527..216882f9f 100644 --- a/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 name: sla-reporter resources: limits: diff --git a/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 51c39930b..7744ca567 100644 --- a/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -36,7 +36,7 @@ spec: value: "true" - name: APPCAT_SLI_VSHNMARIADB value: "true" - image: ghcr.io/vshn/appcat:v4.74.0 + image: ghcr.io/vshn/appcat:v4.75.0 livenessProbe: httpGet: path: /healthz