Refractoring of charts

Change-Id: Iadbb0b8a3edf6e1203c11af7e0e90d5492b5ab14

charts/nebulous-cloud-fog-service-broker/templates/_helpers.tpl

@@ -42,6 +42,24 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{- define "nebulous-cloud-fog-service-broker.frontend.labels" -}}
+helm.sh/chart: {{ include "nebulous-cloud-fog-service-broker.chart" . }}
+{{ include "nebulous-cloud-fog-service-broker.frontend.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{- define "nebulous-cloud-fog-service-broker.postgresql.labels" -}}
+helm.sh/chart: {{ include "nebulous-cloud-fog-service-broker.chart" . }}
+{{ include "nebulous-cloud-fog-service-broker.postgresql.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
 {{/*
 Selector labels
 */}}
@@ -50,6 +68,16 @@ app.kubernetes.io/name: {{ include "nebulous-cloud-fog-service-broker.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{- define "nebulous-cloud-fog-service-broker.frontend.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "nebulous-cloud-fog-service-broker.name" . }}-frontend
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{- define "nebulous-cloud-fog-service-broker.postgresql.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "nebulous-cloud-fog-service-broker.name" . }}-postgresql
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
 {{/*
 Create the name of the service account to use
 */}}

charts/nebulous-cloud-fog-service-broker/templates/deployment-postgres.yaml

@@ -4,15 +4,15 @@ kind: Deployment
 metadata:
   name: {{ include "nebulous-cloud-fog-service-broker.fullname" . }}-postgresql
   labels:
-    {{- include "nebulous-cloud-fog-service-broker.labels" . | nindent 4 }}-postgresql
+    {{- include "nebulous-cloud-fog-service-broker.postgresql.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      {{- include "nebulous-cloud-fog-service-broker.selectorLabels" . | nindent 6 }}-postgresql
+      {{- include "nebulous-cloud-fog-service-broker.postgresql.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "nebulous-cloud-fog-service-broker.selectorLabels" . | nindent 8 }}-postgresql
+        {{- include "nebulous-cloud-fog-service-broker.postgresql.selectorLabels" . | nindent 8 }}
     spec:
       volumes:
         - name: postgres-data
@@ -48,7 +48,7 @@ kind: Service
 metadata:
   name: {{ include "nebulous-cloud-fog-service-broker.fullname" . }}-postgresql
   labels:
-    {{- include "nebulous-cloud-fog-service-broker.labels" . | nindent 4 }}-postgresql
+    {{- include "nebulous-cloud-fog-service-broker.postgresql.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
   ports:
@@ -57,5 +57,5 @@ spec:
       protocol: TCP
       name: postgresql
   selector:
-    {{- include "nebulous-cloud-fog-service-broker.selectorLabels" . | nindent 4 }}-postgresql
+    {{- include "nebulous-cloud-fog-service-broker.postgresql.selectorLabels" . | nindent 4 }}
 {{ end }}

charts/nebulous-cloud-fog-service-broker/templates/deployment.yaml

@@ -69,4 +69,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}

charts/nebulous-cloud-fog-service-broker/templates/frontend.yaml

@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "nebulous-cloud-fog-service-broker.fullname" . }}-frontend
+  labels:
+    {{- include "nebulous-cloud-fog-service-broker.frontend.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "nebulous-cloud-fog-service-broker.frontend.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "nebulous-cloud-fog-service-broker.frontend.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: nebulous-cloud-fog-service-broker-frontend
+          image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          env:
+            - name: VUE_APP_BACKEND_HOST
+              value: {{ .Values.env.backendHost }}
+            - name: VITE_BACKEND_URL
+              value: {{ .Values.env.backendHost }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "nebulous-cloud-fog-service-broker.fullname" . }}-frontend
+  labels:
+    {{- include "nebulous-cloud-fog-service-broker.frontend.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: {{ .Values.service.guiPort }}
+      targetPort: http
+      protocol: TCP
+      name: gui
+  selector:
+    {{- include "nebulous-cloud-fog-service-broker.frontend.selectorLabels" . | nindent 4 }}

charts/nebulous-cloud-fog-service-broker/templates/service.yaml

@@ -11,9 +11,5 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-    - port: {{ .Values.service.guiPort }}
-      targetPort: http
-      protocol: TCP
-      name: gui
   selector:
     {{- include "nebulous-cloud-fog-service-broker.selectorLabels" . | nindent 4 }}

charts/nebulous-cloud-fog-service-broker/values.yaml

@@ -110,6 +110,7 @@ env:
   backendHost: "http://cloud-fog-service-broker:8001"
 
 frontend:
+  resources: {}
   image:
     repository: "quay.io/nebulous/cloud-fog-service-broker-backend"
     tag: ""