update helm project factory

deploy-as-code/deployer/cmd/deploy.go

@@ -57,7 +57,7 @@ to quickly create a Cobra application.`,
 func init() {
 	// deployCmd.Flags().StringVarP(&images, "images", "i", "", "Images to be deployed")
 
-	deployCmd.Flags().String("helm-dir", "../../config-as-code", "Helm Charts / Configs directory")
+	deployCmd.Flags().String("helm-dir", "../../deploy-as-code/helm", "Helm Charts / Configs directory")
 	viper.BindPFlag("helm-dir", deployCmd.Flags().Lookup("helm-dir"))
 
 	deployCmd.Flags().StringVarP(&options.Environment, "environment", "e", "", "Environment override to be applied")

deploy-as-code/deployer/pkg/cmd/deployer/deployer.go

@@ -15,7 +15,7 @@ import (
 func DeployCharts(options Options) {
 
 	configDir, _ := filepath.Abs(options.ConfigDir)
-	var helmDir = configDir + "/helm"
+	var helmDir = configDir
 	log.Println(configDir)
 	log.Println("Helm Directory - " + helmDir)
 

deploy-as-code/helm/charts/backbone-services/elasticsearch-data-v1/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Confluent Kafka on Kubernetes
+name: elasticsearch-data
+version: 0.1.0

deploy-as-code/helm/charts/backbone-services/elasticsearch/templates/_helpers.tpl → deploy-as-code/helm/charts/backbone-services/elasticsearch-data-v1/templates/_helpers.tpl

@@ -8,6 +8,46 @@
 {{- end }}
 {{- end }}
 
+{{- define "elasticsearch.roles" -}}
+{{- range $.Values.roles -}}
+{{ . }},
+{{- end -}}
+{{- end -}}
+
+{{/*
+Generate certificates when the secret doesn't exist
+*/}}
+{{- define "elasticsearch.gen-certs" -}}
+{{- $certs := lookup "v1" "Secret" "es-cluster-v8" ( printf "%s-certs" (include "name" . ) ) -}}
+{{- if $certs -}}
+tls.crt: {{ index $certs.data "tls.crt" }}
+tls.key: {{ index $certs.data "tls.key" }}
+ca.crt: {{ index $certs.data "ca.crt" }}
+{{- else -}}
+{{- $altNames := list ( include "elasticsearch.masterService" . ) ( printf "%s.es-cluster-v8" (include "elasticsearch.masterService" .) ) ( printf "%s.es-cluster-v8.svc" (include "elasticsearch.masterService" .) ) -}}
+{{- $ca := genCA "elasticsearch-ca" 365 -}}
+{{- $cert := genSignedCert ( include "elasticsearch.masterService" . ) nil $altNames 365 $ca -}}
+tls.crt: {{ $cert.Cert | toString | b64enc }}
+tls.key: {{ $cert.Key | toString | b64enc }}
+ca.crt: {{ $ca.Cert | toString | b64enc }}
+{{- end -}}
+{{- end -}}
+
+{{- define "elasticsearch.masterService" -}}
+{{- if empty .Values.masterService -}}
+{{- if empty .Values.fullnameOverride -}}
+{{- if empty .Values.nameOverride -}}
+{{ .Values.clusterName }}-master
+{{- else -}}
+{{ .Values.nameOverride }}-master
+{{- end -}}
+{{- else -}}
+{{ .Values.fullnameOverride }}
+{{- end -}}
+{{- else -}}
+{{ .Values.masterService }}
+{{- end -}}
+{{- end -}}
 
 {{- define "elasticsearch.endpoints" -}}
 {{- $replicas := int (toString (.Values.replicas)) }}
@@ -25,7 +65,7 @@
   {{- if and (contains "docker.elastic.co/elasticsearch/elasticsearch" .Values.image.repository) (not (eq $version 0)) -}}
 {{ $version }}
   {{- else -}}
-7
+8
   {{- end -}}
 {{- end -}}
 {{- end -}}

deploy-as-code/helm/charts/backbone-services/elasticsearch/templates/poddisruptionbudget.yaml → deploy-as-code/helm/charts/backbone-services/elasticsearch-data-v1/templates/poddisruptionbudget.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.maxUnavailable }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: "{{ template "name" . }}-pdb"

deploy-as-code/helm/charts/backbone-services/elasticsearch-data-v1/templates/secret-cert.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.createCert }}
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ template "name" . }}-certs
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: "{{ template "name" . }}"
+    {{- range $key, $value := .Values.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+data:
+{{ ( include "elasticsearch.gen-certs" . ) | indent 2 }}
+{{- end }}

deploy-as-code/helm/charts/backbone-services/elasticsearch-data-v1/templates/secret.yaml

@@ -0,0 +1,21 @@
+{{- if .Values.secret.enabled -}}
+{{- $passwordValue := (randAlphaNum 24) | b64enc | quote }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "name" . }}-credentials
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: "{{ template "name" . }}"
+    {{- range $key, $value := .Values.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+type: Opaque
+data:
+  username: {{ "elastic" | b64enc }}
+  {{- if .Values.secret.password }}
+  password: {{ .Values.secret.password | b64enc }}
+  {{- else }}
+  password: {{ $passwordValue }}
+  {{- end }}
+{{- end }}