merge helm2 and helm3

Author: Knappek

.gitignore

@@ -39,3 +39,6 @@ erl_crash.dump
 /.elixir_ls/
 *~
 *.orig
+
+# asdf 
+.tool-versions

deployment/README.md

@@ -8,6 +8,8 @@ kubectl apply -f kubectl/rig.yaml
 
 ## Helm
 
+The Helm Charts are stored in [./helm2](./helm2) and [./helm3](./helm3) directory, which are essentially the same but only use a different `apiVersion` in the `Chart.yaml`.
+
 ### Version 2
 
 ```bash

deployment/helm2/reactive-interaction-gateway/.helmignore

@@ -14,6 +14,7 @@
 *.swp
 *.bak
 *.tmp
+*.orig
 *~
 # Various IDEs
 .project

deployment/helm2/reactive-interaction-gateway/Chart.yaml

@@ -1,5 +1,11 @@
 apiVersion: v1
-appVersion: "2.4.0"
-description: A Helm chart for Kubernetes
 name: reactive-interaction-gateway
+description: A Helm chart for Kubernetes
+
+# 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: 1.0.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+appVersion: 2.4.0

deployment/helm2/reactive-interaction-gateway/templates/_helpers.tpl

@@ -35,15 +35,22 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "reactive-interaction-gateway.labels" -}}
-app.kubernetes.io/name: {{ include "reactive-interaction-gateway.name" . }}
 helm.sh/chart: {{ include "reactive-interaction-gateway.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "reactive-interaction-gateway.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
 
+{{/*
+Selector labels
+*/}}
+{{- define "reactive-interaction-gateway.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "reactive-interaction-gateway.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
 {{/*
 Return the appropriate apiVersion for deployment.
 */}}

deployment/helm2/reactive-interaction-gateway/templates/deployment.yaml

@@ -3,18 +3,16 @@ kind: Deployment
 metadata:
   name: {{ include "reactive-interaction-gateway.fullname" . }}
   labels:
-{{ include "reactive-interaction-gateway.labels" . | indent 4 }}
+    {{- include "reactive-interaction-gateway.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "reactive-interaction-gateway.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "reactive-interaction-gateway.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "reactive-interaction-gateway.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- include "reactive-interaction-gateway.selectorLabels" . | nindent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}

deployment/helm2/reactive-interaction-gateway/templates/service-headless.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ include "reactive-interaction-gateway.fullname" . }}-headless
   labels:
-{{ include "reactive-interaction-gateway.labels" . | indent 4 }}
+    {{- include "reactive-interaction-gateway.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
   clusterIP: None
@@ -25,5 +25,4 @@ spec:
       protocol: TCP
       name: internal-https
   selector:
-    app.kubernetes.io/name: {{ include "reactive-interaction-gateway.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "reactive-interaction-gateway.selectorLabels" . | nindent 4 }}

deployment/helm2/reactive-interaction-gateway/templates/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ include "reactive-interaction-gateway.fullname" . }}
   labels:
-{{ include "reactive-interaction-gateway.labels" . | indent 4 }}
+    {{- include "reactive-interaction-gateway.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -24,5 +24,4 @@ spec:
       protocol: TCP
       name: internal-https
   selector:
-    app.kubernetes.io/name: {{ include "reactive-interaction-gateway.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "reactive-interaction-gateway.selectorLabels" . | nindent 4 }}

deployment/helm2/reactive-interaction-gateway/values.yaml

@@ -38,9 +38,10 @@ deployment:
     DISCOVERY_TYPE: dns
     ## DNS_NAME is set dynamically
     ## NODE_HOST is set dynamically to PodIP in "templates/deployment.yaml"
-    # Change magiccookie to some individual hash
+    ## Change magiccookie to some individual hash
     NODE_COOKIE: magiccookie
 
+
     ## Kafka
     ## Setting "KAFKA_BROKERS" automatically enables usage of Kafka
     # KAFKA_BROKERS: localhost:9092

docs/rig-dev-guide.md

@@ -43,7 +43,7 @@ To have the project use a newer Elixir version, make sure to change the followin
 ## Releasing a new version
 
 - Increment `rig` version in the [version](../version) file
-- Increment `appVersion` in the [Helm v2 Chart.yaml](../deployment/helm2/reactive-interaction-gateway/Chart.yaml) and [Helm v3 Chart.yaml](../deployment/helm3/reactive-interaction-gateway/Chart.yaml) files
+- Increment `appVersion` in the [Helm 2 Chart.yaml](../deployment/helm2/reactive-interaction-gateway/Chart.yaml) and [Helm 3 Chart.yaml](../deployment/helm3/reactive-interaction-gateway/Chart.yaml) files
 - Increment image tag in the [Kubernetes rig.yaml](../deployment/kubectl/rig.yaml) file
 - In [CHANGELOG.md](../CHANGELOG.md), rename `[Unreleased]` and add a corresponding link to the bottom of the file
 - Create a signed Git tag either using `git -s` or by creating a release using the Github UI