diff --git a/.copier-answers.yml b/.copier-answers.yml index f3d0427..7afa0c6 100644 --- 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.2 +_commit: 4.0.3b4 _src_path: gh:epics-containers/services-template-helm cluster_name: pollux cluster_namespace: p47-beamline diff --git a/services/p47-ea-test-01/Chart.yaml b/.helm-shared/Chart.yaml similarity index 67% rename from services/p47-ea-test-01/Chart.yaml rename to .helm-shared/Chart.yaml index 5732737..2ed3edd 100644 --- a/services/p47-ea-test-01/Chart.yaml +++ b/.helm-shared/Chart.yaml @@ -7,5 +7,5 @@ type: application dependencies: - name: ioc-instance - version: 4.0.0 - repository: "oci://ghcr.io/epics-containers" \ No newline at end of file + version: 4.1.2 + repository: "oci://ghcr.io/epics-containers" diff --git a/services/.ioc_template/Chart.yaml b/services/.ioc_template/Chart.yaml deleted file mode 100644 index 5732737..0000000 --- a/services/.ioc_template/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# A Helm Chart for an IOC instance -apiVersion: v2 -name: ec-service -version: 1.0.0 - -type: application - -dependencies: - - name: ioc-instance - version: 4.0.0 - repository: "oci://ghcr.io/epics-containers" \ No newline at end of file diff --git a/services/.ioc_template/Chart.yaml b/services/.ioc_template/Chart.yaml new file mode 120000 index 0000000..ed18fd6 --- /dev/null +++ b/services/.ioc_template/Chart.yaml @@ -0,0 +1 @@ +../../.helm-shared/Chart.yaml \ No newline at end of file diff --git a/services/.ioc_template/templates b/services/.ioc_template/templates new file mode 120000 index 0000000..367e2aa --- /dev/null +++ b/services/.ioc_template/templates @@ -0,0 +1 @@ +../../.helm-shared/templates \ No newline at end of file diff --git a/services/.ioc_template/templates/configmap.yaml b/services/.ioc_template/templates/configmap.yaml deleted file mode 100644 index 3b4c418..0000000 --- a/services/.ioc_template/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-config - labels: - app: {{ .Release.Name }} -data: - -# contents of the ioc instance config folder -{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/bl47p-ea-dcam-01/Chart.yaml b/services/bl47p-ea-dcam-01/Chart.yaml deleted file mode 100644 index 2ed3edd..0000000 --- a/services/bl47p-ea-dcam-01/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# A Helm Chart for an IOC instance -apiVersion: v2 -name: ec-service -version: 1.0.0 - -type: application - -dependencies: - - name: ioc-instance - version: 4.1.2 - repository: "oci://ghcr.io/epics-containers" diff --git a/services/bl47p-ea-dcam-01/Chart.yaml b/services/bl47p-ea-dcam-01/Chart.yaml new file mode 120000 index 0000000..ed18fd6 --- /dev/null +++ b/services/bl47p-ea-dcam-01/Chart.yaml @@ -0,0 +1 @@ +../../.helm-shared/Chart.yaml \ No newline at end of file diff --git a/services/bl47p-ea-dcam-01/templates b/services/bl47p-ea-dcam-01/templates new file mode 120000 index 0000000..367e2aa --- /dev/null +++ b/services/bl47p-ea-dcam-01/templates @@ -0,0 +1 @@ +../../.helm-shared/templates \ No newline at end of file diff --git a/services/bl47p-ea-dcam-01/templates/configmap.yaml b/services/bl47p-ea-dcam-01/templates/configmap.yaml deleted file mode 100644 index 3b4c418..0000000 --- a/services/bl47p-ea-dcam-01/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-config - labels: - app: {{ .Release.Name }} -data: - -# contents of the ioc instance config folder -{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/bl47p-ea-dcam-02/Chart.yaml b/services/bl47p-ea-dcam-02/Chart.yaml deleted file mode 100644 index 2ed3edd..0000000 --- a/services/bl47p-ea-dcam-02/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# A Helm Chart for an IOC instance -apiVersion: v2 -name: ec-service -version: 1.0.0 - -type: application - -dependencies: - - name: ioc-instance - version: 4.1.2 - repository: "oci://ghcr.io/epics-containers" diff --git a/services/bl47p-ea-dcam-02/Chart.yaml b/services/bl47p-ea-dcam-02/Chart.yaml new file mode 120000 index 0000000..ed18fd6 --- /dev/null +++ b/services/bl47p-ea-dcam-02/Chart.yaml @@ -0,0 +1 @@ +../../.helm-shared/Chart.yaml \ No newline at end of file diff --git a/services/bl47p-ea-dcam-02/templates b/services/bl47p-ea-dcam-02/templates new file mode 120000 index 0000000..367e2aa --- /dev/null +++ b/services/bl47p-ea-dcam-02/templates @@ -0,0 +1 @@ +../../.helm-shared/templates \ No newline at end of file diff --git a/services/bl47p-ea-dcam-02/templates/configmap.yaml b/services/bl47p-ea-dcam-02/templates/configmap.yaml deleted file mode 100644 index 3b4c418..0000000 --- a/services/bl47p-ea-dcam-02/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-config - labels: - app: {{ .Release.Name }} -data: - -# contents of the ioc instance config folder -{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/bl47p-ea-panda-01/Chart.yaml b/services/bl47p-ea-panda-01/Chart.yaml deleted file mode 100644 index 2ed3edd..0000000 --- a/services/bl47p-ea-panda-01/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# A Helm Chart for an IOC instance -apiVersion: v2 -name: ec-service -version: 1.0.0 - -type: application - -dependencies: - - name: ioc-instance - version: 4.1.2 - repository: "oci://ghcr.io/epics-containers" diff --git a/services/bl47p-ea-panda-01/Chart.yaml b/services/bl47p-ea-panda-01/Chart.yaml new file mode 120000 index 0000000..ed18fd6 --- /dev/null +++ b/services/bl47p-ea-panda-01/Chart.yaml @@ -0,0 +1 @@ +../../.helm-shared/Chart.yaml \ No newline at end of file diff --git a/services/bl47p-ea-panda-01/templates b/services/bl47p-ea-panda-01/templates new file mode 120000 index 0000000..367e2aa --- /dev/null +++ b/services/bl47p-ea-panda-01/templates @@ -0,0 +1 @@ +../../.helm-shared/templates \ No newline at end of file diff --git a/services/bl47p-ea-panda-01/templates/configmap.yaml b/services/bl47p-ea-panda-01/templates/configmap.yaml deleted file mode 100644 index 3b4c418..0000000 --- a/services/bl47p-ea-panda-01/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-config - labels: - app: {{ .Release.Name }} -data: - -# contents of the ioc instance config folder -{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/bl47p-ea-test-01/Chart.yaml b/services/bl47p-ea-test-01/Chart.yaml deleted file mode 100644 index 2ed3edd..0000000 --- a/services/bl47p-ea-test-01/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# A Helm Chart for an IOC instance -apiVersion: v2 -name: ec-service -version: 1.0.0 - -type: application - -dependencies: - - name: ioc-instance - version: 4.1.2 - repository: "oci://ghcr.io/epics-containers" diff --git a/services/bl47p-ea-test-01/Chart.yaml b/services/bl47p-ea-test-01/Chart.yaml new file mode 120000 index 0000000..ed18fd6 --- /dev/null +++ b/services/bl47p-ea-test-01/Chart.yaml @@ -0,0 +1 @@ +../../.helm-shared/Chart.yaml \ No newline at end of file diff --git a/services/bl47p-ea-test-01/templates b/services/bl47p-ea-test-01/templates new file mode 120000 index 0000000..367e2aa --- /dev/null +++ b/services/bl47p-ea-test-01/templates @@ -0,0 +1 @@ +../../.helm-shared/templates \ No newline at end of file diff --git a/services/bl47p-ea-test-01/templates/configmap.yaml b/services/bl47p-ea-test-01/templates/configmap.yaml deleted file mode 100644 index 3b4c418..0000000 --- a/services/bl47p-ea-test-01/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-config - labels: - app: {{ .Release.Name }} -data: - -# contents of the ioc instance config folder -{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/bl47p-mo-ioc-01/Chart.yaml b/services/bl47p-mo-ioc-01/Chart.yaml deleted file mode 100644 index 2ed3edd..0000000 --- a/services/bl47p-mo-ioc-01/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# A Helm Chart for an IOC instance -apiVersion: v2 -name: ec-service -version: 1.0.0 - -type: application - -dependencies: - - name: ioc-instance - version: 4.1.2 - repository: "oci://ghcr.io/epics-containers" diff --git a/services/bl47p-mo-ioc-01/Chart.yaml b/services/bl47p-mo-ioc-01/Chart.yaml new file mode 120000 index 0000000..ed18fd6 --- /dev/null +++ b/services/bl47p-mo-ioc-01/Chart.yaml @@ -0,0 +1 @@ +../../.helm-shared/Chart.yaml \ No newline at end of file diff --git a/services/bl47p-mo-ioc-01/templates b/services/bl47p-mo-ioc-01/templates new file mode 120000 index 0000000..367e2aa --- /dev/null +++ b/services/bl47p-mo-ioc-01/templates @@ -0,0 +1 @@ +../../.helm-shared/templates \ No newline at end of file diff --git a/services/bl47p-mo-ioc-01/templates/configmap.yaml b/services/bl47p-mo-ioc-01/templates/configmap.yaml deleted file mode 100644 index 3b4c418..0000000 --- a/services/bl47p-mo-ioc-01/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-config - labels: - app: {{ .Release.Name }} -data: - -# contents of the ioc instance config folder -{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/p47-ea-test-01/config/ioc.db b/services/p47-ea-test-01/config/ioc.db deleted file mode 100644 index aefdcac..0000000 --- a/services/p47-ea-test-01/config/ioc.db +++ /dev/null @@ -1,26 +0,0 @@ -record(calc, "P47:IBEK:SUM") { - field(DESC, "Sum A and B") - field(CALC, "A+B") - field(INPA, "P47:IBEK:A") - field(INPB, "P47:IBEK:B") -} - -record(ao, "P47:IBEK:A") { - field(DESC, "A voltage") - field(PREC, "3") - field(EGU, "Volts") - field(DRVL, "-10") - field(DRVH, "+10") - field(VAL, "0.000") - field(FLNK, "P47:IBEK:SUM") -} - -record(ao, "P47:IBEK:B") { - field(DESC, "B voltage") - field(PREC, "3") - field(EGU, "Volts") - field(DRVL, "-10") - field(DRVH, "+10") - field(VAL, "0.000") - field(FLNK, "P47:IBEK:SUM") -} \ No newline at end of file diff --git a/services/p47-ea-test-01/config/ioc.yaml b/services/p47-ea-test-01/config/ioc.yaml deleted file mode 100644 index 6dfac76..0000000 --- a/services/p47-ea-test-01/config/ioc.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# yaml-language-server: $schema=https://github.com/epics-containers/ioc-template-example/releases/download/4.0.0/ibek.ioc.schema.json - -ioc_name: "{{ _global.get_env('IOC_NAME') }}" - -description: Generic instance for testing generic IOCs - -entities: - - type: epics.EpicsEnvSet - name: EPICS_TZ - value: "GMT0BST" - - - type: devIocStats.iocAdminSoft - IOC: "{{ ioc_name | upper }}" - - - type: epics.StartupCommand - command: dbLoadRecords("/epics/ioc/config/ioc.db") - - - type: epics.PostStartupCommand - command: | - dbpf P47:IBEK:A "2.54" - dbpf P47:IBEK:B "2.61" - dbgf P47:IBEK:SUM diff --git a/services/p47-ea-test-01/templates b/services/p47-ea-test-01/templates new file mode 120000 index 0000000..367e2aa --- /dev/null +++ b/services/p47-ea-test-01/templates @@ -0,0 +1 @@ +../../.helm-shared/templates \ No newline at end of file diff --git a/services/p47-ea-test-01/templates/configmap.yaml b/services/p47-ea-test-01/templates/configmap.yaml deleted file mode 100644 index 3b4c418..0000000 --- a/services/p47-ea-test-01/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-config - labels: - app: {{ .Release.Name }} -data: - -# contents of the ioc instance config folder -{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/p47-ea-test-01/values.yaml b/services/p47-ea-test-01/values.yaml deleted file mode 100644 index d18dbd1..0000000 --- a/services/p47-ea-test-01/values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# yaml-language-server: $schema=https://github.com/epics-containers/ec-helm-charts/releases/download/3.4.4/ioc-instance.schema.json#/$defs/service -ioc-instance: - image: ghcr.io/epics-containers/ioc-template-example-runtime:4.0.0 - - # NOTE: the following are suggestions to help with debugging IOCs - # 1. replace the runtime container with the developer version - # this adds tools and compilers to the container so you - # can experiment in the cluster to fix the issue - # - # image: ghcr.io/epics-containers/ioc-template-example-developer:3.5.1 - - # 2. override the entry point to be a sleep infinity - # this means you can now use 'ec exec' to get a shell - # in the container and run /epics/ioc/start.sh. - # If it fails you can see the error and the pod - # will not terminate. In combination with 1. above you - # can experiment with changes until the issue - # is fixed. - # - # startCommand: sleep - # startArgs: infinity