Skip to content

Commit

Permalink
Update copier template to 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelldls committed Oct 3, 2024
1 parent ed4a9ed commit 20a9a85
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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: p48-beamline
argocd_server: argocd.diamond.ac.uk
Expand Down
2 changes: 1 addition & 1 deletion apps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
33 changes: 16 additions & 17 deletions apps/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,29 @@ source:
repoURL: https://github.com/epics-containers/p48-services
targetRevision: 2024.9.4

# 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/<service> 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/<service> 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/<service> within that repo
# removed: set to true to remove the service from the cluster
# enabled: set to false to stop a service
p48-ea-test-01:
enabled: true
ec_service: true
bl48p-ea-panda-01:
ec_service: true
bl48p-ea-dcam-01:
ec_service: true
bl48p-ea-dcam-02:
ec_service: true
bl48p-mo-ioc-01:
ec_service: true
bl48p-ea-test-01:
ec_service: true
bl48p-ea-test-01:
4 changes: 2 additions & 2 deletions environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ echo "Loading environment for p48 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=p48-beamline/p48
# the git repo for this project
export EC_SERVICES_REPO=https://github.com/epics-containers/p48-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 #####################################################

Expand Down

0 comments on commit 20a9a85

Please sign in to comment.