Feature/remote insights update

charts/lagoon-remote/Chart.yaml

@@ -19,7 +19,7 @@ type: application
 # 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.
-version: 0.85.0
+version: 0.86.0
 
 dependencies:
 - name: lagoon-build-deploy
@@ -45,4 +45,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update lagoon-build-deploy to v0.26.1
+      description: Changes permissions, adds service, updates secret for insights-remote

charts/lagoon-remote/templates/insights-remote.clusterrole.yaml

@@ -6,10 +6,19 @@ metadata:
   labels:
     {{- include "lagoon-remote.insightsRemote.labels" . | nindent 4 }}
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - "*"
+  - verbs:
+      - '*'
+    apiGroups:
+      - ''
+    resources:
+      - configmaps
+      - secrets
+  - verbs:
+      - get
+      - watch
+      - list
+    apiGroups:
+      - ''
+    resources:
+      - namespaces
   {{- end }}

charts/lagoon-remote/templates/insights-remote.deployment.yaml

@@ -47,15 +47,24 @@ spec:
             - name: RABBITMQ_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}-rabbitmqsecret
-                  key: password
+                  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}
+                  key: RABBITMQ_PASSWORD
             - name: RABBITMQ_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}-rabbitmqsecret
-                  key: username
+                  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}
+                  key: RABBITMQ_USERNAME
+            - name: INSIGHTS_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}
+                  key: INSIGHTS_TOKEN_SECRET
           resources:
             {{- toYaml .Values.insightsRemote.resources | nindent 12 }}
+          ports:
+            - name: insights-ws
+              containerPort: 8888
+              protocol: TCP            
       {{- with .Values.insightsRemote.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/lagoon-remote/templates/insights-remote.secrets.yaml

@@ -3,12 +3,17 @@
 {{- $rabbitMQUsername := coalesce .Values.global.rabbitMQUsername .Values.insightsRemote.rabbitMQUsername }}
 {{- $rabbitMQPassword := coalesce .Values.global.rabbitMQPassword .Values.insightsRemote.rabbitMQPassword }}
 
+{{- $data := index (lookup "v1" "Secret" .Release.Namespace (include "lagoon-remote.insightsRemote.fullname" .)) "data" | default dict }}
+{{- $insightsTokenSecret := coalesce .Values.insightsRemote.insightsTokenSecret (ternary (randAlpha 32) (index $data "INSIGHTS_TOKEN_SECRET" | default "" | b64dec) (index $data "INSIGHTS_TOKEN_SECRET" | empty)) }}
+
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}-rabbitmqsecret
-type: kubernetes.io/basic-auth
+  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}
+type: Opaque
 stringData:
-  username: {{ required "A valid rabbitMQUsername required!" $rabbitMQUsername | quote }}
-  password: {{ required "A valid rabbitMQPassword required!" $rabbitMQPassword | quote }}
+  RABBITMQ_USERNAME: {{ required "A valid rabbitMQUsername required!" $rabbitMQUsername | quote }}
+  RABBITMQ_PASSWORD: {{ required "A valid rabbitMQPassword required!" $rabbitMQPassword | quote }}
+  INSIGHTS_TOKEN_SECRET: {{ $insightsTokenSecret | quote }}
+
 {{- end }}

charts/lagoon-remote/templates/insights-remote.service.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "lagoon-remote.insightsRemote.fullname" . }}
+  labels: 
+    {{- include "lagoon-remote.insightsRemote.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.insightsRemote.service.type }}
+  ports:
+    - port: {{ .Values.insightsRemote.service.port }}
+      targetPort: 8888
+      protocol: TCP
+      name: insights-ws
+  selector:
+    {{- include "lagoon-remote.insightsRemote.selectorLabels" . | nindent 4 }}

charts/lagoon-remote/values.yaml

@@ -219,11 +219,15 @@ insightsRemote:
 
   replicaCount: 1
 
+  # This is the secret used to sign JWT's injected into environments
+  # This shouldn't need to be changed in most circumstances - here for completion
+  # insightsTokenSecret: ""
+
   image:
     repository: uselagoon/insights-remote
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v0.0.4"
+    tag: "v0.0.7"
 
   imagePullSecrets: []
   nameOverride: ""
@@ -294,6 +298,11 @@ insightsRemote:
 
   affinity: {}
 
+  service:
+    type: ClusterIP
+    port: 80
+
+
 # the nats chart is a subchart which is configured for use by lagoon-remote
 nats:
   enabled: false