Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update copier template to 4.1.0 #12

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Update copier template to 4.1.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
View file
Open in desktop
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.11
_commit: 4.1.0
_src_path: gh:epics-containers/deployment-template-argocd
argocd_project: p45-beamline
argocd_server: argocd.diamond.ac.uk
Expand Down
2 changes: 1 addition & 1 deletion apps/Chart.yaml
View file
Open in desktop
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"
38 changes: 19 additions & 19 deletions apps/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,41 +16,41 @@ source:
repoURL: https://github.com/epics-containers/p45-services
targetRevision: main

# 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:
ec_service: true

# daq services ###############################################################
daq-rabbitmq:
daq-blueapi: # https://github.com/DiamondLightSource/blueapi/issues/620
removed: true
daq-nexus:

# 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
p45-ea-test-01:
enabled: true
targetRevision: main
bl45p-ea-dcam-01:
ec_service: true
targetRevision: 2024.8.2
removed: true
bl45p-ea-dcam-02:
ec_service: true
targetRevision: 2024.8.2
bl45p-mo-panda-01:
ec_service: true
targetRevision: 2024.8.2
bl45p-mo-panda-02:
ec_service: true
targetRevision: 2024.8.2
bl45p-mo-brick-01:
ec_service: true
targetRevision: 2024.8.2
targetRevision: 2024.8.2
4 changes: 2 additions & 2 deletions environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ echo "Loading environment for p45 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=p45-beamline/p45
# the git repo for this project
export EC_SERVICES_REPO=https://github.com/epics-containers/p45-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