From 3188fdf1a7fee4f92e9c8a3a92d909240e944565 Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Tue, 12 Mar 2024 07:08:15 +0000
Subject: [PATCH] make nginx individually configurable

---
 Charts/epics-opis/Chart.yaml            |  2 +-
 Charts/epics-opis/templates/deploy.yaml | 20 +++++---------------
 Charts/epics-opis/values.yaml           |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/Charts/epics-opis/Chart.yaml b/Charts/epics-opis/Chart.yaml
index 926c350..3597fe0 100644
--- a/Charts/epics-opis/Chart.yaml
+++ b/Charts/epics-opis/Chart.yaml
@@ -5,4 +5,4 @@ description: |
 
 type: application
 
-version: 2.0.0+b3
+version: 3.0.1
diff --git a/Charts/epics-opis/templates/deploy.yaml b/Charts/epics-opis/templates/deploy.yaml
index ff1b733..5de6bf5 100644
--- a/Charts/epics-opis/templates/deploy.yaml
+++ b/Charts/epics-opis/templates/deploy.yaml
@@ -1,17 +1,3 @@
-# a config map to contain nginx config - ingests the files in config folder
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ .Release.Name }}-nginx-config
-  labels:
-    app: {{ .Release.Name }}
-    location: {{ .Values.location }}
-    ioc_group: {{ .Values.ioc_group }}
-data:
-{{ (.Files.Glob "config/*").AsConfig | indent 2 }}
-  version.txt: |
-    IOC {{ .Release.Name }} version {{ .Chart.AppVersion }}
----
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -107,7 +93,11 @@ spec:
     - name: http
       port: 80
       protocol: TCP
-      targetPort: 8080
+      targetPort: 80
+    - name: https
+      port: 443
+      protocol: TCP
+      targetPort: 443
   sessionAffinity: None
   selector:
     app: {{ .Release.Name }}
diff --git a/Charts/epics-opis/values.yaml b/Charts/epics-opis/values.yaml
index 88fe143..6e17f93 100644
--- a/Charts/epics-opis/values.yaml
+++ b/Charts/epics-opis/values.yaml
@@ -1,5 +1,5 @@
 # use nginx for publishing opi files over http
-image: docker.io/nginxinc/nginx-unprivileged:stable-bullseye-perl
+image: nginx:1.25.4
 
 # These are overridden per ioc_group repository
 beamline: