switch to oci registry for charts

epics-containers · Feb 1, 2024 · 1f64534 · 1f64534
1 parent 853672a
commit 1f64534
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 13 deletions.
diff --git a/helm/configmap/Chart.yaml b/helm/configmap/Chart.yaml
@@ -2,6 +2,6 @@
 apiVersion: v2
 name: configmap
 
-version: 1.0.0
+version: 2.0.0+b1
 
 type: application
diff --git a/helm/domain/Chart.yaml b/helm/domain/Chart.yaml
@@ -2,12 +2,12 @@
 apiVersion: v2
 name: domain
 
-version: 1.0.0
+version: 2.0.0+b1
 
 type: application
 
 dependencies:
  - name: ioc-instance
- version: "1.4.1"
- # repository: "oci://ghcr.io/epics-containers"
- repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/ioc-instance"
+ version: "2.0.0+b1"
+ repository: "oci://ghcr.io/epics-containers"
+ #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/include/iocs/Chart.yaml b/include/iocs/Chart.yaml
@@ -17,8 +17,8 @@ type: application
 
 dependencies:
  - name: configmap
- version: "1.0.0"
+ version: "2.0.0+b1"
  repository: file://../../helm/configmap
  - name: domain
- version: "1.0.0"
+ version: "2.0.0+b1"
  repository: file://../../helm/domain
diff --git a/services/README.md b/services/README.md
@@ -11,7 +11,7 @@ There are a number of helm charts that all domains will likely require. At prese
 
 - **epics-opis**: installs the web server that shares the engineering screens published by each IOC. The structure is two deep only: IOC names as folders at the root containing all the IOCs OPI files in a flat list.
 
-Deploy these charts to the beamline cluster using by setting up your cluster and namespace connection using environment.sh and then executing the following commands (requires that edge-containers-cli is installed):
+Deploy these charts to the domain cluster using by setting up your cluster and namespace connection using environment.sh and then executing the following commands (requires that edge-containers-cli is installed):
 
 ```bash
 ec list # lists the latest versions of all services

diff --git a/services/epics-opis/Chart.yaml b/services/epics-opis/Chart.yaml
@@ -12,5 +12,6 @@ type: application
 
 dependencies:
  - name: epics-opis
- version: "1.4.0"
+ version: "2.0.0+b1"
+ #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-opis"
  repository: "oci://ghcr.io/epics-containers"
diff --git a/services/epics-opis/values.yaml b/services/epics-opis/values.yaml
@@ -1,5 +1,5 @@
 epics-opis:
- domain:bl47p
+ domain: bl47p
 
  # this is a shared cluster beamline so use affinity to make this run on the
  # the beamline node (p47 only has one node)

diff --git a/services/epics-pvcs/Chart.yaml b/services/epics-pvcs/Chart.yaml
@@ -12,5 +12,6 @@ type: application
 
 dependencies:
  - name: epics-pvcs
- version: "1.4.0"
+ version: "2.0.0+b1"
+ # repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-pvcs"
  repository: "oci://ghcr.io/epics-containers"
diff --git a/services/epics-pvcs/values.yaml b/services/epics-pvcs/values.yaml
@@ -1 +1,2 @@
-epics-pvcs: domain:l47p
+epics-pvcs:
+ domain: bl47p
diff --git a/update-helm b/update-helm
@@ -12,6 +12,8 @@ done
 # rebuild dependencies (depth first)
 for i in helm/* services/*; do
  if [ -f $i/Chart.yaml ]; then
- helm dependency build $i
+ echo "Updating helm dependencies for $i"
+ # filter out the noisy "found symbolic link" messages
+ helm dependency build $i |& sed "/found symbolic/d"
  fi
 done