Merge pull request #113 from bcgov/ops/patronibump

Minor Helm Chart Maintenance and Patroni Bump

Author: TimCsaky

.github/environments/values.pr.yaml

@@ -11,7 +11,7 @@ patroni:
       cpu: 250m
       memory: 384Mi
     requests:
-      cpu: 50m
+      cpu: 20m
       memory: 192Mi
   persistentVolume:
     enabled: false

charts/coms/Chart.yaml

@@ -3,7 +3,7 @@ name: common-object-management-service
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.7
+version: 0.0.8
 kubeVersion: ">= 1.13.0"
 description: A microservice for managing access control to S3 Objects
 # A chart can be either an 'application' or a 'library' chart.
@@ -28,7 +28,7 @@ sources:
   - https://github.com/bcgov/common-object-management-service
 dependencies:
   - name: patroni
-    version: ~0.0.3
+    version: ~0.0.4
     repository: https://bcgov.github.io/nr-patroni-chart
     condition: patroni.enabled
     tags:

charts/coms/templates/networkpolicy.yaml

@@ -1,4 +1,25 @@
-{{- if and .Values.networkPolicy.enabled .Values.patroni.enabled }}
+{{- if .Values.networkPolicy.enabled }}
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: allow-openshift-ingress-to-{{ include "coms.fullname" . }}-app
+  labels:
+    {{- include "coms.labels" . | nindent 4 }}
+spec:
+  ingress:
+    - from:
+        - namespaceSelector:
+            matchLabels:
+              network.openshift.io/policy-group: ingress
+        - podSelector:
+            matchLabels: {{ include "coms.selectorLabels" . | nindent 14 }}
+      ports:
+        - port: {{ default "8080" .Values.config.configMap.SERVER_PORT | atoi }}
+          protocol: TCP
+  podSelector:
+    matchLabels: {{- include "coms.selectorLabels" . | nindent 6 }}
+{{- if .Values.patroni.enabled }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -33,3 +54,4 @@ spec:
   podSelector:
     matchLabels: {{ include "patroni.selectorLabels" .Subcharts.patroni | nindent 6 }}
 {{- end }}
+{{- end }}