updated helm chart to use latest v6.0.1 version of the image (#382)

* updated helm chart to use latest v6.0.1 version of the image

* updated workflow to run against multiple k8s versions

charts/hapi-fhir-jpaserver/templates/deployment.yaml

@@ -30,7 +30,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
         - name: wait-for-db-to-be-ready
-          image: "{{ .Values.postgresql.image.registry }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}"
+          image: docker.io/bitnami/postgresql:14.3.0-debian-10-r20
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -66,9 +66,23 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
+            - name: metrics
+              containerPort: 8081
+              protocol: TCP
+          startupProbe:
+            httpGet:
+              path: /readyz
+              port: http
+          {{- with .Values.startupProbe }}
+            initialDelaySeconds: {{ .initialDelaySeconds }}
+            periodSeconds: {{ .periodSeconds }}
+            timeoutSeconds: {{ .timeoutSeconds }}
+            successThreshold: {{ .successThreshold }}
+            failureThreshold: {{ .failureThreshold }}
+          {{- end }}
           readinessProbe:
             httpGet:
-              path: /
+              path: /readyz
               port: http
           {{- with .Values.readinessProbe }}
             initialDelaySeconds: {{ .initialDelaySeconds }}
@@ -77,11 +91,11 @@ spec:
             successThreshold: {{ .successThreshold }}
             failureThreshold: {{ .failureThreshold }}
           {{- end }}
-          startupProbe:
+          livenessProbe:
             httpGet:
-              path: /fhir/metadata
+              path: /livez
               port: http
-          {{- with .Values.startupProbe }}
+          {{- with .Values.livenessProbe }}
             initialDelaySeconds: {{ .initialDelaySeconds }}
             periodSeconds: {{ .periodSeconds }}
             timeoutSeconds: {{ .timeoutSeconds }}
@@ -106,6 +120,10 @@ spec:
               value: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect
             - name: HAPI_FHIR_USE_APACHE_ADDRESS_STRATEGY
               value: "true"
+            - name: MANAGEMENT_ENDPOINT_HEALTH_PROBES_ADD_ADDITIONAL_PATHS
+              value: "true"
+            - name: MANAGEMENT_SERVER_PORT
+              value: "8081"
             {{- if .Values.extraEnv }}
             {{ toYaml .Values.extraEnv | nindent 12 }}
             {{- end }}
@@ -126,6 +144,10 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: tmp-volume
           emptyDir: {}

charts/hapi-fhir-jpaserver/templates/networkpolicy.yaml

@@ -1,27 +0,0 @@
-{{- if .Values.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "hapi-fhir-jpaserver.fullname" . }}
-  labels:
-    {{- include "hapi-fhir-jpaserver.labels" . | nindent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "hapi-fhir-jpaserver.selectorLabels" . | nindent 6 }}
-  ingress:
-    # Allow inbound connections from pods with the "hapi-fhir-jpaserver-client: true" label
-    - ports:
-        - port: http
-      from:
-        - podSelector:
-            matchLabels:
-              {{ include "hapi-fhir-jpaserver.fullname" . }}-client: "true"
-          {{- with .Values.networkPolicy.explicitNamespacesSelector }}
-          namespaceSelector:
-            {{ toYaml . | nindent 12 }}
-          {{- end }}
-        {{- with .Values.networkPolicy.allowedFrom }}
-            {{ tpl (toYaml .) $ | nindent 8 }}
-        {{- end }}
-{{- end }}

charts/hapi-fhir-jpaserver/templates/service.yaml

@@ -11,5 +11,9 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+    - port: {{ .Values.metrics.service.port }}
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
   selector:
     {{- include "hapi-fhir-jpaserver.selectorLabels" . | nindent 4 }}

charts/hapi-fhir-jpaserver/templates/servicemonitor.yaml

@@ -0,0 +1,30 @@
+{{- if .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "hapi-fhir-jpaserver.fullname" . }}
+  {{- if .Values.metrics.serviceMonitor.namespace }}
+  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+    {{- include "hapi-fhir-jpaserver.labels" . | nindent 4 }}
+    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.metrics.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+    - port: metrics
+      path: /actuator/prometheus
+      {{- if .Values.metrics.serviceMonitor.interval }}
+      interval: {{ .Values.metrics.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+    {{- include "hapi-fhir-jpaserver.selectorLabels" . | nindent 6 }}
+{{- end }}