hotfix(plugin-site) separate svcs

charts/plugin-site/Chart.yaml

@@ -5,4 +5,4 @@ maintainers:
 - name: timja
 - name: halkeye
 name: plugin-site
-version: 0.3.1
+version: 0.3.2

charts/plugin-site/templates/_helpers.tpl

@@ -6,6 +6,13 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "plugin-site-frontend.name" -}}
+{{- include "plugin-site.name" . -}}-frontend
+{{- end -}}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -24,6 +31,16 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "plugin-site-frontend.fullname" -}}
+{{ include "plugin-site.fullname" . }}-frontend
+{{- end -}}
+
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

charts/plugin-site/templates/deployment-backend.yaml

@@ -2,13 +2,13 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "plugin-site.fullname" . }}-backend
-  labels: {{ include "plugin-site.labels" . | nindent 4 }}
+  labels:
+    {{- include "plugin-site.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.backend.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "plugin-site.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "plugin-site.selectorLabels" . | nindent 6}}
   template:
     metadata:
       annotations:
@@ -47,13 +47,13 @@ spec:
                 secretKeyRef:
                   name: {{ include "plugin-site.fullname" . }}
                   key: jira_password
- {{- if .Values.sentry.dsn }}
+            {{- if .Values.sentry.dsn }}
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:
                   name: {{ include "plugin-site.fullname" . }}
                   key: sentry_dsn
- {{- end }}
+            {{- end }}
             - name: DATA_FILE_URL
               value: {{ .Values.dataFileUrl }}
           volumeMounts:

charts/plugin-site/templates/deployment-frontend.yaml

@@ -1,17 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "plugin-site.fullname" . }}-frontend
-  labels: {{ include "plugin-site-frontend.labels" . | nindent 4 }}
+  name: {{ include "plugin-site-frontend.fullname" . }}
+  labels:
+    {{- include "plugin-site-frontend.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.frontend.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "plugin-site.name" . }}-frontend
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "plugin-site-frontend.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      labels: {{ include "plugin-site-frontend.labels" . | nindent 8 }}
+      labels:
+        {{- include "plugin-site-frontend.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/nginx-configmap.yaml") . | sha256sum }}
     spec:
@@ -25,7 +26,7 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       containers:
-        - name: {{ .Chart.Name }}-frontend
+        - name: {{ include "plugin-site-frontend.name" .}}
           image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag }}"
           imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
           ports:

charts/plugin-site/templates/ingress.yaml

@@ -32,10 +32,10 @@ spec:
         paths:
         {{- range $paths }}
           - path: {{ .path }}
-            pathType: Prefix
+            pathType: {{ .prefix | default "Prefix" }}
             backend:
               service:
-                name: {{ $fullName }}
+                name: {{ printf "%s-%s" $fullName (.svcName | default "frontend") }}
                 port:
                   number: {{ int (.svcPort) }}
         {{- end }}

charts/plugin-site/templates/pdb-frontend.yaml

@@ -2,7 +2,7 @@
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ include "plugin-site.fullname" . }}-frontend
+  name: {{ include "plugin-site-frontend.fullname" . }}
   labels:
     {{- include "plugin-site.labels" . | nindent 4 }}
 spec:

charts/plugin-site/templates/service-backend.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "plugin-site.fullname" . }}-backend
+  labels:
+    {{- include "plugin-site.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - name: backend
+      protocol: TCP
+      targetPort: backend
+      port: {{ .Values.backend.port }}
+  selector:
+    {{- include "plugin-site.selectorLabels" . | nindent 4}}

charts/plugin-site/templates/service-frontend.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "plugin-site-frontend.fullname" . }}
+  labels:
+    {{- include "plugin-site-frontend.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - name: frontend
+      protocol: TCP
+      targetPort: frontend
+      port: {{ .Values.frontend.port }}
+  selector:
+    {{- include "plugin-site-frontend.selectorLabels" . | nindent 4}}

charts/plugin-site/values.yaml

@@ -45,9 +45,11 @@ ingress:
     - path: /api/(.*)
       svcName: backend
       svcPort: 8080
+      prefix: ImplementationSpecific
     - path: /(.*)
       svcName: frontend
       svcPort: 80
+      prefix: ImplementationSpecific
   annotations:
     # rewrite target is important to get the path regexes to work
     nginx.ingress.kubernetes.io/rewrite-target: /$1