edge-containers-cli 3.1.1__tar.gz → 3.4.1__tar.gz

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/.github/workflows/_sys_test.yml

@@ -16,7 +16,7 @@ jobs:
     env:
       EC_INTERACTIVE_TESTING: "true"
       EC_K8S_NAMESPACE: "default"
-      EC_SERVICES_REPO: "https://github.com/marcelldls/bl01t.git"
+      EC_SERVICES_REPO: "https://github.com/epics-containers/bl01t.git"
     steps:
       - name: start minikube
         id: minikube

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/.pre-commit-config.yaml

@@ -21,3 +21,4 @@ repos:
         entry: ruff format --force-exclude
         types: [python]
         require_serial: true
+exclude: tests/data/bl01t

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 3.1.1
+Version: 3.4.1
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/src/edge_containers_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.1.1'
-__version_tuple__ = version_tuple = (3, 1, 1)
+__version__ = version = '3.4.1'
+__version_tuple__ = version_tuple = (3, 4, 1)

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/src/edge_containers_cli/cmds/cli.py

@@ -117,6 +117,7 @@ def deploy_local(
         autocompletion=force_plain_completion,
     ),
     yes: bool = typer.Option(False, "-y", "--yes", help="Skip confirmation prompt"),
+    wait: bool = typer.Option(False, "--wait", help="Waits for readiness"),
     args: str = typer.Option("", help="Additional args for helm, 'must be quoted'"),
 ):
     """
@@ -125,6 +126,7 @@ def deploy_local(
     if ctx.obj.namespace == globals.LOCAL_NAMESPACE:
         LocalCommands(ctx.obj).deploy_local(svc_instance, yes, args)
     else:
+        args = args if not wait else args + " --wait"
         K8sCommands(ctx.obj).deploy_local(svc_instance, yes, args)
 
 
@@ -139,6 +141,7 @@ def deploy(
         help="Version tag of the IOC/service to deploy",
         autocompletion=avail_versions,
     ),
+    wait: bool = typer.Option(False, "--wait", help="Waits for readiness"),
     args: str = typer.Option(
         "", help="Additional args for helm or docker, 'must be quoted'"
     ),
@@ -150,6 +153,7 @@ def deploy(
     if ctx.obj.namespace == globals.LOCAL_NAMESPACE:
         LocalCommands(ctx.obj, service_name).deploy(service_name, version, args)
     else:
+        args = args if not wait else args + " --wait"
         K8sCommands(ctx.obj, service_name, check=False).deploy(
             service_name, version, args
         )

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/src/edge_containers_cli/cmds/kubectl.py

@@ -1,6 +1,6 @@
 jsonpath_pod_info = (
     "-o jsonpath='"
-    r'{range .items[*]}{..labels.app}{","}{.status.phase}'
+    r'{range .items[*]}{..labels.app}{..labels.app\.kubernetes\.io/instance}{","}{.status.phase}'
     r'{","}{..containerStatuses[0].restartCount}'
     r'{"\n"}{end}'
     "'"

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/src/edge_containers_cli/utils.py

@@ -11,6 +11,7 @@ from pathlib import Path
 from typing import Optional
 
 import typer
+from ruamel.yaml import YAML
 
 import edge_containers_cli.globals as globals
 from edge_containers_cli.logging import log
@@ -23,16 +24,20 @@ def get_instance_image_name(svc_instance: Path, tag: Optional[str] = None) -> st
         log.error(f"values.yaml not found in {svc_instance}")
         raise typer.Exit(1)
 
-    values_text = values.read_text()
-    matches = re.findall(r"image: (.*):(.*)", values_text)
-    if len(matches) == 1:
-        tag = tag or matches[0][1]
-        image = matches[0][0] + f":{tag}"
-    else:
-        log.error(f"image tag definition not found in {values}")
-        raise typer.Exit(1)
+    with open(values) as fp:
+        yaml = YAML(typ="safe").load(fp)
+
+    try:
+        read_image = yaml["shared"]["ioc-instance"]["image"] + f":{tag}"
+        base_image, base_tag = read_image.split(":")[:2]
+    except KeyError:
+        log.error(f"shared.ioc-instance.image not found in {values}")
+        raise typer.Exit(1) from None
+
+    tag = tag or base_tag
+    full_image = base_image + f":{tag}"
 
-    return image
+    return full_image
 
 
 def check_instance_path(service_path: Path):
@@ -44,8 +49,8 @@ def check_instance_path(service_path: Path):
 
     log.info(f"checking instance {service_name} at {service_path}")
     if service_path.is_dir():
-        if not (service_path / "values.yaml").exists():
-            log.error("IOC instance requires values.yaml")
+        if not (service_path / "Chart.yaml").exists():
+            log.error("A Service instance requires Chart.yaml")
             raise typer.Exit(1)
     else:
         log.error(f"instance path {service_path} does not exist")

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 3.1.1
+Version: 3.4.1
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/src/edge_containers_cli.egg-info/SOURCES.txt

@@ -81,8 +81,23 @@ tests/test_system.py
 tests/data/autocomplete.yaml
 tests/data/ioc.yaml
 tests/data/local.yaml
-tests/data/example-ibek-config/ioc.db
-tests/data/example-ibek-config/ioc.yaml
-tests/data/services/bl45p-ea-ioc-01/pretend_helm.tgz
-tests/data/services/bl45p-ea-ioc-01/values.yaml
-tests/data/services/bl45p-ea-ioc-01/config/ioc.yaml
+tests/data/bl01t/.copier-answers.yml
+tests/data/bl01t/.gitignore
+tests/data/bl01t/LICENSE
+tests/data/bl01t/README.md
+tests/data/bl01t/environment.sh
+tests/data/bl01t/update-helm
+tests/data/bl01t/.github/dependabot.yml
+tests/data/bl01t/.github/workflows/ci_verify.sh
+tests/data/bl01t/.github/workflows/verify.yml
+tests/data/bl01t/helm/shared/Chart.yaml
+tests/data/bl01t/helm/shared/README.md
+tests/data/bl01t/helm/shared/values.yaml
+tests/data/bl01t/include/iocs/Chart.yaml
+tests/data/bl01t/include/iocs/templates/configmap.yaml
+tests/data/bl01t/services/bl01t-ea-test-01/Chart.yaml
+tests/data/bl01t/services/bl01t-ea-test-01/pretend_helm.tgz
+tests/data/bl01t/services/bl01t-ea-test-01/templates
+tests/data/bl01t/services/bl01t-ea-test-01/values.yaml
+tests/data/bl01t/services/bl01t-ea-test-01/config/ioc.db
+tests/data/bl01t/services/bl01t-ea-test-01/config/ioc.yaml

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/tests/conftest.py

@@ -130,11 +130,11 @@ def mock_run(mocker):
     # Patch globals
     mocker.patch(
         "edge_containers_cli.globals.EC_K8S_NAMESPACE",
-        "bl45p",
+        "bl01t",
     )
     mocker.patch(
         "edge_containers_cli.globals.EC_SERVICES_REPO",
-        "https://github.com/epics-containers/bl45p",
+        "https://github.com/epics-containers/bl01t",
     )
     mocker.patch(
         "edge_containers_cli.globals.EC_LOG_URL",

{edge-containers-cli-3.1.1 → edge-containers-cli-3.4.1}/tests/data/autocomplete.yaml

@@ -1,8 +1,8 @@
 all_iocs:
-  - cmd: kubectl get namespace bl45p -o name
-    rsp: namespace/bl45p
-  - cmd: helm list -qn bl45p
-    rsp: bl45p-ea-ioc-01
+  - cmd: kubectl get namespace bl01t -o name
+    rsp: namespace/bl01t
+  - cmd: helm list -qn bl01t
+    rsp: bl01t-ea-test-01
 
 all_iocs_local:
   - cmd: docker --version
@@ -10,10 +10,10 @@ all_iocs_local:
   - cmd: podman buildx version
     rsp: buildah 1.31.3
   - cmd: podman ps -a --filter label=is_IOC=true --format .*
-    rsp: bl45p-ea-ioc-01
+    rsp: bl01t-ea-test-01
 
 avail_IOCs:
-  - cmd: git clone https://github.com/epics-containers/bl45p /tmp/.*
+  - cmd: git clone https://github.com/epics-containers/bl01t /tmp/.*
     rsp: Cloning into /tmp/xxxx...
   - cmd: git tag
     rsp: |
@@ -21,27 +21,33 @@ avail_IOCs:
   - cmd: git ls-tree -r 2.0 --name-only
     rsp: |
       2.0
+  - cmd: git tag --sort=committerdate
+    rsp: |
+      2.0
+  - cmd: git ls-tree -r 2.0 --name-only
+    rsp: |
+      2.0
   - cmd: git diff --name-only 2.0 2.0\^
     rsp: |
-      2.0 bl45p-ea-ioc-01
+      2.0 bl01t-ea-test-01
 
 avail_versions:
-  - cmd: git clone https://github.com/epics-containers/bl45p /tmp/.*
+  - cmd: git clone https://github.com/epics-containers/bl01t /tmp/.*
     rsp: Cloning into /tmp/xxxx...
   - cmd: git tag
     rsp: |
       1.0
       2.0
   - cmd: git ls-tree -r 1.0 --name-only
-    rsp: bl45p-ea-ioc-01
+    rsp: bl01t-ea-test-01
   - cmd: git diff --name-only 1.0 2.0
-    rsp: bl45p-ea-ioc-01
+    rsp: bl01t-ea-test-01
 
 running_iocs:
-  - cmd: kubectl get namespace bl45p -o name
-    rsp: namespace/bl45p
-  - cmd: kubectl -n bl45p get pod -o custom-columns=IOC_NAME:metadata
-    rsp: NAME, bl45p-ea-ioc-01
+  - cmd: kubectl get namespace bl01t -o name
+    rsp: namespace/bl01t
+  - cmd: kubectl -n bl01t get pod -o custom-columns=IOC_NAME:metadata
+    rsp: NAME, bl01t-ea-test-01
 
 running_iocs_local:
   - cmd: docker --version
@@ -49,4 +55,4 @@ running_iocs_local:
   - cmd: podman buildx version
     rsp: buildah 1.31.3
   - cmd: podman ps --filter label=is_IOC=true --format .*
-    rsp: bl45p-ea-ioc-01
+    rsp: bl01t-ea-test-01

edge-containers-cli-3.4.1/tests/data/bl01t/.copier-answers.yml

@@ -0,0 +1,10 @@
+# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
+_commit: 3.2.1
+_src_path: gh:epics-containers/ec-services-template
+beamline: bl01t
+cluster_namespace: local
+description: beamline bl01t IOC Instances and Services
+git_platform: github.com
+github_org: ec-tests
+repo_uri: ec-tests
+type: beamline

edge-containers-cli-3.4.1/tests/data/bl01t/.github/dependabot.yml

@@ -0,0 +1,12 @@
+# Look for updates to python and docker dependencies.
+
+version: 2
+updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"

edge-containers-cli-3.4.1/tests/data/bl01t/.github/workflows/ci_verify.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# CI to verify all the instances specified in this repo have valid configs.
+# The intention here is to verify that any mounted config folder will work
+# with the container image specified in values.yaml
+#
+# At present this will only work with IOCs because it uses ibek. To support
+# other future services that don't use ibek, we will need to add a standard
+# entrypoint for validating the config folder mounted at /config.
+
+ROOT=$(realpath $(dirname ${0})/../..)
+set -xe
+
+# use docker if available else use podman
+if ! docker version &>/dev/null; then docker=podman; else docker=docker; fi
+
+for service in ${ROOT}/services/*
+do
+    # Skip if subfolder has no config to validate
+    if [ ! -f "${service}/config/ioc.yaml" ]; then
+        continue
+    fi
+
+    # Get the container image that this service uses from values.yaml if supplied
+    image=$(cat ${service}/values.yaml | sed -rn 's/^ +image: (.*)/\1/p')
+
+    if [ -n "${image}" ]; then
+        echo "Validating ${service} with ${image}"
+
+        # This will fail and exit if the ioc.yaml is invalid
+        $docker run --rm --entrypoint bash \
+            -v ${service}/config:/config ${image} \
+            -c 'ibek runtime generate /config/ioc.yaml /epics/ibek-defs/*'
+
+    fi
+done

edge-containers-cli-3.4.1/tests/data/bl01t/.github/workflows/verify.yml

@@ -0,0 +1,16 @@
+on:
+  push:
+  pull_request:
+
+jobs:
+  verify_ioc_instances:
+    runs-on: ubuntu-latest
+    # pull requests are a duplicate of a branch push if within the same repo.
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: run IOC checks
+        run: |
+          bash .github/workflows/ci_verify.sh

edge-containers-cli-3.4.1/tests/data/bl01t/.gitignore

@@ -0,0 +1,8 @@
+**/*.tz
+**/*.tgz
+.history
+**/Chart.lock
+**/charts
+**/*.bob
+edm/bobs
+**/*copy

edge-containers-cli-3.4.1/tests/data/bl01t/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021 Knap, Giles (DLSLtd,RAL,LSCI)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

edge-containers-cli-3.4.1/tests/data/bl01t/README.md

@@ -0,0 +1,8 @@
+# beamline bl01t IOC Instances and Services
+
+This repository holds the a definition of beamline bl01t IOC Instances and services. Each sub folder of the `services` directory contains a helm chart for a specific service or IOC.
+
+NOTE: in order to take advantage of version control, you must deploy these services using the edge-containers-cli. This will ensure that the services are deployed from a specific tag of this repository and that the version number is recorded in the cluster.
+
+See https://github.com/epics-containers/edge-containers-cli for more information.
+

edge-containers-cli-3.4.1/tests/data/bl01t/environment.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# a bash script to source in order to set up your command line to in order
+# to work with the bl01t IOCs and Services.
+
+# check we are sourced
+if [ "$0" = "$BASH_SOURCE" ]; then
+    echo "ERROR: Please source this script"
+    exit 1
+fi
+
+echo "Loading environment for beamline bl01t IOC Instances and Services ..."
+
+#### SECTION 1. Environment variables ##########################################
+
+# a mapping between generic IOC repo roots and the related container registry
+# use spaces or line breaks to separate multiple mappings by default this
+# inlcudes mappings for github and DLS gitlab, add your own here.
+export EC_REGISTRY_MAPPING_REGEX='
+.*github.com:(.*)\/(.*) ghcr.io/\1/\2
+.*gitlab.diamond.ac.uk.*\/(.*) gcr.io/diamond-privreg/controls/prod/ioc/\1
+'
+# the namespace to use for kubernetes deployments - use local for local docker/podman
+export EC_K8S_NAMESPACE=local
+# the git repo for this project
+export EC_SERVICES_REPO=ec-tests
+# 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}*"
+# enforce a specific container cli - defaults to whatever is available
+# export EC_CONTAINER_CLI=podman
+# enable debug output in all 'ec' commands
+# export EC_DEBUG=1
+
+
+#### SECTION 2. Install ec #####################################################
+
+# check if epics-containers-cli (ec command) is installed
+if ! ec --version &> /dev/null; then
+    echo "ERROR: Please set up a virtual environment and: 'pip install edge-containers-cli'"
+    return 1
+fi
+
+# enable shell completion for ec commands
+source <(ec --show-completion ${SHELL})
+
+
+#### SECTION 3. Configure Kubernetes Cluster ###################################
+
+
+# no cofiguration in this section for local docker/podman deployments
+
+

edge-containers-cli-3.4.1/tests/data/bl01t/helm/shared/Chart.yaml

@@ -0,0 +1,13 @@
+# A Helm Chart for deploying an IOC instance
+apiVersion: v2
+name: shared
+
+version: 3.0.0
+
+type: application
+
+dependencies:
+  - name: ioc-instance
+    version: "3.0.0"
+    repository: "oci://ghcr.io/epics-containers"
+    #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/ioc-instance"

edge-containers-cli-3.4.1/tests/data/bl01t/helm/shared/README.md

@@ -0,0 +1,21 @@
+Beamline or Accelerator Domain Helm Chart Template
+==================================================
+
+The files in this folder are used to generate a helm chart for IOC instances
+on this repository's beamline or accelerator ioc.
+
+We generate a new helm chart for each IOC instance deployment. This is
+primarily because helm cannot package the config folder at package time.
+This approach could therefore be reviewed once this PR is released:
+https://github.com/helm/helm/pull/10077
+
+To deploy at IOC using beamline chart make sure you have epics-containers-cli
+installed and you are connected to the correct kubernetes cluster.
+
+```bash
+   source environment.sh
+   ec ioc deploy <ioc_name> <ioc_version>
+```
+
+see: [EPICS Containers CLI Repository](https://github.com/epics-containers/epics-containers-cli).
+