Introduce ECK-managed resources Helm Charts

.gitignore

@@ -67,3 +67,6 @@ pkg/controller/common/license/zz_generated.pubkey.go
 
 # ignore validator for Jenkins pipelines
 hack/pipeline-validator/validator
+
+# ignore helm chart dependencies in eck-stack chart
+deploy/eck-stack/charts/*

Makefile

@@ -156,6 +156,9 @@ unit: clean
 unit-xml: clean
 	ECK_TEST_LOG_LEVEL=$(LOG_VERBOSITY) gotestsum --junitfile unit-tests.xml -- -cover ./pkg/... ./cmd/... $(TEST_OPTS)
 
+helm-test:
+	@hack/helm/test.sh
+
 integration: GO_TAGS += integration
 integration: clean generate-crds-v1
 	ECK_TEST_LOG_LEVEL=$(LOG_VERBOSITY) go test -tags='$(GO_TAGS)' ./pkg/... ./cmd/... -cover $(TEST_OPTS)
@@ -530,7 +533,7 @@ e2e-local: go-generate
 
 ci-check: check-license-header lint shellcheck generate check-local-changes check-predicates
 
-ci: unit-xml integration-xml docker-build reattach-pv
+ci: unit-xml integration-xml helm-test docker-build reattach-pv
 
 setup-e2e: e2e-compile run-deployer apply-psp e2e-docker-multiarch-build
 

deploy/eck-elasticsearch/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

deploy/eck-elasticsearch/Chart.yaml

@@ -0,0 +1,9 @@
+apiVersion: v2
+name: eck-elasticsearch
+description: A Helm chart to deploy Elasticsearch managed by the ECK Operator.
+type: application
+version: 0.1.0
+sources:
+  - https://github.com/elastic/cloud-on-k8s
+  - https://github.com/elastic/elasticsearch/
+icon: https://helm.elastic.co/icons/elasticsearch.png

deploy/eck-elasticsearch/templates/NOTES.txt

@@ -0,0 +1,9 @@
+
+1. Check Elasticsearch cluster status
+  $ kubectl get es --namespace={{ .Release.Namespace }} -L common.k8s.elastic.co/type=elasticsearch
+
+2. Check Elasticsearch pod status
+  $ kubectl get pods --namespace={{ .Release.Namespace }} -L common.k8s.elastic.co/type=elasticsearch
+
+3. Expose Elasticsearch service
+  $ kubectl port-forward svc/{{ .Values.name }}-es-http 9200

deploy/eck-elasticsearch/templates/_helpers.tpl

@@ -0,0 +1,51 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "elasticsearch.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | 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 "elasticsearch.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | 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 }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "elasticsearch.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "elasticsearch.labels" -}}
+helm.sh/chart: {{ include "elasticsearch.chart" . }}
+{{ include "elasticsearch.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "elasticsearch.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "elasticsearch.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}

deploy/eck-elasticsearch/templates/elasticsearch.yaml

@@ -0,0 +1,41 @@
+---
+apiVersion: elasticsearch.k8s.elastic.co/v1
+kind: Elasticsearch
+metadata:
+  name: {{ required "A name for the Elasticsearch instance is required" .Values.name }}
+  namespace: {{ .Release.Namespace }}
+  {{- if .Values.labels }}
+  labels:
+    {{- toYaml .Values.labels | indent 4 }}
+  {{- end }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{- toYaml .Values.annotations | indent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.updateStrategy }}
+  updateStrategy:
+    {{- toYaml .Values.updateStrategy | indent 4 }}
+  {{- end }}
+  {{- if .Values.secureSettings }}
+  secureSettings:
+    {{- toYaml .Values.secureSettings | indent 2 }}
+  {{- end }}
+  {{- if .Values.transport }}
+  transport:
+    {{- toYaml .Values.transport | indent 4 }}
+  {{- end }}
+  version: {{ required "An Elasticsearch version is required" .Values.version }}
+  {{- if .Values.monitoring }}
+  monitoring:
+    {{- toYaml .Values.monitoring | indent 4 }}
+  {{- end }}
+{{- if .Values.remoteClusters }}
+  remoteClusters:
+    {{- toYaml .Values.remoteClusters | indent 2 }}
+{{- end }}
+  {{- if eq (len .Values.nodeSets) 0 }}
+  {{ fail "At least one nodeSet is required" }}
+  {{- end }}
+  nodeSets:
+{{ toYaml .Values.nodeSets | indent 4 }}

deploy/eck-elasticsearch/values.yaml

@@ -0,0 +1,86 @@
+---
+# Default values for eck-elasticsearch.
+# This is a YAML-formatted file.
+
+# Name of the Elasticsearch instance.
+#
+name: "quickstart"
+
+# Version of Elasticsearch.
+#
+version: 8.2.3
+
+# Labels that will be applied to Elasticsearch.
+#
+labels: {}
+
+# Annotations that will be applied to Elasticsearch.
+#
+annotations: {}
+
+# Settings for configuring stack monitoring.
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-stack-monitoring.html
+#
+monitoring: {}
+
+# Control the Elasticsearch transport module used for internal communication between nodes.
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-transport-settings.html
+#
+transport: {}
+
+# Settings to control how Elasticsearch will be accessed.
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-accessing-elastic-services.html
+#
+http: {}
+
+# Control Elasticsearch Secure Settings.
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-es-secure-settings.html#k8s-es-secure-settings
+#
+secureSettings: {}
+
+# Settings for limiting the number of simultaneous changes to an Elasticsearch cluster.
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-update-strategy.html
+#
+# The default are the default settings for ECK.
+#
+updateStrategy: {}
+
+# Controlling of connectivity between remote clusters within the same kubernetes cluster.
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-remote-clusters.html
+#
+remoteClusters: {}
+
+# Node configuration settings.
+# The node roles which can be configured here are:
+# - "master"
+# - "data_hot"
+# - "data_cold"
+# - "data_frozen"
+# - "data_content"
+# - "ml"
+# - "ingest"
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-node-configuration.html
+#
+nodeSets:
+- name: default
+  count: 1
+  config:
+    node.store.allow_mmap: false
+  podTemplate:
+    spec:
+      containers:
+      - name: elasticsearch
+        resources:
+          requests:
+            cpu: 1
+          limits:
+            memory: 1Gi
+# Uncomment these lines in case you want to increase vm.max_map_count and/or use initContainers.
+# ref: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-virtual-memory.html
+#
+#        initContainers:
+#        - name: sysctl
+#          securityContext:
+#            privileged: true
+#            runAsUser: 0
+#          command: ['sh', '-c', 'sysctl -w vm.max_map_count=262144']

deploy/eck-kibana/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

deploy/eck-kibana/Chart.yaml

@@ -0,0 +1,9 @@
+apiVersion: v2
+name: eck-kibana
+description: A Helm chart to deploy Kibana managed by the ECK Operator.
+type: application
+version: 0.1.0
+sources:
+  - https://github.com/elastic/cloud-on-k8s
+  - https://github.com/elastic/kibana
+icon: https://helm.elastic.co/icons/kibana.png

deploy/eck-kibana/templates/NOTES.txt

@@ -0,0 +1,9 @@
+
+1. Check Kibana status
+  $ kubectl get kibana --namespace={{ .Release.Namespace }} -L common.k8s.elastic.co/type=kibana
+
+2. Check Kibana pod status
+  $ kubectl get pods --namespace={{ .Release.Namespace }} -L common.k8s.elastic.co/type=kibana
+
+3. Expose Kibana service
+  $ kubectl port-forward svc/{{ .Values.name }}-kb-http 9200

deploy/eck-kibana/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "kibana.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | 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 "kibana.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | 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 }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kibana.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "kibana.labels" -}}
+helm.sh/chart: {{ include "kibana.chart" . }}
+{{ include "kibana.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "kibana.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kibana.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "kibana.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "kibana.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

deploy/eck-kibana/templates/kibana.yaml

@@ -0,0 +1,22 @@
+---
+apiVersion: kibana.k8s.elastic.co/v1
+kind: Kibana
+metadata:
+  name: {{ required "A name for the Kibana instance is required" .Values.name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kibana.labels" . | nindent 4 }}
+    {{- range $key, $value := .Values.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  annotations:
+    {{- range $key, $value := .Values.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  version: {{ required "A Kibana version is required" .Values.version }}
+  {{- $finalSpec := .Values.spec }}
+  {{- if and .Values.spec.elasticsearchRef ( not .Values.spec.elasticsearchRef.namespace ) }}
+  {{- $finalSpec = mustMergeOverwrite (dict) .Values.spec (dict "elasticsearchRef" (dict "namespace" .Release.Namespace )) }}
+  {{- end }}
+  {{- toYaml $finalSpec | nindent 2 }}