wip(charts): refactor simple deployment charts to used the common one #…

…281  [pack]

charts/k2/templates/deployment.yaml

@@ -37,6 +37,11 @@ spec:
               {{- if .Values.dataSubPath }}
               subPath: {{ include "common.tplvalues.render" ( dict "value" .Values.dataSubPath "context" $ ) }}
               {{- end }}
+          readinessProbe:
+            tcpSocket:
+              port: {{ include "common.names.name" . }}
+            initialDelaySeconds: 5
+            periodSeconds: 10              
           livenessProbe:
             httpGet:
               path: /healthcheck

charts/kapture/templates/deployment.yaml

@@ -1,39 +1 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels: {{- include "common.labels.standard" . | nindent 8 }}
-        {{- if .Values.commonLabels }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
-        {{- end }}
-    spec:
-      containers:
-        - name: {{ include "common.names.name" . }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            {{- include "common.environment.render" (dict "env" .Values.env "context" $) | indent 12 }}
-          ports:
-            - name: {{ include "common.names.name" . }}
-              containerPort: 3000
-          livenessProbe:
-            httpGet:
-              path: /healthcheck
-              port: {{ include "common.names.name" . }}
-            initialDelaySeconds: 30
-            periodSeconds: 15
-
+  {{- include "common.service" . }}

charts/kapture/values.yaml

@@ -24,6 +24,12 @@ service:
   port: 3000
   annotations: {}
 
+# containerPort is the port used by the the container
+containerPort: 3000
+
+# livenessEndpoint is the endpoint to check the pod liveness
+livenessEndpoint: /healthcheck
+
 env:
   # bodyLimit sets the size limit of the request body
   bodyLimit: "100kb"

charts/maputnik/values.yaml

@@ -31,4 +31,5 @@ ingress:
   enabled: true
   className: nginx
 
-
+# containerPort is the port used by the the container
+containerPort: 8088

charts/mongo-express/templates/deployment.yaml

@@ -1,38 +1 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels: {{- include "common.labels.standard" . | nindent 8 }}
-        {{- if .Values.commonLabels }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
-        {{- end }}
-    spec:
-      containers:
-        - name: {{ include "common.names.name" . }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            {{- include "common.environment.render" (dict "env" .Values.env "context" $) | indent 12 }}
-          ports:
-            - name: {{ include "common.names.name" . }}
-              containerPort: 8081           
-          livenessProbe:
-            httpGet:
-              path: /
-              port: {{ include "common.names.name" . }}
-            initialDelaySeconds: 30
-            periodSeconds: 15
+{{- include "common.deployment" . }}

charts/mongo-express/values.yaml

@@ -32,6 +32,9 @@ ingress:
   enabled: true
   className: nginx
 
+# containerPort is the port used by the the container
+containerPort: 8081
+
 env:
   # meConfigMongodbUrl specifies the mongodb connection string
   meConfigMongodbUrl:

charts/redis-commander/templates/deployment.yaml

@@ -1,38 +1 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels: {{- include "common.labels.standard" . | nindent 8 }}
-        {{- if .Values.commonLabels }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
-        {{- end }}
-    spec:
-      containers:
-        - name: {{ include "common.names.name" . }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            {{- include "common.environment.render" (dict "env" .Values.env "context" $) | indent 12 }}
-          ports:
-            - name: {{ include "common.names.name" . }}
-              containerPort: 8081           
-          livenessProbe:
-            httpGet:
-              path: /favicon.png
-              port: {{ include "common.names.name" . }}
-            initialDelaySeconds: 30
-            periodSeconds: 15
+{{- include "common.ingress" . }}

charts/redis-commander/values.yaml

@@ -25,13 +25,16 @@ image:
 service:
   enabled: true
   type: ClusterIP
-  port: 8081 # port on which we expose service
+  port: 8081 
   annotations: {}
 
 ingress:
   enabled: true
   className: nginx
 
+# containerPort is the port used by the the container
+containerPort: 8081
+
 env:
   # redisHosts specifies the redis connection string
   redisHosts: