update to copier 4.0.3b1

epics-containers · Nov 22, 2024 · 366df4f · 366df4f
1 parent a60a5c6
commit 366df4f
Show file tree

Hide file tree

Showing 30 changed files with 23 additions and 215 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 4.0.2b2
+_commit: 4.0.3b1
 _src_path: gh:epics-containers/services-template-helm
 cluster_name: pollux
 cluster_namespace: p47-beamline
@@ -8,6 +8,6 @@ description: p47 IOC Instances and Services
 git_platform: github.com
 github_org: epics-containers
 ioc_group: p47
-location: bl47p
+location: 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}*
 repo_uri: https://github.com/epics-containers/p47-services
diff --git a/.github/workflows/ci_skip_checks b/.github/workflows/ci_skip_checks
@@ -1 +1 @@
-daq-nexus
+daq-nexus
diff --git a/.github/workflows/ci_verify.sh b/.github/workflows/ci_verify.sh
@@ -41,8 +41,8 @@ do
         -v ${ROOT}/.ci_work:/services \
         alpine/helm:3.14.3 \
         -c "
-           helm lint /services/$service_name --values /services/values.yaml &&
            helm dependency update /services/$service_name &&
+           helm lint /services/$service_name --strict --values /services/values.yaml &&
            rm -rf /services/$service_name/charts
         "
 

diff --git a/services/p47-ea-test-01/Chart.yaml → .helm-shared/Chart.yaml b/services/p47-ea-test-01/Chart.yaml → .helm-shared/Chart.yaml
@@ -7,5 +7,5 @@ type: application
 
 dependencies:
   - name: ioc-instance
-    version: 4.0.0
-    repository: "oci://ghcr.io/epics-containers"
+    version: 4.1.2
+    repository: "oci://ghcr.io/epics-containers"
diff --git a/services/.ioc_template/Chart.yaml b/services/.ioc_template/Chart.yaml
diff --git a/services/.ioc_template/Chart.yaml b/services/.ioc_template/Chart.yaml
@@ -0,0 +1 @@
+../../.helm-shared/Chart.yaml
diff --git a/services/.ioc_template/templates b/services/.ioc_template/templates
@@ -0,0 +1 @@
+../../.helm-shared/templates
diff --git a/services/.ioc_template/templates/configmap.yaml b/services/.ioc_template/templates/configmap.yaml
diff --git a/services/bl47p-ea-dcam-01/Chart.yaml b/services/bl47p-ea-dcam-01/Chart.yaml
diff --git a/services/bl47p-ea-dcam-01/Chart.yaml b/services/bl47p-ea-dcam-01/Chart.yaml
@@ -0,0 +1 @@
+../../.helm-shared/Chart.yaml
diff --git a/services/bl47p-ea-dcam-01/templates b/services/bl47p-ea-dcam-01/templates
@@ -0,0 +1 @@
+../../.helm-shared/templates
diff --git a/services/bl47p-ea-dcam-01/templates/configmap.yaml b/services/bl47p-ea-dcam-01/templates/configmap.yaml
diff --git a/services/bl47p-ea-dcam-02/Chart.yaml b/services/bl47p-ea-dcam-02/Chart.yaml
diff --git a/services/bl47p-ea-dcam-02/Chart.yaml b/services/bl47p-ea-dcam-02/Chart.yaml
@@ -0,0 +1 @@
+../../.helm-shared/Chart.yaml
diff --git a/services/bl47p-ea-dcam-02/templates b/services/bl47p-ea-dcam-02/templates
@@ -0,0 +1 @@
+../../.helm-shared/templates
diff --git a/services/bl47p-ea-dcam-02/templates/configmap.yaml b/services/bl47p-ea-dcam-02/templates/configmap.yaml
diff --git a/services/bl47p-ea-panda-01/Chart.yaml b/services/bl47p-ea-panda-01/Chart.yaml
diff --git a/services/bl47p-ea-panda-01/Chart.yaml b/services/bl47p-ea-panda-01/Chart.yaml
@@ -0,0 +1 @@
+../../.helm-shared/Chart.yaml
diff --git a/services/bl47p-ea-panda-01/templates b/services/bl47p-ea-panda-01/templates
@@ -0,0 +1 @@
+../../.helm-shared/templates
diff --git a/services/bl47p-ea-panda-01/templates/configmap.yaml b/services/bl47p-ea-panda-01/templates/configmap.yaml
diff --git a/services/bl47p-ea-test-01/Chart.yaml b/services/bl47p-ea-test-01/Chart.yaml
diff --git a/services/bl47p-ea-test-01/Chart.yaml b/services/bl47p-ea-test-01/Chart.yaml
@@ -0,0 +1 @@
+../../.helm-shared/Chart.yaml
diff --git a/services/bl47p-ea-test-01/templates b/services/bl47p-ea-test-01/templates
@@ -0,0 +1 @@
+../../.helm-shared/templates
diff --git a/services/bl47p-ea-test-01/templates/configmap.yaml b/services/bl47p-ea-test-01/templates/configmap.yaml
diff --git a/services/bl47p-mo-ioc-01/Chart.yaml b/services/bl47p-mo-ioc-01/Chart.yaml
diff --git a/services/bl47p-mo-ioc-01/Chart.yaml b/services/bl47p-mo-ioc-01/Chart.yaml
@@ -0,0 +1 @@
+../../.helm-shared/Chart.yaml
diff --git a/services/bl47p-mo-ioc-01/templates b/services/bl47p-mo-ioc-01/templates
@@ -0,0 +1 @@
+../../.helm-shared/templates
diff --git a/services/bl47p-mo-ioc-01/templates/configmap.yaml b/services/bl47p-mo-ioc-01/templates/configmap.yaml
diff --git a/services/epics-opis/Chart.yaml b/services/epics-opis/Chart.yaml
@@ -8,5 +8,5 @@ type: application
 
 dependencies:
   - name: epics-opis
-    version: 4.0.0
+    version: 4.1.2
     repository: "oci://ghcr.io/epics-containers"
diff --git a/services/epics-pvcs/Chart.yaml b/services/epics-pvcs/Chart.yaml
@@ -8,5 +8,5 @@ type: application
 
 dependencies:
   - name: epics-pvcs
-    version: 4.0.0
-    repository: "oci://ghcr.io/epics-containers"
+    version: 4.1.2
+    repository: "oci://ghcr.io/epics-containers"
diff --git a/services/p47-ea-test-01/config/ioc.db b/services/p47-ea-test-01/config/ioc.db
diff --git a/services/p47-ea-test-01/config/ioc.yaml b/services/p47-ea-test-01/config/ioc.yaml
diff --git a/services/p47-ea-test-01/templates b/services/p47-ea-test-01/templates
@@ -0,0 +1 @@
+../../.helm-shared/templates
diff --git a/services/p47-ea-test-01/templates/configmap.yaml b/services/p47-ea-test-01/templates/configmap.yaml
diff --git a/services/p47-ea-test-01/values.yaml b/services/p47-ea-test-01/values.yaml
diff --git a/services/values.yaml b/services/values.yaml
@@ -4,7 +4,7 @@
 
 global:
   ioc_group: p47
-  location: bl47p
+  location: p47
   enabled: true
 
 ioc-instance: