Merge branch 'main' into fix-helm-chart

charts/microservice/Chart.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v2
 name: microservice
 description: A Helm chart for Kubernetes

charts/microservice/README.md

@@ -21,4 +21,19 @@ The Helm chart is specifically for deploying a microservice with a Kubernetes se
 
 ```bash
 helm install my-release microservice/
-```
+```
+
+## TODO
+
+- [ ] Application Health Probes
+- [ ] Service
+- [ ] Horizontal Pod Autoscaler
+- [ ] ConfigMap
+- [ ] RBAC 
+  - [ ] Service Account
+  - [ ] Role Binding
+  - [ ] Role
+- [ ] Rolling Deployment Manipulation
+- [ ] Environment Parmaters 
+- [ ] Container Port Mapping
+- [ ] Application Secrets

charts/microservice/templates/_helpers.tpl

@@ -0,0 +1,60 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Create  a defautl fully qualified app name
+It will use the release name to give the app name
+*/}}
+
+{{- define "app.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 60 | trimSuffix "-" }}
+{{- 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 "app.tempname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 60 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "app.fullname" -}}
+{{- printf "%s-%s" ( include "app.tempname" . ) "app" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "app.labels" -}}
+app: {{ include "app.tempname" . }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "app.selectorLabels" -}}
+app: {{ include "app.tempname" . }}
+{{- end }}%
+
+{{/*
+service name
+*/}}
+{{- define "app.servicename" -}}
+{{- printf "%s-%s" ( include "app.tempname" . ) "svc" | trunc 63 | trimSuffix "-" }}
+{{- end }}%
+
+{{/*
+configmap name
+*/}}
+{{- define "app.configmapname" -}}
+{{- printf "%s-%s" ( include "app.tempname" . ) "cm" | trunc 63 | trimSuffix "-" }}
+{{- end }}%

charts/microservice/templates/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "app.fullname" . }}-svc
+  name: {{ include "app.servicename" . }}
   labels:
     {{- include "app.labels" . | nindent 4 }}
 spec:
@@ -16,8 +17,5 @@ spec:
       port: {{ .Values.servicePorts.https }}
       targetPort: https
       protocol: TCP
-    - name: custom-port
-      port: {{ .Values.servicePorts.custom }}
-      targetPort: custom-port
-      protocol: TCP
-  type: {{ .Values.service.type }}
+  selector:
+    {{- include "app.selectorLabels" . | nindent 4 }}