Merge pull request #1 from alliander-opensource/feature/simplify-chart

Simplify helm chart

Author: jasperkamerling

charts/pokertool/Chart.yaml

@@ -7,7 +7,3 @@ keywords:
   - "kotlin"
   - "scrum"
   - "poker"
-dependencies:
-  - name: common
-    version: 2.27.0
-    repository: https://charts.bitnami.com/bitnami

charts/pokertool/templates/backend/deploy.yaml

@@ -1,26 +1,26 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "common.names.fullname" . }}-backend
+  name: pokertool-backend
   labels:
-    {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: pokertool
     app.kubernetes.io/component: backend
 spec:
   replicas: {{ .Values.backend.replicas }}
   selector:
     matchLabels:
-      {{- include "common.labels.standard" . | nindent 6 }}
+      app.kubernetes.io/name: pokertool
       app.kubernetes.io/component: backend
   template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: pokertool
+        app.kubernetes.io/component: backend
     spec:
       containers:
-        {{- with .Values.backend.image}}
-        - image: "{{ .registry }}/{{ .name }}:{{ .tag }}"
-        {{- end }}
-          name: {{ template "common.names.fullname" . }}-backend
+        - name: pokertool-backend
+          {{- with .Values.backend.image}}
+          image: "{{ .registry }}/{{ .name }}:{{ .tag }}"
+          {{- end }}
           ports:
             - containerPort: 8080
-    metadata:
-      labels:
-        {{- include "common.labels.standard" . | nindent 8 }}
-        app.kubernetes.io/component: backend

charts/pokertool/templates/backend/ingress.yaml

@@ -2,9 +2,9 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ template "common.names.fullname" . }}-backend
+  name: pokertool-backend
   labels:
-    {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: pokertool
     app.kubernetes.io/component: backend
 spec:
   rules:
@@ -13,13 +13,13 @@ spec:
         paths:
           - backend:
               service:
-                name: {{ template "common.names.fullname" . }}-backend
+                name: pokertool-backend
                 port:
                   number: 80
             path: /api
             pathType: Prefix
   tls:
     - hosts:
         - {{ .Values.ingress.domain | required "ingress.domain required" }}
-      secretName: {{ template "common.names.fullname" . }}-backend-cert
+      secretName: pokertool-backend-cert
 {{- end }}

charts/pokertool/templates/backend/svc.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "common.names.fullname" . }}-backend
+  name: pokertool-backend
   labels:
-    {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: pokertool
     app.kubernetes.io/component: backend
 spec:
+  selector:
+    app.kubernetes.io/name: pokertool
+    app.kubernetes.io/component: backend
   ports:
     - port: 80
       targetPort: 8080
-  selector:
-    {{- include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: backend

charts/pokertool/templates/frontend/deploy.yaml

@@ -1,26 +1,26 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "common.names.fullname" . }}-frontend
+  name: pokertool-frontend
   labels:
-    {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: pokertool
     app.kubernetes.io/component: frontend
 spec:
   replicas: {{ .Values.frontend.replicas }}
   selector:
     matchLabels:
-      {{- include "common.labels.standard" . | nindent 6 }}
+      app.kubernetes.io/name: pokertool
       app.kubernetes.io/component: frontend
   template:
     spec:
       containers:
-        {{- with .Values.frontend.image}}
-        - image: "{{ .registry }}/{{ .name }}:{{ .tag }}"
+        - name: pokertool-frontend
+        {{- with .Values.frontend.image }}
+          image: "{{ .registry }}/{{ .name }}:{{ .tag }}"
         {{- end }}
-          name: {{ template "common.names.fullname" . }}-frontend
           ports:
             - containerPort: 80
     metadata:
       labels:
-        {{- include "common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/name: pokertool
         app.kubernetes.io/component: frontend

charts/pokertool/templates/frontend/ingress.yaml

@@ -2,9 +2,9 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ template "common.names.fullname" . }}-frontend
+  name: pokertool-frontend
   labels:
-    {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: pokertool
     app.kubernetes.io/component: frontend
 spec:
   rules:
@@ -13,13 +13,13 @@ spec:
         paths:
           - backend:
               service:
-                name: {{ template "common.names.fullname" . }}-frontend
+                name: pokertool-frontend
                 port:
                   number: 80
             path: /
             pathType: Prefix
   tls:
     - hosts:
         - {{ .Values.ingress.domain | required "ingress.domain required" }}
-      secretName: {{ template "common.names.fullname" . }}-frontend-cert
+      secretName: pokertool-frontend-cert
 {{- end }}

charts/pokertool/templates/frontend/svc.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "common.names.fullname" . }}-frontend
+  name: pokertool-frontend
   labels:
-    {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: pokertool
     app.kubernetes.io/component: frontend
 spec:
+  selector:
+    app.kubernetes.io/name: pokertool
+    app.kubernetes.io/component: frontend
   ports:
     - port: 80
       targetPort: 80
-  selector:
-    {{- include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: frontend

release.sh

@@ -2,6 +2,5 @@
 
 TOKEN=$1
 
-helm repo add bitnami https://charts.bitnami.com/bitnami
 cr upload -o alliander-opensource -r pokertool-chart --push --generate-release-notes --token "$TOKEN"
 cr index  -o alliander-opensource -r pokertool-chart --push --index-path index.yaml --token "$TOKEN"