Merge pull request #11 from epics-containers/RTEMS

tidy nfsv2-tftp chart
epics-containers · Mar 26, 2024 · a93cf22 · a93cf22
2 parents bd307f9 + 7b3d695
commit a93cf22
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/helm_deploy.yml b/.github/workflows/helm_deploy.yml
@@ -26,6 +26,7 @@ jobs:
           echo ${{ secrets.GITHUB_TOKEN }} | helm registry login ghcr.io/${{ github.repository_owner }} --username ${{ github.repository_owner }} --password-stdin
 
           REGISTRY=oci://ghcr.io/epics-containers
+          set -x
 
           # helm tags must be SemVar. Use 0.0.0-b0 for testing the latest non-tagged build
           if [ "${GITHUB_REF_TYPE}" == "tag" ] ; then

diff --git a/Charts/epics-opis/Chart.yaml b/Charts/epics-opis/Chart.yaml
@@ -5,4 +5,4 @@ description: |
 
 type: application
 
-version: 3.0.1
+version: 3.4.0
diff --git a/Charts/epics-pvcs/Chart.yaml b/Charts/epics-pvcs/Chart.yaml
@@ -9,4 +9,4 @@ description: |
 
 type: application
 
-version: 3.0.4
+version: 3.4.0
diff --git a/Charts/epics-pvcs/values.yaml b/Charts/epics-pvcs/values.yaml
@@ -1,9 +1,9 @@
 # the beamline name - only set for beamlines
-beamline: bl20j
+beamline:
 # the name of the repository in which the IOC is grouped
-ioc_group: bl20j
+ioc_group:
 # the location where the IOCs will run - same as beamline for beamlines
-location: bl20j
+location:
 
 # sizes of the auto provisioned PVs
 opi_size: 1Gi

diff --git a/Charts/ioc-instance/Chart.yaml b/Charts/ioc-instance/Chart.yaml
@@ -2,6 +2,6 @@
 apiVersion: v2
 name: ioc-instance
 
-version: 3.0.3
+version: 3.4.0
 
 type: application
diff --git a/Charts/nfsv2-tftp/Chart.yaml b/Charts/nfsv2-tftp/Chart.yaml
@@ -5,4 +5,4 @@ description: |
 
 type: application
 
-version: 3.0.4
+version: 3.4.0
diff --git a/Charts/nfsv2-tftp/templates/deploy.yaml b/Charts/nfsv2-tftp/templates/deploy.yaml
@@ -33,26 +33,33 @@ spec:
 
       containers:
         - name: server
-          image: ghcr.io/epics-containers/nfsv2-tftp-server:0.1.1
+          image: {{ .Values.image }}
           ports:
             - containerPort: 2049
               protocol: UDP
+              name: nfsd
             - containerPort: 20048
               protocol: UDP
+              name: mountd
             - containerPort: 111
               protocol: UDP
+              name: rpcbind
             - containerPort: 69
               protocol: UDP
+              name: tftp
+            - containerPort: 12002
+              protocol: TCP
+              name: rsync
           command: ["/bin/bash"]
           args: ["-c", "bash /scripts/startup.sh && sleep infinity"]
 
           resources:
             limits:
               memory: 50Mi
-              cpu: 100m
+              cpu: 800m
             requests:
               memory: 20Mi
-              cpu: 50m
+              cpu: 200m
 
           volumeMounts:
             - mountPath: "/iocs"
@@ -91,7 +98,11 @@ spec:
       port: 69
       protocol: UDP
       targetPort: 69
-  # a j20 static IP
+    - name: rsync
+      port: 12002
+      protocol: TCP
+      targetPort: 12002
+  # a static IP is required for the NFSv2 server to work
   loadBalancerIP: {{ .Values.static_ip }}
   sessionAffinity: None
   selector:

diff --git a/Charts/nfsv2-tftp/values.yaml b/Charts/nfsv2-tftp/values.yaml
@@ -1,7 +1,7 @@
 # a container for publishing NFS and TFTP services
-image: ghcr.io/epics-containers/nfsv2-tftp-server:main
+image: ghcr.io/epics-containers/nfsv2-tftp-server:0.2.2
 
-# The following values must all be set by each invoker
+# The remaining values must all be set by each invoker
 
 # the beamline name - only set for beamlines
 beamline:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,4 @@ description: \|

		type: application

		version: 3.0.1
		version: 3.4.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ description: \|

		type: application

		version: 3.0.4
		version: 3.4.0