From 0a9b4183b4f6576376c8213b2e598434745bee1f Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Tue, 26 Nov 2024 10:19:03 +0000 Subject: [PATCH] update to copier 4.2.0b1 --- .copier-answers.yml | 12 +++++------- .gitignore | 3 +-- apps/values.yaml | 2 +- environment.sh | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index ba92103..9348dc2 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,17 +1,15 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 4.1.0 +_commit: 4.2.0b1 _src_path: gh:epics-containers/deployment-template-argocd -argocd_project: bl47p +argocd_cluster: argus argocd_server: argocd.diamond.ac.uk -cluster_name_apps: argus -cluster_name_services: pollux -cluster_namespace_apps: p47-beamline -cluster_namespace_services: p47-beamline +cluster_name: p47 +cluster_namespace: p47-beamline deployment_repo: https://github.com/epics-containers/p47-deployment description: p47 IOC Instances and Services ArgoCD deployments git_platform: github.com github_org: epics-containers ioc_group: p47 logging_url: https://graylog2.diamond.ac.uk/search?rangetype=relative&fields=message%2Csource&width=1489&highlightMessage=&relative=172800&q=pod_name%3A{service_name}* -services_release: main +services_release: 2024.12.1 services_repo: https://github.com/epics-containers/p47-services diff --git a/.gitignore b/.gitignore index 902e4b4..4cf331f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,4 @@ venv* **/Chart.lock **/charts **/*copy -words.md -*.code-workspace \ No newline at end of file +*.code-workspace diff --git a/apps/values.yaml b/apps/values.yaml index 188917d..200a211 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -10,7 +10,7 @@ project: p47-beamline destination: - name: pollux + name: p47 namespace: p47-beamline source: repoURL: https://github.com/epics-containers/p47-services diff --git a/environment.sh b/environment.sh index 25b3328..355e4f2 100644 --- a/environment.sh +++ b/environment.sh @@ -19,7 +19,7 @@ export EC_TARGET=p47-beamline/p47 # the git repo for this project export EC_SERVICES_REPO=https://github.com/epics-containers/p47-services # declare your centralised log server Web UI -export EC_LOG_URL='https://graylog.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 #####################################################