Merge pull request #8 from TouchInstinct/abuntakov-patch-1

Update _helpers.tpl
2021-07-09 19:04:44 +03:00 · 2021-07-09 19:04:44 +03:00 · ba11d069e2
parent 93e3b5bf03 8e51fd1b0c
commit ba11d069e2
16 changed files with 528 additions and 35 deletions
--- a/starters/touchin-docs/templates/ingress.yaml
+++ b/starters/touchin-docs/templates/ingress.yaml
@ -2,7 +2,7 @@
 {{- $fullName := include "<CHARTNAME>.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 {{- else -}}
 apiVersion: extensions/v1beta1
 {{- end }}
--- a/starters/touchin-docs/values.yaml
+++ b/starters/touchin-docs/values.yaml
@ -49,20 +49,14 @@ service:
  port: 80

 ingress:
-  enabled: false
+  enabled: true
  annotations:
    kubernetes.io/ingress.class: "nginx"
-    kubernetes.io/tls-acme: "true"
+    cert-manager.io/issuer: "le-issuer"
    nginx.ingress.kubernetes.io/ssl-redirect: "true"
    nginx.ingress.kubernetes.io/rewrite-target: /
    nginx.ingress.kubernetes.io/proxy-body-size: "10m"
-  host: <CHARTNAME>.local
  path: /
-    # serviceName: <CHARTNAME>
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
--- a/starters/touchin-mock/.helmignore
+++ b/starters/touchin-mock/.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/
--- a/starters/touchin-mock/Chart.yaml
+++ b/starters/touchin-mock/Chart.yaml
@ -0,0 +1,24 @@
+apiVersion: v2
+name: <CHARTNAME>
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# 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.0.0"
--- a/starters/touchin-mock/templates/NOTES.txt
+++ b/starters/touchin-mock/templates/NOTES.txt
@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- 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 "<CHARTNAME>.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 the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "<CHARTNAME>.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "<CHARTNAME>.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 "<CHARTNAME>.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
+{{- end }}
--- a/starters/touchin-mock/templates/_helpers.tpl
+++ b/starters/touchin-mock/templates/_helpers.tpl
@ -0,0 +1,111 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "<CHARTNAME>.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 "<CHARTNAME>.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 "<CHARTNAME>.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "<CHARTNAME>.labels" -}}
+helm.sh/chart: {{ include "<CHARTNAME>.chart" . }}
+{{ include "<CHARTNAME>.selectorLabels" . }}
+{{ include "<CHARTNAME>.touchinLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "<CHARTNAME>.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.domain }}
+app.kubernetes.io/domain: {{ .Values.domain }}
+{{- end }}
+{{- if .Values.releaseName }}
+app.kubernetes.io/releaseName: {{ .Values.releaseName }}
+{{- end }}
+{{- if .Values.component }}
+app.kubernetes.io/component: {{ .Values.component }}
+{{- end }}
+{{- if and .Values.db .Values.db.platform }}
+app.kubernetes.io/database: {{ .Values.db.platform.name }}
+app.kubernetes.io/databaseVersion: {{ .Values.db.platform.version | quote }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "<CHARTNAME>.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "<CHARTNAME>.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create db environments
+*/}}
+{{- define "<CHARTNAME>.db.environments" -}}
+{{- if eq .Values.db.platform.name "postgres" }}
+- name: PGPASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: "postgres{{ .Values.db.platform.version }}-{{ .Release.Namespace }}"
+      key: postgresql-password
+- name: PGHOST
+  value: "postgres{{ .Values.db.platform.version }}-{{ .Release.Namespace }}"
+- name: PGUSER
+  value: "postgres"
+{{- end }}
+{{- end }}
+
+{{/*
+Get db name
+*/}}
+{{- define "<CHARTNAME>.db.name" -}}
+{{ .Values.db.name }}{{- if .Values.releaseName}}--{{ .Values.releaseName }}{{- end }}
+{{- end }}
+
+{{/*
+Touchin labels
+*/}}
+{{- define "<CHARTNAME>.touchinLabels" -}}
+{{- if .Values.origin.pullRequestNumber }}
+touchin.ru/origin: pr__{{ .Values.origin.pullRequestNumber }}
+{{- else if .Values.origin.releaseBranch }}
+touchin.ru/origin: release__{{ .Values.origin.releaseBranch }}
+{{- end }}
+{{- end }}
--- a/starters/touchin-mock/templates/deployment.yaml
+++ b/starters/touchin-mock/templates/deployment.yaml
@ -0,0 +1,106 @@
+{{- $dbName := include "<CHARTNAME>.db.name" . -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "<CHARTNAME>.fullname" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "<CHARTNAME>.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "<CHARTNAME>.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "<CHARTNAME>.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: "{{ .Chart.Name }}-info"
+          image: "busybox"
+          command:
+            - "sh"
+            - "-c"
+            - "echo hello"
+        {{- if and .Values.db .Values.db.create }}
+        - name: "{{ .Chart.Name }}-create-db"
+          image: {{ .Values.db.image }}
+          args:
+            - "create"
+            - "{{ $dbName }}"
+          env:
+            {{- include "<CHARTNAME>.db.environments" . | indent 12 }}
+        {{- end }}
+        {{- if and .Values.db .Values.db.copy }}
+        - name: "{{ .Chart.Name }}-copy-db"
+          image: {{ .Values.db.image }}
+          args:
+            - "copy"
+            - "{{ .Values.db.name }}"
+            - "{{ $dbName }}"
+          env:
+            {{- include "<CHARTNAME>.db.environments" . | indent 12 }}
+        {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: APP_PROFILE
+              value: "{{ .Values.profile }}"
+            - name: postgres__password
+              valueFrom:
+                secretKeyRef:
+                  name: "postgres12-{{ .Release.Namespace }}"
+                  key: postgresql-password
+            - name: postgres__host
+              value: "postgres12-{{ .Release.Namespace }}"
+            - name: postgres__database
+              value: "{{ .Values.db.name }}"
+            - name: postgres__user
+              value: "postgres"
+          ports:
+            - name: http
+              containerPort: {{ .Values.app.port }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: "{{ .Values.probe.path }}"
+              port: http
+            initialDelaySeconds: {{ .Values.probe.delay }}
+            periodSeconds: 60
+          readinessProbe:
+            httpGet:
+              path: "{{ .Values.probe.path }}"
+              port: http
+            initialDelaySeconds: {{ .Values.probe.delay }}
+            periodSeconds: 60
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
--- a/starters/touchin-mock/templates/hpa.yaml
+++ b/starters/touchin-mock/templates/hpa.yaml
@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "<CHARTNAME>.fullname" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "<CHARTNAME>.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
--- a/starters/touchin-mock/templates/ingress.yaml
+++ b/starters/touchin-mock/templates/ingress.yaml
@ -0,0 +1,40 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "<CHARTNAME>.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    - host: {{ .Values.ingress.host | quote }}
+      http:
+        paths:
+          - path: {{ .Values.ingress.path }}
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ or .Values.ingress.serviceName $fullName }}
+                port:
+                  number: {{ $svcPort }}
+  {{- end }}
--- a/starters/touchin-mock/templates/service.yaml
+++ b/starters/touchin-mock/templates/service.yaml
@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "<CHARTNAME>.fullname" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.app.port }}
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "<CHARTNAME>.selectorLabels" . | nindent 4 }}
--- a/starters/touchin-mock/templates/serviceaccount.yaml
+++ b/starters/touchin-mock/templates/serviceaccount.yaml
@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "<CHARTNAME>.serviceAccountName" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
--- a/starters/touchin-mock/values.yaml
+++ b/starters/touchin-mock/values.yaml
@ -0,0 +1,98 @@
+# Default values for <CHARTNAME>.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets:
+  - name: touchin-registry
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+db:
+  enabled: true
+  name: <CHARTNAME>
+  image: dhub.touchin.ru/common/db-init:postgres12
+  platform:
+    name: postgres
+    version: 12
+  create: true
+  copy: false
+
+app:
+  port: 8080
+
+origin:
+  releaseBranch: ""
+  pullRequestNumber: ""
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    cert-manager.io/issuer: "le-issuer"
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /
+    nginx.ingress.kubernetes.io/proxy-body-size: "10m"
+  path: /
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+probe:
+  path: "/api/health"
+  delay: 10
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
--- a/starters/touchin-server/templates/_helpers.tpl
+++ b/starters/touchin-server/templates/_helpers.tpl
@ -60,7 +60,7 @@ app.kubernetes.io/component: {{ .Values.component }}
 {{- end }}
 {{- if and .Values.db .Values.db.platform }}
 app.kubernetes.io/database: {{ .Values.db.platform.name }}
-app.kubernetes.io/database/version: {{ .Values.db.platform.version | quote }}
+app.kubernetes.io/databaseVersion: {{ .Values.db.platform.version | quote }}
 {{- end }}
 {{- end }}

@ -83,10 +83,10 @@ Create db environments
 - name: PGPASSWORD
  valueFrom:
    secretKeyRef:
-      name: "postgres{{ .Values.db.platform.version }}-postgresql"
-      key: postgres-password
+      name: "postgres{{ .Values.db.platform.version }}-{{ .Release.Namespace }}"
+      key: postgresql-password
 - name: PGHOST
-  value: "postgres{{ .Values.db.platform.version }}"
+  value: "postgres{{ .Values.db.platform.version }}-{{ .Release.Namespace }}"
 - name: PGUSER
  value: "postgres"
 {{- end }}
--- a/starters/touchin-server/templates/deployment.yaml
+++ b/starters/touchin-server/templates/deployment.yaml
@ -32,24 +32,25 @@ spec:
        - name: "{{ .Chart.Name }}-info"
          image: "busybox"
          command:
-            - 'echo hello'
+            - "sh"
+            - "-c"
+            - "echo hello"
        {{- if and .Values.db .Values.db.create }}
        - name: "{{ .Chart.Name }}-create-db"
          image: {{ .Values.db.image }}
-          command:
-            - "sh"
-            - "-c"
-            - "create {{ $dbName }}"
+          args:
+            - "create"
+            - "{{ $dbName }}"
          env:
            {{- include "<CHARTNAME>.db.environments" . | indent 12 }}
        {{- end }}
        {{- if and .Values.db .Values.db.copy }}
        - name: "{{ .Chart.Name }}-copy-db"
          image: {{ .Values.db.image }}
-          command:
-            - "sh"
-            - "-c"
-            - "copy {{ .Values.db.name }} {{ $dbName }}"
+          args:
+            - "copy"
+            - "{{ .Values.db.name }}"
+            - "{{ $dbName }}"
          env:
            {{- include "<CHARTNAME>.db.environments" . | indent 12 }}
        {{- end }}
@ -59,7 +60,24 @@ spec:
            {{- toYaml .Values.securityContext | nindent 12 }}
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env: []
+          env:
+            - name: JAVA_OPTS
+              value: "{{ .Values.app.javaOpts }}"
+            - name: APP_PROFILE
+              value: "{{ .Values.profile }}"
+            - name: spring_datasource_password
+              valueFrom:
+                secretKeyRef:
+                  name: "postgres12-{{ .Release.Namespace }}"
+                  key: postgresql-password
+            - name: spring_datasource_url
+              value: "jdbc:postgresql://postgres12-{{ .Release.Namespace }}:5432/{{ .Values.db.name }}"
+            - name: spring_datasource_username
+              value: "postgres"
+            - name: "management_metrics_export_elastic_enabled"
+              value: "{{ .Values.metrics.enabled }}"
+            - name: "management_metrics_export_elastic_host"
+              value: "{{ .Values.metrics.elasticSearchHost }}"
          ports:
            - name: http
              containerPort: {{ .Values.app.port }}
--- a/starters/touchin-server/templates/ingress.yaml
+++ b/starters/touchin-server/templates/ingress.yaml
@ -2,7 +2,7 @@
 {{- $fullName := include "<CHARTNAME>.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 {{- else -}}
 apiVersion: extensions/v1beta1
 {{- end }}
@ -31,7 +31,10 @@ spec:
      http:
        paths:
          - path: {{ .Values.ingress.path }}
+            pathType: Prefix
            backend:
-              serviceName: {{ or .Values.ingress.serviceName $fullName }}
-              servicePort: {{ $svcPort }}
+              service:
+                name: {{ or .Values.ingress.serviceName $fullName }}
+                port:
+                  number: {{ $svcPort }}
  {{- end }}
--- a/starters/touchin-server/values.yaml
+++ b/starters/touchin-server/values.yaml
@ -40,7 +40,7 @@ securityContext: {}
 db:
  enabled: true
  name: <CHARTNAME>
-  image: dhub.touchin.ru/touchin/db-init
+  image: dhub.touchin.ru/common/db-init:postgres12
  platform:
    name: postgres
    version: 12
@ -49,6 +49,11 @@ db:

 app:
  port: 8080
+  javaOpts: "-Xmx256m"
+
+metrics:
+  enabled: true
+  elasticSearchHost: http://app.elastic.ti:9200

 origin:
  releaseBranch: ""
@ -59,20 +64,14 @@ service:
  port: 80

 ingress:
-  enabled: false
+  enabled: true
  annotations:
    kubernetes.io/ingress.class: "nginx"
-    kubernetes.io/tls-acme: "true"
+    cert-manager.io/issuer: "le-issuer"
    nginx.ingress.kubernetes.io/ssl-redirect: "true"
    nginx.ingress.kubernetes.io/rewrite-target: /
    nginx.ingress.kubernetes.io/proxy-body-size: "10m"
-  host: <CHARTNAME>.local
  path: /
-    # serviceName: <CHARTNAME>
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious