Skip to content

Commit

Permalink
make nginx individually configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Mar 12, 2024
1 parent dbd378a commit 3188fdf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Charts/epics-opis/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ description: |
type: application

version: 2.0.0+b3
version: 3.0.1
20 changes: 5 additions & 15 deletions Charts/epics-opis/templates/deploy.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion Charts/epics-opis/values.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit 3188fdf

Please sign in to comment.