(misc) support latest kubernetes, init container for streaming

Signed-off-by: R.I.Pienaar <[email protected]>

charts/aaasvc/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: aaasvc
-version: 0.0.2
+version: 0.0.3
 appVersion: 0.3.3
 description: Choria AAA Server
 keywords:

charts/aaasvc/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.aaasvc.createIngress }}
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "aaasvc.fullname" . }}
@@ -25,7 +25,11 @@ spec:
     - host: {{ required "ingressHostname is required" .Values.aaasvc.ingressHostname }}
       http:
         paths:
-          - backend:
-              serviceName: {{ template "aaasvc.fullname" . }}
-              servicePort: 80
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ template "aaasvc.fullname" . }}
+                port:
+                  number: 80
 {{- end }}

charts/broker/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: broker
-version: 0.0.14
+version: 0.0.15
 appVersion: 0.14.0
 description: Choria Network Broker
 keywords:

charts/broker/templates/streaming.yaml

@@ -72,6 +72,19 @@ spec:
         fsGroup: {{ .Values.securityContext.fsGroup }}
       {{- end }}
 
+      {{- if and .Values.streaming.storageInit .Values.streaming.storageClassName }}
+      initContainers:
+        - name: storage-init
+          image: busybox
+          command: ["/bin/chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}", "/data"]
+          volumeMounts:
+          {{- if .Values.streaming.storageClassName }}
+            - mountPath: "/data"
+              name: {{ .Values.streaming.pvcName }}
+              readOnly: false
+          {{- end }}
+      {{- end }}
+
       containers:
       - name: stream
         image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"

charts/broker/values.yaml

@@ -52,6 +52,8 @@ streaming:
   eventRetention: 24h
   # How long to retain Autonomous Agent events - including Scout events, 0 disables
   stateRetention: 24h
+  # Use an init container to set the correct permissions for the mount
+  storageInit: false
 
 # Broker specific settings
 broker: