From 074af551d68977d9d38ebf199455d9cd4f8e0e84 Mon Sep 17 00:00:00 2001 From: Marcell Nagy Date: Thu, 3 Oct 2024 16:08:44 +0100 Subject: [PATCH] Update copier template to 4.1.0 --- .copier-answers.yml | 2 +- apps/Chart.yaml | 2 +- apps/values.yaml | 31 +++++++++++++++---------------- environment.sh | 4 ++-- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index bfe01bc..ea11f1d 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 0.2.13 +_commit: 4.1.0 _src_path: gh:epics-containers/deployment-template-argocd argocd_project: p46-beamline argocd_server: argocd.diamond.ac.uk diff --git a/apps/Chart.yaml b/apps/Chart.yaml index bedc0d4..c2384b8 100644 --- a/apps/Chart.yaml +++ b/apps/Chart.yaml @@ -24,5 +24,5 @@ appVersion: "1.0" dependencies: - name: argocd-apps - version: 4.0.0 + version: 4.1.0 repository: "oci://ghcr.io/epics-containers" diff --git a/apps/values.yaml b/apps/values.yaml index ad59fa3..57137a5 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -16,30 +16,29 @@ source: repoURL: https://github.com/epics-containers/p46-services targetRevision: 2024.9.8 -# list of services to deploy. Each item is of the form: -# - service: service name as it appears in K8S (statefulset/deployment name) -# targetRevision: optional override for targetRevision above -# repoURL: optional override for git repo to source the helm chart from -# the path is always services/ within that repo -# enabled: set to false to stop a service -# removed: set to true to remove the service from the cluster - services: - # shared epics services ###################################################### + # Each item is of the form: + # service: service name as it appears in K8S (statefulset/deployment name) + # targetRevision: optional override for targetRevision above + # repoURL: optional override for git repo to source the helm chart from + # the path is always services/ within that repo + # removed: set to true to remove the service from the cluster epics-pvcs: epics-opis: - # epics iocs ################################################################# +ec_services: + # Services which have implemented support for an "enabled" parameter. + # Each item is of the form: + # service: service name as it appears in K8S (statefulset/deployment name) + # targetRevision: optional override for targetRevision above + # repoURL: optional override for git repo to source the helm chart from + # the path is always services/ within that repo + # removed: set to true to remove the service from the cluster + # enabled: set to false to stop a service p46-ea-test-01: enabled: true - ec_service: true bl46p-ea-panda-01: - ec_service: true bl46p-ea-dcam-01: - ec_service: true bl46p-ea-dcam-02: - ec_service: true bl46p-mo-ioc-01: - ec_service: true bl46p-ea-test-01: - ec_service: true diff --git a/environment.sh b/environment.sh index 84c03bb..3ed9a1a 100644 --- a/environment.sh +++ b/environment.sh @@ -14,12 +14,12 @@ echo "Loading environment for p46 deployment ..." #### SECTION 1. Environment variables ########################################## export EC_CLI_BACKEND="ARGOCD" -# the argocd project and root app +# the argocd app namespace and root app export EC_TARGET=p46-beamline/p46 # the git repo for this project export EC_SERVICES_REPO=https://github.com/epics-containers/p46-services # declare your centralised log server Web UI -export EC_LOG_URL=https://graylog2.diamond.ac.uk/search?rangetype=relative&fields=message%2Csource&width=1489&highlightMessage=&relative=172800&q=pod_name%3A{service_name}* +export EC_LOG_URL="https://graylog2.diamond.ac.uk/search?rangetype=relative&fields=message%2Csource&width=1489&highlightMessage=&relative=172800&q=pod_name%3A{service_name}*" #### SECTION 2. Install ec #####################################################