Merge branch 'main' into 65_create_main_endpoint

Author: olliesilvester

README.md

@@ -35,7 +35,8 @@ use_stub_offsets: bool = config_server.best_effort_get_feature_flag("use_stub_of
 
 ## Testing and deployment
 
-There is a convenient script in `./deployment/build_and_push_.sh`, which takes
+
+There is a convenient script in `./deployment/build_and_push.sh`, which takes
 a `--dev` option to push containers with `-dev` appended to their names and a `--no-push` option for local
 development. This ensures that environment variables for dev or prod builds are included in the built container. To push to
 the registry you must have identified to gcloud by having loaded a kubernetes module and running `gcloud auth login.`
@@ -44,7 +45,7 @@ To deploy a live version, you can run the above script with no arguments and the
 argus, in the `daq-config-server` namespace, run `kubectl rollout restart deployment`. If it is not
 currently deployed it you can deploy it with `helm install daq-config ./helmchart`.
 
-To test locally, you can build with `./deployment/build_and_push_all.sh --dev --no-push` and then
+To test locally, you can build with `./deployment/build_and_push.sh --dev --no-push` and then
 run the container `daq-config-server-dev` (with the command `daq-config-server --dev`), `daq-config-server-db-dev`,
 and `daq-config-server-gui-dev`, all with the `--net host` option.
 

helmchart/templates/ingress.yaml

@@ -1,22 +1,43 @@
-{{- if .Values.ingress.create -}}
+{{- if .Values.ingress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "helmchart.fullname" . }}
+  labels:
+    {{- include "helmchart.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- with .Values.ingress.className }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
   tls:
-  - hosts:
-    - {{ required "A valid hostname must be provided" .Values.ingress.host }}
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
   rules:
-  - host: {{ required "A valid hostname must be provided" .Values.ingress.host }}
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: {{ include "helmchart.fullname" . }}
-            port:
-              number: {{ .Values.service.port }}
-{{- end }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- with .pathType }}
+            pathType: {{ . }}
+            {{- end }}
+            backend:
+              service:
+                name: {{ include "helmchart.fullname" $ }}
+                port:
+                  number: {{ $.Values.service.port }}
+          {{- end }}
+    {{- end }}
+{{- end }}

helmchart/values.yaml

@@ -57,7 +57,19 @@ service:
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
   enabled: false
-#  host: foo.diamond.ac.uk  (assumes port = service.port)
+  className: "nginx"
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: Prefix
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
 
 
 resources: {}