Merge pull request '[DO-1377] start project' (#1) from feature/DO-1377/start into master

Reviewed-on: https://git.avroid.tech/Helm/openresty/pulls/1
Reviewed-by: Stanislav Gabenov <stanislav.gabenov@avroid.team>
Reviewed-by: Denis Patrakeev <denis.patrakeev@avroid.team>

.gitignore

@@ -0,0 +1,2 @@
+custom_values.yaml
+*.tgz

Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-name: myHelmChart
-description: A Helm chart for Kubernetes
+name: openresty
+description: OpenResty API gateway
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "1.21.4.1"

README.md

@@ -1,13 +1,25 @@
-# template-helm-chart-repository
+# OpenResty
 
-Template for helm chart repositories
-
-# How-to-use
-
-Create repository from template
-
-Replace all names of chart
+Создание пакета для Helm чарта
 
+```bash
+helm package  ./ 
 ```
-sed -i "s/myHelmChart/container-test-validation-server-chart/g"
+
+Добавление репозитория
+
+```bash
+helm repo add avroid https://nexus.avroid.tech/repository/devops-helm-release
+```
+
+Установка репозитория
+
+```bash
+helm install -n api-gateway -f custom_values.yaml  openresty ./
+```
+
+Обновления приложения
+
+```bash
+helm upgrade -n api-gateway -f custom_values.yaml  openresty ./
 ```

templates/NOTES.txt

@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "myHelmChart.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "openresty.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "myHelmChart.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "myHelmChart.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "openresty.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "openresty.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "myHelmChart.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "openresty.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT

templates/_helpers.tpl

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

templates/configmap.yaml

@@ -0,0 +1,22 @@
+{{ if .Values.configMap.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: "{{ template "openresty.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+{{- with .Values.configMap.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+  name: "{{ .Release.Name }}-config"
+data:
+{{- with .Values.configMap.apiConfig }}
+  api-gw.conf: {{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.configMap.luaScript }}
+  script.lua: {{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}

templates/deployment.yaml

@@ -1,24 +1,25 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "myHelmChart.fullname" . }}
+  name: {{ include "openresty.fullname" . }}
   labels:
-    {{- include "myHelmChart.labels" . | nindent 4 }}
+    {{- include "openresty.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "myHelmChart.selectorLabels" . | nindent 6 }}
+      {{- include "openresty.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml" ) . | sha256sum }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "myHelmChart.labels" . | nindent 8 }}
+        {{- include "openresty.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -27,7 +28,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "myHelmChart.serviceAccountName" . }}
+      serviceAccountName: {{ include "openresty.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

templates/hpa.yaml

@@ -2,14 +2,14 @@
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "myHelmChart.fullname" . }}
+  name: {{ include "openresty.fullname" . }}
   labels:
-    {{- include "myHelmChart.labels" . | nindent 4 }}
+    {{- include "openresty.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "myHelmChart.fullname" . }}
+    name: {{ include "openresty.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:

templates/ingress.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "myHelmChart.fullname" . -}}
+{{- $fullName := include "openresty.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
@@ -17,7 +17,7 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    {{- include "myHelmChart.labels" . | nindent 4 }}
+    {{- include "openresty.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

templates/service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "myHelmChart.fullname" . }}
+  name: {{ include "openresty.fullname" . }}
   labels:
-    {{- include "myHelmChart.labels" . | nindent 4 }}
+    {{- include "openresty.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "myHelmChart.selectorLabels" . | nindent 4 }}
+    {{- include "openresty.selectorLabels" . | nindent 4 }}

templates/serviceaccount.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "myHelmChart.serviceAccountName" . }}
+  name: {{ include "openresty.serviceAccountName" . }}
   labels:
-    {{- include "myHelmChart.labels" . | nindent 4 }}
+    {{- include "openresty.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

templates/tests/test-connection.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "myHelmChart.fullname" . }}-test-connection"
+  name: "{{ include "openresty.fullname" . }}-test-connection"
   labels:
-    {{- include "myHelmChart.labels" . | nindent 4 }}
+    {{- include "openresty.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
 spec:
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "myHelmChart.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "openresty.fullname" . }}:{{ .Values.service.port }}']
   restartPolicy: Never

values.yaml

@@ -1,14 +1,20 @@
-# Default values for myHelmChart.
+# Default values for openresty.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
 image:
-  repository: nginx
+  repository: harbor.avroid.tech/devops/openresty
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  tag: "1.21.4.1-0-alpine"
+
+configMap:
+  enabled: false
+  annotations: {}
+  apiConfig: ""
+  luaScript: ""
 
 imagePullSecrets: []
 nameOverride: ""
@@ -16,7 +22,7 @@ fullnameOverride: ""
 
 serviceAccount:
   # Specifies whether a service account should be created
-  create: true
+  create: false
   # Automatically mount a ServiceAccount's API credentials?
   automount: true
   # Annotations to add to the service account