diff --git a/argocd/README.md b/argocd/README.md index fc269cff..30adb7f4 100644 --- a/argocd/README.md +++ b/argocd/README.md @@ -102,7 +102,7 @@ spec: source: path: argocd repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop syncPolicy: automated: allowEmpty: true diff --git a/argocd/eoepca/application-hub/app-application-hub.yaml b/argocd/eoepca/application-hub/app-application-hub.yaml index f2b897e6..51cb514b 100644 --- a/argocd/eoepca/application-hub/app-application-hub.yaml +++ b/argocd/eoepca/application-hub/app-application-hub.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/application-hub/parts destination: name: in-cluster diff --git a/argocd/eoepca/application-quality/app-application-quality-sonarqube.yaml b/argocd/eoepca/application-quality/app-application-quality-sonarqube.yaml index 4b144351..e4fba07e 100644 --- a/argocd/eoepca/application-quality/app-application-quality-sonarqube.yaml +++ b/argocd/eoepca/application-quality/app-application-quality-sonarqube.yaml @@ -20,13 +20,13 @@ spec: valueFiles: - $values/argocd/eoepca/application-quality/sonarqube/application-quality-sonarqube-db-values.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop # owned here (wave 0) so postgresql can be healthy before sonarqube's own wave runs path: argocd/eoepca/application-quality/sonarqube directory: include: "ss-application-quality-sonarqube-db-secrets.yaml" - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: name: in-cluster @@ -66,7 +66,7 @@ spec: project: eoepca sources: - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/application-quality/sonarqube # Owned by application-quality-sonarqube-db instead (wave 0), so the # postgresql chart doesn't deadlock waiting on this app's later wave. @@ -80,7 +80,7 @@ spec: valueFiles: - $values/argocd/eoepca/application-quality/sonarqube/application-quality-sonarqube-values.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: name: in-cluster diff --git a/argocd/eoepca/application-quality/app-application-quality.yaml b/argocd/eoepca/application-quality/app-application-quality.yaml index d599d0c5..3f34eba7 100644 --- a/argocd/eoepca/application-quality/app-application-quality.yaml +++ b/argocd/eoepca/application-quality/app-application-quality.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/application-quality/parts destination: name: in-cluster diff --git a/argocd/eoepca/application-quality/parts/app-application-quality-core.yaml b/argocd/eoepca/application-quality/parts/app-application-quality-core.yaml index 1cadb252..0953f457 100644 --- a/argocd/eoepca/application-quality/parts/app-application-quality-core.yaml +++ b/argocd/eoepca/application-quality/parts/app-application-quality-core.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/application-quality/parts/application-quality-values.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: name: in-cluster diff --git a/argocd/eoepca/data-access/app-data-access.yaml b/argocd/eoepca/data-access/app-data-access.yaml index 2258d783..37a65906 100644 --- a/argocd/eoepca/data-access/app-data-access.yaml +++ b/argocd/eoepca/data-access/app-data-access.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/data-access/parts destination: name: in-cluster diff --git a/argocd/eoepca/data-access/parts/app-data-access-core.yaml b/argocd/eoepca/data-access/parts/app-data-access-core.yaml index 2673a6b0..d6d169fd 100644 --- a/argocd/eoepca/data-access/parts/app-data-access-core.yaml +++ b/argocd/eoepca/data-access/parts/app-data-access-core.yaml @@ -65,7 +65,7 @@ spec: - $values/argocd/eoepca/data-access/parts/values/values-pgstac-geoparquet-exporter.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/data-proxy/app-data-proxy.yaml b/argocd/eoepca/data-proxy/app-data-proxy.yaml index cf5cae65..7fe9d777 100644 --- a/argocd/eoepca/data-proxy/app-data-proxy.yaml +++ b/argocd/eoepca/data-proxy/app-data-proxy.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/data-proxy/parts destination: name: in-cluster diff --git a/argocd/eoepca/datacube-access/app-datacube-access.yaml b/argocd/eoepca/datacube-access/app-datacube-access.yaml index b1aed78f..ac6138df 100644 --- a/argocd/eoepca/datacube-access/app-datacube-access.yaml +++ b/argocd/eoepca/datacube-access/app-datacube-access.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/datacube-access/parts destination: name: in-cluster diff --git a/argocd/eoepca/datacube-access/parts/app-datacube-access-core.yaml b/argocd/eoepca/datacube-access/parts/app-datacube-access-core.yaml index 2846d940..13315273 100644 --- a/argocd/eoepca/datacube-access/parts/app-datacube-access-core.yaml +++ b/argocd/eoepca/datacube-access/parts/app-datacube-access-core.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/datacube-access/parts/values/values-datacube-access-core.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/iam/app-iam-bb.yaml b/argocd/eoepca/iam/app-iam-bb.yaml index ae224520..e141886b 100644 --- a/argocd/eoepca/iam/app-iam-bb.yaml +++ b/argocd/eoepca/iam/app-iam-bb.yaml @@ -13,7 +13,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/iam/parts destination: name: in-cluster diff --git a/argocd/eoepca/iam/parts/app-iam-core.yaml b/argocd/eoepca/iam/parts/app-iam-core.yaml index 0c8e1f2d..9ecf5637 100644 --- a/argocd/eoepca/iam/parts/app-iam-core.yaml +++ b/argocd/eoepca/iam/parts/app-iam-core.yaml @@ -15,7 +15,7 @@ spec: valueFiles: - $values/argocd/eoepca/iam/parts/values/iam-values.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/identity-service/README.md b/argocd/eoepca/identity-service/README.md index ce26246d..db9ecc2e 100644 --- a/argocd/eoepca/identity-service/README.md +++ b/argocd/eoepca/identity-service/README.md @@ -12,6 +12,6 @@ Thus, the root `identity-service` application references the `parts/` subdirecto ```yaml source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/identity-service/parts ``` diff --git a/argocd/eoepca/identity-service/app-identity-service.yaml b/argocd/eoepca/identity-service/app-identity-service.yaml index ff7453ba..e14e5978 100644 --- a/argocd/eoepca/identity-service/app-identity-service.yaml +++ b/argocd/eoepca/identity-service/app-identity-service.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/identity-service/parts destination: name: in-cluster diff --git a/argocd/eoepca/identity-service/parts/app-identity-service-core.yaml b/argocd/eoepca/identity-service/parts/app-identity-service-core.yaml index 78cb6eaa..d83d2c7f 100644 --- a/argocd/eoepca/identity-service/parts/app-identity-service-core.yaml +++ b/argocd/eoepca/identity-service/parts/app-identity-service-core.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/identity-service/parts/values/values-identity-service.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/mlops/app-mlops.yaml b/argocd/eoepca/mlops/app-mlops.yaml index e6679e61..10cd4f1d 100644 --- a/argocd/eoepca/mlops/app-mlops.yaml +++ b/argocd/eoepca/mlops/app-mlops.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/mlops/parts destination: name: in-cluster diff --git a/argocd/eoepca/notification-automation/app-notification-automation.yaml b/argocd/eoepca/notification-automation/app-notification-automation.yaml index 0ca358ec..dd752e1c 100644 --- a/argocd/eoepca/notification-automation/app-notification-automation.yaml +++ b/argocd/eoepca/notification-automation/app-notification-automation.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/notification-automation/parts destination: name: in-cluster diff --git a/argocd/eoepca/openeo-argoworkflows/app-openeo-argoworkflows.yaml b/argocd/eoepca/openeo-argoworkflows/app-openeo-argoworkflows.yaml index b62a77dd..e386b8c5 100644 --- a/argocd/eoepca/openeo-argoworkflows/app-openeo-argoworkflows.yaml +++ b/argocd/eoepca/openeo-argoworkflows/app-openeo-argoworkflows.yaml @@ -10,7 +10,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/openeo-argoworkflows/parts destination: name: in-cluster diff --git a/argocd/eoepca/openeo-geotrellis/openeo-geotrellis.yaml b/argocd/eoepca/openeo-geotrellis/openeo-geotrellis.yaml index e135a9ea..90c40cdb 100644 --- a/argocd/eoepca/openeo-geotrellis/openeo-geotrellis.yaml +++ b/argocd/eoepca/openeo-geotrellis/openeo-geotrellis.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/openeo-geotrellis/parts destination: name: in-cluster diff --git a/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-openeo.yaml b/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-openeo.yaml index 161e882f..53884162 100644 --- a/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-openeo.yaml +++ b/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-openeo.yaml @@ -18,7 +18,7 @@ spec: valueFiles: - $values/argocd/eoepca/openeo-geotrellis/parts/values-openeo-geotrellis-openeo.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-sparkoperator.yaml b/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-sparkoperator.yaml index 493f8737..e252b410 100644 --- a/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-sparkoperator.yaml +++ b/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-sparkoperator.yaml @@ -18,7 +18,7 @@ spec: valueFiles: - $values/argocd/eoepca/openeo-geotrellis/parts/values-openeo-geotrellis-sparkoperator.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-zookeeper.yaml b/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-zookeeper.yaml index c061912f..f7d031c6 100644 --- a/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-zookeeper.yaml +++ b/argocd/eoepca/openeo-geotrellis/parts/openeo-geotrellis-zookeeper.yaml @@ -18,7 +18,7 @@ spec: valueFiles: - $values/argocd/eoepca/openeo-geotrellis/parts/values-openeo-geotrellis-zookeeper.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/openeo-web-editor/openeo-web-editor.yaml b/argocd/eoepca/openeo-web-editor/openeo-web-editor.yaml index 5bb04a15..83b7bc70 100644 --- a/argocd/eoepca/openeo-web-editor/openeo-web-editor.yaml +++ b/argocd/eoepca/openeo-web-editor/openeo-web-editor.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/openeo-web-editor/values-openeo-web-editor.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: name: in-cluster diff --git a/argocd/eoepca/openeofed/app-openeofed.yaml b/argocd/eoepca/openeofed/app-openeofed.yaml index 91719eed..5e497b09 100644 --- a/argocd/eoepca/openeofed/app-openeofed.yaml +++ b/argocd/eoepca/openeofed/app-openeofed.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/openeofed/parts destination: name: in-cluster diff --git a/argocd/eoepca/openeofed/parts/app-openeofed-core.yaml b/argocd/eoepca/openeofed/parts/app-openeofed-core.yaml index c04f2dc0..1301d2a9 100644 --- a/argocd/eoepca/openeofed/parts/app-openeofed-core.yaml +++ b/argocd/eoepca/openeofed/parts/app-openeofed-core.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/openeofed/values-openeofed.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: name: in-cluster diff --git a/argocd/eoepca/operations/app-operations.yaml b/argocd/eoepca/operations/app-operations.yaml index 1b5db01c..32d84737 100644 --- a/argocd/eoepca/operations/app-operations.yaml +++ b/argocd/eoepca/operations/app-operations.yaml @@ -12,7 +12,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/operations/parts destination: name: in-cluster diff --git a/argocd/eoepca/operations/parts/monitoring/app-alloy-logs.yaml b/argocd/eoepca/operations/parts/monitoring/app-alloy-logs.yaml index d0e38a44..0693f861 100644 --- a/argocd/eoepca/operations/parts/monitoring/app-alloy-logs.yaml +++ b/argocd/eoepca/operations/parts/monitoring/app-alloy-logs.yaml @@ -10,7 +10,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/operations/parts/monitoring/alloy destination: name: in-cluster diff --git a/argocd/eoepca/registration-api/app-registration-api.yaml b/argocd/eoepca/registration-api/app-registration-api.yaml index 2d81b403..5000a93e 100644 --- a/argocd/eoepca/registration-api/app-registration-api.yaml +++ b/argocd/eoepca/registration-api/app-registration-api.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/registration-api/parts destination: name: in-cluster diff --git a/argocd/eoepca/registration-harvester/app-registration-harvester.yaml b/argocd/eoepca/registration-harvester/app-registration-harvester.yaml index d06e9e1f..c0f61273 100644 --- a/argocd/eoepca/registration-harvester/app-registration-harvester.yaml +++ b/argocd/eoepca/registration-harvester/app-registration-harvester.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/registration-harvester/parts destination: name: in-cluster diff --git a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-flowable.yaml b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-flowable.yaml index 134796dc..7cbff882 100644 --- a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-flowable.yaml +++ b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-flowable.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/registration-harvester/parts/values/values-flowable.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-operaton.yaml b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-operaton.yaml index 5a3ee359..4e5f60aa 100644 --- a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-operaton.yaml +++ b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-operaton.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/registration-harvester/parts/values/values-operaton.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-landsat.yaml b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-landsat.yaml index 7dcf91bb..d732ec91 100644 --- a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-landsat.yaml +++ b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-landsat.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/registration-harvester/parts/values/values-landsat.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-sentinel.yaml b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-sentinel.yaml index 42d20b96..62a69fb2 100644 --- a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-sentinel.yaml +++ b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-sentinel.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/registration-harvester/parts/values/values-sentinel.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-stac.yaml b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-stac.yaml index 669f7743..ae42d60a 100644 --- a/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-stac.yaml +++ b/argocd/eoepca/registration-harvester/parts/app-registration-harvester-worker-stac.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/argocd/eoepca/registration-harvester/parts/values/values-stac.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/resource-catalogue/app-resource-catalogue.yaml b/argocd/eoepca/resource-catalogue/app-resource-catalogue.yaml index bafaa0ea..afe9f936 100644 --- a/argocd/eoepca/resource-catalogue/app-resource-catalogue.yaml +++ b/argocd/eoepca/resource-catalogue/app-resource-catalogue.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/resource-catalogue/parts destination: name: in-cluster diff --git a/argocd/eoepca/resource-health/app-resource-health.yaml b/argocd/eoepca/resource-health/app-resource-health.yaml index 286bc9e3..9b6f0e55 100644 --- a/argocd/eoepca/resource-health/app-resource-health.yaml +++ b/argocd/eoepca/resource-health/app-resource-health.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/resource-health/parts destination: name: in-cluster diff --git a/argocd/eoepca/workspace/app-workspace.yaml b/argocd/eoepca/workspace/app-workspace.yaml index b68210ee..9cfb8b3e 100644 --- a/argocd/eoepca/workspace/app-workspace.yaml +++ b/argocd/eoepca/workspace/app-workspace.yaml @@ -11,7 +11,7 @@ spec: project: eoepca sources: - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/workspace/parts destination: name: in-cluster diff --git a/argocd/eoepca/zoo-dru-keda/README.md b/argocd/eoepca/zoo-dru-keda/README.md index fa933d1f..5eaf00a2 100644 --- a/argocd/eoepca/zoo-dru-keda/README.md +++ b/argocd/eoepca/zoo-dru-keda/README.md @@ -9,7 +9,7 @@ The values files are referenced using the approach described in the ArgoCD docum * The git repo is defined as a `source` for the values... ``` - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values ``` * The values files are then referenced from this source... diff --git a/argocd/eoepca/zoo-dru-keda/app-zoo-dru.yaml b/argocd/eoepca/zoo-dru-keda/app-zoo-dru.yaml index 72a2e780..42b2117d 100644 --- a/argocd/eoepca/zoo-dru-keda/app-zoo-dru.yaml +++ b/argocd/eoepca/zoo-dru-keda/app-zoo-dru.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/zoo-dru-keda/parts destination: name: in-cluster diff --git a/argocd/eoepca/zoo-dru-keda/parts/app-zoo-dru-keda-core.yaml b/argocd/eoepca/zoo-dru-keda/parts/app-zoo-dru-keda-core.yaml index 500949f5..96687c2d 100644 --- a/argocd/eoepca/zoo-dru-keda/parts/app-zoo-dru-keda-core.yaml +++ b/argocd/eoepca/zoo-dru-keda/parts/app-zoo-dru-keda-core.yaml @@ -20,7 +20,7 @@ spec: - $values/argocd/eoepca/zoo-dru-keda/parts/values-zoo.yaml # - $values/argocd/eoepca/zoo-dru-keda/parts/values-stageout.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/zoo-dru-std/README.md b/argocd/eoepca/zoo-dru-std/README.md index 3ea193b5..b0b9e72e 100644 --- a/argocd/eoepca/zoo-dru-std/README.md +++ b/argocd/eoepca/zoo-dru-std/README.md @@ -9,7 +9,7 @@ The values files are referenced using the approach described in the ArgoCD docum * The git repo is defined as a `source` for the values... ``` - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values ``` * The values files are then referenced from this source... diff --git a/argocd/eoepca/zoo-dru-std/app-zoo-dru.yaml b/argocd/eoepca/zoo-dru-std/app-zoo-dru.yaml index 1ee80b55..b63cdbec 100644 --- a/argocd/eoepca/zoo-dru-std/app-zoo-dru.yaml +++ b/argocd/eoepca/zoo-dru-std/app-zoo-dru.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/zoo-dru-std/parts destination: name: in-cluster diff --git a/argocd/eoepca/zoo-dru-std/parts/app-zoo-dru-core.yaml b/argocd/eoepca/zoo-dru-std/parts/app-zoo-dru-core.yaml index 485ca788..473a4ebe 100644 --- a/argocd/eoepca/zoo-dru-std/parts/app-zoo-dru-core.yaml +++ b/argocd/eoepca/zoo-dru-std/parts/app-zoo-dru-core.yaml @@ -18,7 +18,7 @@ spec: - $values/argocd/eoepca/zoo-dru-std/parts/values-zoo.yaml # - $values/argocd/eoepca/zoo-dru-std/parts/values-stageout.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/eoepca/zoo-dru-wes/README.md b/argocd/eoepca/zoo-dru-wes/README.md index 2a1f35f4..4184ba4b 100644 --- a/argocd/eoepca/zoo-dru-wes/README.md +++ b/argocd/eoepca/zoo-dru-wes/README.md @@ -9,7 +9,7 @@ The values files are referenced using the approach described in the ArgoCD docum * The git repo is defined as a `source` for the values... ``` - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values ``` * The values files are then referenced from this source... diff --git a/argocd/eoepca/zoo-dru-wes/app-zoo-dru.yaml b/argocd/eoepca/zoo-dru-wes/app-zoo-dru.yaml index 464c3deb..a0868df0 100644 --- a/argocd/eoepca/zoo-dru-wes/app-zoo-dru.yaml +++ b/argocd/eoepca/zoo-dru-wes/app-zoo-dru.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/eoepca/zoo-dru-wes/parts destination: name: in-cluster diff --git a/argocd/eoepca/zoo-dru-wes/parts/app-zoo-dru-core.yaml b/argocd/eoepca/zoo-dru-wes/parts/app-zoo-dru-core.yaml index 3512792f..5acb27d3 100644 --- a/argocd/eoepca/zoo-dru-wes/parts/app-zoo-dru-core.yaml +++ b/argocd/eoepca/zoo-dru-wes/parts/app-zoo-dru-core.yaml @@ -18,7 +18,7 @@ spec: - $values/argocd/eoepca/zoo-dru-wes/parts/values-zoo.yaml - $values/argocd/eoepca/zoo-dru-wes/parts/values-stageout.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/infra/apisix/app-apisix.yaml b/argocd/infra/apisix/app-apisix.yaml index 43104c65..9ca1ad73 100644 --- a/argocd/infra/apisix/app-apisix.yaml +++ b/argocd/infra/apisix/app-apisix.yaml @@ -15,7 +15,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/apisix/parts destination: name: in-cluster diff --git a/argocd/infra/apisix/parts/app-apisix-core.yaml b/argocd/infra/apisix/parts/app-apisix-core.yaml index 6ac0ecfa..2a4f5f51 100644 --- a/argocd/infra/apisix/parts/app-apisix-core.yaml +++ b/argocd/infra/apisix/parts/app-apisix-core.yaml @@ -22,7 +22,7 @@ spec: # envoy-gateway. The chart's mixed CRD bundle must not own either set. skipCrds: true - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: diff --git a/argocd/infra/cert-manager/app-cert-manager.yaml b/argocd/infra/cert-manager/app-cert-manager.yaml index 8a69d070..31a6ba94 100644 --- a/argocd/infra/cert-manager/app-cert-manager.yaml +++ b/argocd/infra/cert-manager/app-cert-manager.yaml @@ -9,7 +9,7 @@ spec: project: eoepca source: repoURL: 'https://github.com/EOEPCA/eoepca-plus' - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/cert-manager/parts destination: name: in-cluster diff --git a/argocd/infra/crossplane/app-crossplane.yaml b/argocd/infra/crossplane/app-crossplane.yaml index 9c6908a5..6859bf61 100644 --- a/argocd/infra/crossplane/app-crossplane.yaml +++ b/argocd/infra/crossplane/app-crossplane.yaml @@ -13,7 +13,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/crossplane/parts destination: name: in-cluster diff --git a/argocd/infra/eso/app-eso.yaml b/argocd/infra/eso/app-eso.yaml index 41d68909..b183126e 100644 --- a/argocd/infra/eso/app-eso.yaml +++ b/argocd/infra/eso/app-eso.yaml @@ -13,7 +13,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/eso/parts destination: name: in-cluster diff --git a/argocd/infra/gateway/app-gateway.yaml b/argocd/infra/gateway/app-gateway.yaml index fb722475..699e848e 100644 --- a/argocd/infra/gateway/app-gateway.yaml +++ b/argocd/infra/gateway/app-gateway.yaml @@ -15,7 +15,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/gateway/parts destination: name: in-cluster diff --git a/argocd/infra/harbor/app-harbor.yaml b/argocd/infra/harbor/app-harbor.yaml index 288dc8c6..795aac61 100644 --- a/argocd/infra/harbor/app-harbor.yaml +++ b/argocd/infra/harbor/app-harbor.yaml @@ -13,7 +13,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/harbor/parts destination: diff --git a/argocd/infra/knative-operator/app-knative-instances.yaml b/argocd/infra/knative-operator/app-knative-instances.yaml index 773dd85b..57b13f13 100644 --- a/argocd/infra/knative-operator/app-knative-instances.yaml +++ b/argocd/infra/knative-operator/app-knative-instances.yaml @@ -10,7 +10,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/knative-operator/instances destination: name: in-cluster diff --git a/argocd/infra/kyverno/app-kyverno.yaml b/argocd/infra/kyverno/app-kyverno.yaml index 1e6abfa6..f25781fe 100644 --- a/argocd/infra/kyverno/app-kyverno.yaml +++ b/argocd/infra/kyverno/app-kyverno.yaml @@ -18,7 +18,7 @@ spec: valueFiles: - $values/argocd/infra/kyverno/values-kyverno.yaml - repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop ref: values destination: name: in-cluster diff --git a/argocd/infra/minio/README.md b/argocd/infra/minio/README.md index 514dd787..9dd5be64 100644 --- a/argocd/infra/minio/README.md +++ b/argocd/infra/minio/README.md @@ -13,7 +13,7 @@ Thus, the root `minio` application references the `parts/` subdirectory that def ```yaml source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/minio/parts ``` diff --git a/argocd/infra/minio/app-minio.yaml b/argocd/infra/minio/app-minio.yaml index d79ed3ae..9a2c01d8 100644 --- a/argocd/infra/minio/app-minio.yaml +++ b/argocd/infra/minio/app-minio.yaml @@ -13,7 +13,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/minio/parts destination: diff --git a/argocd/infra/pgo/app-pgo.yaml b/argocd/infra/pgo/app-pgo.yaml index 6ee2af37..93898750 100644 --- a/argocd/infra/pgo/app-pgo.yaml +++ b/argocd/infra/pgo/app-pgo.yaml @@ -13,7 +13,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/pgo/parts destination: name: in-cluster diff --git a/argocd/infra/trivy/app-trivy.yaml b/argocd/infra/trivy/app-trivy.yaml index 05b5387e..3d7a1503 100644 --- a/argocd/infra/trivy/app-trivy.yaml +++ b/argocd/infra/trivy/app-trivy.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/infra/trivy/parts destination: diff --git a/argocd/test/dummy-service/app-dummy-service.yaml b/argocd/test/dummy-service/app-dummy-service.yaml index 74bbee56..fb516155 100644 --- a/argocd/test/dummy-service/app-dummy-service.yaml +++ b/argocd/test/dummy-service/app-dummy-service.yaml @@ -11,7 +11,7 @@ spec: project: eoepca source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd/test/dummy-service/parts destination: name: in-cluster diff --git a/deploy/k8s-resources/argocd/application.yaml b/deploy/k8s-resources/argocd/application.yaml index 16877d7c..f4ff17a8 100644 --- a/deploy/k8s-resources/argocd/application.yaml +++ b/deploy/k8s-resources/argocd/application.yaml @@ -10,7 +10,7 @@ spec: source: repoURL: https://github.com/EOEPCA/eoepca-plus - targetRevision: merge-from-deploy-develop + targetRevision: deploy-develop path: argocd destination: