From b25dd3cbb0331e04177285ca22d4ec9fdc1bf408 Mon Sep 17 00:00:00 2001 From: kamal-devtron <128121299+kamal-devtron@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:22:30 +0530 Subject: [PATCH] Charts hotfix (#1992) * Synced all chart changes * Updated VPA in sts chart * chnages in sts SM --- .../templates/ambassador.yaml | 13 +- .../templates/configmap.yaml | 7 +- .../templates/deployment.yaml | 611 ++++++++++++++++++ .../templates/externalsecrets.yaml | 14 +- .../templates/hpa.yaml | 91 ++- .../templates/ingress.yaml | 11 + .../templates/keda-autoscaling.yaml | 16 +- .../templates/poddisruptionbudget.yaml | 10 + .../templates/pre-sync-job.yaml | 6 + .../templates/prometheusrules.yaml | 15 +- .../templates/secret.yaml | 19 +- .../templates/service.yaml | 8 + .../templates/serviceaccount.yaml | 7 +- .../templates/servicemonitor.yaml | 68 +- .../templates/winter-soldier.yaml | 4 + .../deployment-chart_4-20-0/test_values.yaml | 15 +- .../deployment-chart_4-20-0/values.yaml | 16 +- .../templates/ambassador.yaml | 10 +- .../templates/configmap.yaml | 7 +- .../templates/externalsecrets.yaml | 14 +- .../reference-chart_4-20-0/templates/hpa.yaml | 7 +- .../templates/ingress.yaml | 11 + .../templates/keda-autoscaling.yaml | 28 + .../templates/poddisruptionbudget.yaml | 10 + .../templates/pre-sync-job.yaml | 6 + .../templates/prometheusrules.yaml | 15 +- .../templates/secret.yaml | 19 +- .../templates/service.yaml | 8 + .../templates/serviceaccount.yaml | 7 +- .../templates/servicemonitor.yaml | 68 +- .../templates/winter-soldier.yaml | 4 + .../statefulset-chart_5-1-0/app-values.yaml | 12 +- .../templates/_helpers.tpl | 8 + .../templates/externalsecrets.yaml | 9 + .../templates/hpa.yaml | 22 + .../templates/keda-autoscaling.yaml | 11 + .../templates/service.yaml | 18 +- .../templates/servicemonitor.yaml | 2 +- .../templates/statefulset.yaml | 132 +++- .../templates/vertical-pod-autoscaler.yaml | 27 + .../statefulset-chart_5-1-0/values.yaml | 13 +- 41 files changed, 1361 insertions(+), 38 deletions(-) create mode 100644 scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/vertical-pod-autoscaler.yaml diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ambassador.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ambassador.yaml index 5875da84ba..9d4a431c26 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ambassador.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ambassador.yaml @@ -5,10 +5,16 @@ apiVersion: getambassador.io/v3alpha1 kind: Mapping metadata: - name: {{ include ".Chart.Name .fullname" $ }}-mapping + {{- if .name }} + name: {{ .name }} + {{- else }} + name: {{ include ".Chart.Name .fullname" $ }}-mapping + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} chart: {{ template ".Chart.Name .chart" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} release: {{ $.Release.Name }} releaseVersion: {{ $.Values.releaseVersion | quote }} pipelineName: {{ $.Values.pipelineName }} @@ -57,6 +63,8 @@ kind: TLSContext metadata: name: {{ .tls.context }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} app: {{ template ".Chart.Name .name" $ }} chart: {{ template ".Chart.Name .chart" $ }} release: {{ $.Release.Name }} @@ -65,6 +73,9 @@ metadata: {{- if .tls.labels }} {{ toYaml .tls.labels | nindent 4 }} {{- end }} +{{- if $.Values.appLabels }} +{{ toYaml $.Values.appLabels | indent 4 }} +{{- end }} spec: {{- if .tls.secretName }} secret: {{ .tls.secretName }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/configmap.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/configmap.yaml index 72d5ca8479..4e7879665e 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/configmap.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/configmap.yaml @@ -6,8 +6,13 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .name}}-{{ $.Values.app }} -{{- if $.Values.appLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} data: diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/deployment.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/deployment.yaml index 558890a329..95f796b339 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/deployment.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/deployment.yaml @@ -636,3 +636,614 @@ spec: {{- if eq .Values.deploymentType "RECREATE" }} type: "Recreate" {{- end }} +{{- if $.Values.secondaryWorkload.enabled }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include ".Chart.Name .fullname" $ }}-{{ $.Values.secondaryWorkload.postfix | default "sec" }} + labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + releaseVersion: {{ $.Values.releaseVersion | quote }} + pipelineName: {{ .Values.pipelineName }} +{{- if .Values.deploymentLabels }} +{{ toYaml .Values.deploymentLabels | indent 4 }} +{{- end }} +{{- if .Values.appLabels }} +{{ toYaml .Values.appLabels | indent 4 }} +{{- end }} + +{{- if .Values.deploymentAnnotations }} + annotations: +{{ toYaml .Values.deploymentAnnotations | indent 4 }} +{{- end }} +spec: + selector: + matchLabels: +{{- if .Values.customMatchLabels }} +{{ toYaml .Values.customMatchLabels | indent 6 }} +{{- end }} + app: {{ template ".Chart.Name .name" $ }} + release: {{ $.Release.Name }} + replicas: {{ $.Values.secondaryWorkload.replicaCount | default 1 }} + minReadySeconds: {{ $.Values.MinReadySeconds }} + template: + metadata: + {{- if .Values.podAnnotations }} + annotations: + {{- range $key, $value := .Values.podAnnotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} + labels: + app: {{ template ".Chart.Name .name" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + release: {{ $.Release.Name }} +{{- if .Values.customPodLabels }} +{{ toYaml .Values.customPodLabels | indent 8 }} +{{- end }} +{{- if .Values.appLabels }} +{{ toYaml .Values.appLabels | indent 8 }} +{{- end }} +{{- if .Values.podLabels }} +{{ toYaml .Values.podLabels | indent 8 }} +{{- end }} + spec: +{{- if $.Values.podExtraSpecs }} +{{ toYaml .Values.podExtraSpecs | indent 6 }} +{{- end }} + terminationGracePeriodSeconds: {{ $.Values.GracePeriod }} + restartPolicy: Always +{{- if $.Values.hostAliases }} + hostAliases: +{{ toYaml .Values.hostAliases | indent 8 }} +{{- end }} +{{- with $.Values.secondaryWorkload }} +{{- if and .Spec.Affinity.Key .Spec.Affinity.Values }} + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: {{ .Spec.Affinity.Key }} + operator: In + values: + - {{ .Spec.Affinity.Values | default "nodes" }} +{{- else if .affinity.enabled }} + affinity: +{{ toYaml .affinity.values | indent 8 }} +{{- end }} +{{- end }} +{{- if $.Values.serviceAccountName }} + serviceAccountName: {{ $.Values.serviceAccountName }} +{{- else }} + serviceAccountName: {{ template "serviceAccountName" . }} +{{- end }} +{{- if $.Values.schedulerName }} + schedulerName: {{ .Values.schedulerName }} +{{- end }} + {{- if $.Values.secondaryWorkload.tolerations }} + tolerations: +{{ toYaml $.Values.secondaryWorkload.tolerations | indent 8 }} + {{- end }} +{{- if $.Values.imagePullSecrets}} + imagePullSecrets: + {{- range .Values.imagePullSecrets }} + - name: {{ . }} + {{- end }} +{{- end}} +{{- if $.Values.topologySpreadConstraints }} + topologySpreadConstraints: +{{- range $.Values.topologySpreadConstraints }} + - maxSkew: {{ .maxSkew }} + topologyKey: {{ .topologyKey }} + whenUnsatisfiable: {{ .whenUnsatisfiable }} + {{- if semverCompare "<=1.30-0" $.Capabilities.KubeVersion.GitVersion }} + {{- if .minDomains }} + minDomains: {{ .minDomains }} + {{- end }} + {{- end }} + {{- if .nodeAffinityPolicy }} + nodeAffinityPolicy: {{ .nodeAffinityPolicy }} + {{- end }} + {{- if .nodeTaintsPolicy }} + nodeTaintsPolicy: {{ .nodeTaintsPolicy }} + {{- end }} + labelSelector: + matchLabels: + {{- if and .autoLabelSelector .customLabelSelector }} +{{ toYaml .customLabelSelector | indent 12 }} + {{- else if .autoLabelSelector }} + app: {{ template ".Chart.Name .name" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + release: {{ $.Release.Name }} + {{- else if .customLabelSelector }} +{{ toYaml .customLabelSelector | indent 12 }} + {{- end }} +{{- end }} +{{- end }} +{{- if $.Values.topologySpreadConstraint }} + topologySpreadConstraints: +{{ toYaml .Values.topologySpreadConstraint }} +{{- end }} +{{- if $.Values.podSecurityContext }} + securityContext: +{{ toYaml .Values.podSecurityContext | indent 8 }} +{{- end }} +{{- if $.Values.restartPolicy }} + restartPolicy: {{ $.Values.restartPolicy }} +{{- end }} +{{- if $.Values.initContainers}} + initContainers: +{{- range $i, $c := .Values.initContainers }} +{{- if .reuseContainerImage}} + - name: {{ $.Chart.Name }}-init-{{ add1 $i }} + image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}" + imagePullPolicy: {{ $.Values.image.pullPolicy }} +{{- if .securityContext }} + securityContext: +{{ toYaml .securityContext | indent 12 }} +{{- end }} +{{- if .command}} + command: +{{ toYaml .command | indent 12 -}} +{{- end}} +{{- if .args}} + args: +{{ toYaml .args | indent 12 -}} +{{- end}} +{{- if .resources}} + resources: +{{ toYaml .resources | indent 12 -}} +{{- end}} +{{- if .volumeMounts}} + volumeMounts: +{{ toYaml .volumeMounts | indent 12 -}} +{{- end}} +{{- else}} + - +{{ toYaml . | indent 10 }} +{{- end}} +{{- end}} +{{- end}} + containers: + - name: {{ $.Chart.Name }} + image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}" + imagePullPolicy: {{ $.Values.image.pullPolicy }} + {{- if $.Values.containerSpec.lifecycle.enabled }} + lifecycle: + {{- if $.Values.containerSpec.lifecycle.preStop }} + preStop: +{{ toYaml $.Values.containerSpec.lifecycle.preStop | indent 12 -}} + {{- end }} + {{- if $.Values.containerSpec.lifecycle.postStart }} + postStart: +{{ toYaml $.Values.containerSpec.lifecycle.postStart | indent 12 -}} + {{- end }} + {{- end }} +{{- if and $.Values.containerSecurityContext $.Values.privileged }} + securityContext: + privileged: true +{{ toYaml .Values.containerSecurityContext | indent 12 }} +{{- else if $.Values.privileged }} + securityContext: + privileged: true +{{- else if $.Values.containerSecurityContext }} + securityContext: +{{ toYaml .Values.containerSecurityContext | indent 12 }} +{{- end }} +{{- if $.Values.containerExtraSpecs }} +{{ toYaml .Values.containerExtraSpecs | indent 10 }} +{{- end }} +{{- if $.Values.resizePolicy }} + resizePolicy: +{{ toYaml .Values.resizePolicy | indent 12 }} +{{- end }} + ports: + {{- range $.Values.ContainerPort }} + - name: {{ .name}} + containerPort: {{ .port }} + protocol: {{ .protocol }} + {{- end}} +{{- if and $.Values.command.enabled $.Values.command.workingDir }} + workingDir: {{ $.Values.command.workingDir }} +{{- end}} +{{- if and $.Values.command.value $.Values.command.enabled}} + command: +{{ toYaml $.Values.command.value | indent 12 -}} +{{- end}} +{{- if and $.Values.args.value $.Values.args.enabled}} + args: +{{ toYaml $.Values.args.value | indent 12 -}} +{{- end }} + env: + - name: CONFIG_HASH + value: {{ include (print $.Chart.Name "/templates/configmap.yaml") . | sha256sum }}{{ if and (.Values.devtronInternal) (.Values.devtronInternal.containerSpecs.ConfigHash) }}{{ .Values.devtronInternal.containerSpecs.ConfigHash }}{{ end }} + - name: SECRET_HASH + value: {{ include (print $.Chart.Name "/templates/secret.yaml") . | sha256sum }}{{ if and (.Values.devtronInternal) (.Values.devtronInternal.containerSpecs.SecretHash) }}{{ .Values.devtronInternal.containerSpecs.SecretHash }}{{ end }} + - name: DEVTRON_APP_NAME + value: {{ template ".Chart.Name .name" $ }} + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: DEVTRON_CONTAINER_REPO + value: "{{ .Values.server.deployment.image }}" + - name: DEVTRON_CONTAINER_TAG + value: "{{ .Values.server.deployment.image_tag }}" + {{- range $.Values.EnvVariablesFromFieldPath }} + - name: {{ .name }} + valueFrom: + fieldRef: + fieldPath: {{ .fieldPath }} + {{- end}} + {{- range $.Values.EnvVariables }} + {{- if and .name .value }} + - name: {{ .name }} + value: {{ .value | quote }} + {{- end }} + {{- end }} + {{- range $.Values.EnvVariablesFromSecretKeys }} + {{- if and .name .secretName .keyName }} + - name: {{ .name }} + valueFrom: + secretKeyRef: + name: {{ .secretName }} + key: {{ .keyName }} + {{- end }} + {{- end }} + {{- range $.Values.EnvVariablesFromConfigMapKeys }} + {{- if and .name .configMapName .keyName }} + - name: {{ .name }} + valueFrom: + configMapKeyRef: + name: {{ .configMapName }} + key: {{ .keyName }} + {{- end }} + {{- end }} + {{- if or (and ($hasCMEnvExists) (.Values.ConfigMaps.enabled)) (and ($hasSecretEnvExists) (.Values.ConfigSecrets.enabled)) }} + envFrom: + {{- if .Values.ConfigMaps.enabled }} + {{- range .Values.ConfigMaps.maps }} + {{- if eq .type "environment" }} + - configMapRef: + {{- if eq .external true }} + name: {{ .name }} + {{- else if eq .external false }} + name: {{ .name}}-{{ $.Values.app }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if .Values.ConfigSecrets.enabled }} + {{- range .Values.ConfigSecrets.secrets }} + {{- if eq .type "environment" }} + - secretRef: + {{if eq .external true}} + name: {{ .name }} + {{else if eq .external false}} + name: {{ .name}}-{{ $.Values.app }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + +{{- if or $.Values.LivenessProbe.Path $.Values.LivenessProbe.command $.Values.LivenessProbe.tcp $.Values.LivenessProbe.grpc }} + livenessProbe: +{{- if $.Values.LivenessProbe.Path }} + httpGet: + path: {{ $.Values.LivenessProbe.Path }} + port: {{ $.Values.LivenessProbe.port }} + scheme: {{ $.Values.LivenessProbe.scheme }} + {{- if $.Values.LivenessProbe.httpHeaders }} + httpHeaders: + {{- range $.Values.LivenessProbe.httpHeaders}} + - name: {{.name}} + value: {{.value}} + {{- end}} + {{- end }} +{{- end }} +{{- if $.Values.LivenessProbe.command }} + exec: + command: +{{ toYaml .Values.LivenessProbe.command | indent 16 }} +{{- end}} +{{- if and $.Values.LivenessProbe.tcp }} + tcpSocket: + port: {{ $.Values.LivenessProbe.port }} +{{- end}} + initialDelaySeconds: {{ $.Values.LivenessProbe.initialDelaySeconds }} + periodSeconds: {{ $.Values.LivenessProbe.periodSeconds }} + successThreshold: {{ $.Values.LivenessProbe.successThreshold }} + timeoutSeconds: {{ $.Values.LivenessProbe.timeoutSeconds }} + failureThreshold: {{ $.Values.LivenessProbe.failureThreshold }} + {{- if $.Values.LivenessProbe.grpc }} + grpc: +{{ toYaml .Values.LivenessProbe.grpc | indent 14 }} + {{- end }} +{{- end }} +{{- if or $.Values.ReadinessProbe.Path $.Values.ReadinessProbe.command $.Values.ReadinessProbe.tcp $.Values.ReadinessProbe.grpc }} + readinessProbe: +{{- if $.Values.ReadinessProbe.Path }} + httpGet: + path: {{ $.Values.ReadinessProbe.Path }} + port: {{ $.Values.ReadinessProbe.port }} + scheme: {{ $.Values.ReadinessProbe.scheme }} + {{- if $.Values.ReadinessProbe.httpHeaders }} + httpHeaders: + {{- range $.Values.ReadinessProbe.httpHeaders}} + - name: {{.name}} + value: {{.value}} + {{- end}} + {{- end }} +{{- end }} +{{- if $.Values.ReadinessProbe.command }} + exec: + command: +{{ toYaml .Values.ReadinessProbe.command | indent 16 }} +{{- end}} +{{- if and $.Values.ReadinessProbe.tcp }} + tcpSocket: + port: {{ $.Values.ReadinessProbe.port }} +{{- end}} + initialDelaySeconds: {{ $.Values.ReadinessProbe.initialDelaySeconds }} + periodSeconds: {{ $.Values.ReadinessProbe.periodSeconds }} + successThreshold: {{ $.Values.ReadinessProbe.successThreshold }} + timeoutSeconds: {{ $.Values.ReadinessProbe.timeoutSeconds }} + failureThreshold: {{ $.Values.ReadinessProbe.failureThreshold }} + {{- if $.Values.ReadinessProbe.grpc }} + grpc: +{{ toYaml .Values.ReadinessProbe.grpc | indent 14 }} + {{- end}} +{{- end }} + resources: +{{ toYaml $.Values.resources | trim | indent 12 }} +{{- if or $.Values.StartupProbe.Path $.Values.StartupProbe.command $.Values.StartupProbe.tcp $.Values.StartupProbe.grpc }} + startupProbe: +{{- if $.Values.StartupProbe.Path }} + httpGet: + path: {{ $.Values.StartupProbe.Path }} + port: {{ $.Values.StartupProbe.port }} + {{- if $.Values.StartupProbe.httpHeaders }} + httpHeaders: + {{- range $.Values.StartupProbe.httpHeaders}} + - name: {{.name}} + value: {{.value}} + {{- end}} + {{- end }} +{{- end }} +{{- if $.Values.StartupProbe.command }} + exec: + command: +{{ toYaml .Values.StartupProbe.command | indent 16 }} +{{- end}} +{{- if and $.Values.StartupProbe.tcp }} + tcpSocket: + port: {{ $.Values.StartupProbe.port }} +{{- end}} + initialDelaySeconds: {{ $.Values.StartupProbe.initialDelaySeconds }} + periodSeconds: {{ $.Values.StartupProbe.periodSeconds }} + successThreshold: {{ $.Values.StartupProbe.successThreshold }} + timeoutSeconds: {{ $.Values.StartupProbe.timeoutSeconds }} + failureThreshold: {{ $.Values.StartupProbe.failureThreshold }} + {{- if $.Values.StartupProbe.grpc }} + grpc: +{{ toYaml .Values.StartupProbe.grpc | indent 14 }} + {{- end}} +{{- end }} + volumeMounts: +{{- with .Values.volumeMounts }} +{{ toYaml . | trim | indent 12 }} +{{- end }} +{{- if $.Values.persistentVolumeClaim.name }} + - name: {{ .Values.persistentVolumeClaim.name }}-vol + mountPath: {{ .Values.persistentVolumeClaim.mountPath | default "/tmp" }} +{{- end}} + {{- if .Values.ConfigMaps.enabled }} + {{- range .Values.ConfigMaps.maps }} + {{- if eq .type "volume"}} + {{- $cmName := .name -}} + {{- $cmMountPath := .mountPath -}} + {{- if eq .subPath false }} + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath }} + + {{- else }} + {{- range $k, $v := .data }} + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath }}/{{ $k}} + subPath: {{ $k}} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + + {{- if .Values.ConfigSecrets.enabled }} + {{- range .Values.ConfigSecrets.secrets }} + {{- if eq .type "volume"}} + {{- $cmName := .name -}} + {{- $cmMountPath := .mountPath -}} + {{- if eq .subPath false }} + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath }} + + {{- else }} + {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} + {{- if and (.esoSubPath) (ne (len .esoSubPath) 0) }} + {{- range .esoSubPath }} + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath}}/{{ . }} + subPath: {{ . }} + {{- end }} + {{- else }} + {{- range .esoSecretData.esoData }} + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath}}/{{ .secretKey }} + subPath: {{ .secretKey }} + {{- end }} + {{- end }} + {{- else }} + {{- range $k, $v := .data }} # for others secrets the mount path will be .data[i].secretKey + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath}}/{{ $k}} + subPath: {{ $k}} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }} + {{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }} +{{- if $.Values.appMetrics }} + - name: envoy + image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}} + {{- if $.Values.envoyproxy.lifecycle }} + lifecycle: +{{ toYaml .Values.envoyproxy.lifecycle | indent 12 -}} + {{- else if $.Values.containerSpec.lifecycle.enabled }} + lifecycle: + {{- if $.Values.containerSpec.lifecycle.preStop }} + preStop: +{{ toYaml $.Values.containerSpec.lifecycle.preStop | indent 12 -}} + {{- end }} + {{- end }} + resources: +{{ toYaml $.Values.envoyproxy.resources | trim | indent 12 }} + ports: + - containerPort: 9901 + protocol: TCP + name: envoy-admin + {{- range $index, $element := .Values.ContainerPort }} + - name: {{ $element.name}} + containerPort: {{ $element.envoyPort | default (add 8790 $index) }} + protocol: TCP + {{- end }} + command: ["/usr/local/bin/envoy"] + args: ["-c", "/etc/envoy-config/envoy-config.json", "-l", "info", "--log-format", "[METADATA][%Y-%m-%d %T.%e][%t][%l][%n] %v"] + volumeMounts: + - name: {{ $.Values.envoyproxy.configMapName | default "envoy-config-volume" }} + mountPath: /etc/envoy-config/ +{{- if $.Values.envoyproxy.readinessProbe}} + readinessProbe: +{{ toYaml $.Values.envoyproxy.readinessProbe | indent 12}} +{{- end }} +{{- if $.Values.envoyproxy.livenessProbe}} + livenessProbe: +{{ toYaml $.Values.envoyproxy.livenessProbe | indent 12}} +{{- end }} +{{- end}} +{{- if $.Values.containers }} +{{- range $i, $c := .Values.containers }} +{{- if .reuseContainerImage}} + - name: {{ $.Chart.Name }}-sidecontainer-{{ add1 $i }} + image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}" + imagePullPolicy: {{ $.Values.image.pullPolicy }} +{{- if .env }} + env: +{{ toYaml .env | indent 12 }} +{{- end }} + {{- if .envFrom }} + envFrom: +{{ toYaml .env | indent 12 }} +{{- end }} +{{- if .securityContext }} + securityContext: +{{ toYaml .securityContext | indent 12 }} +{{- end }} +{{- if .command}} + command: +{{ toYaml .command | indent 12 -}} +{{- end}} +{{- if .resizePolicy }} + resizePolicy: +{{ toYaml .resziePolicy | indent 12}} +{{- end }} +{{- if .resources}} + resources: +{{ toYaml .resources | indent 12 -}} +{{- end}} +{{- if .volumeMounts}} + volumeMounts: +{{ toYaml .volumeMounts | indent 12 -}} +{{- end}} +{{- else}} + - +{{ toYaml . | indent 10 }} +{{- end}} +{{- end}} +{{- end}} + + + volumes: + {{- if $.Values.appMetrics }} + - name: envoy-config-volume + configMap: + name: sidecar-config-{{ template ".Chart.Name .name" $ }} + {{- end }} +{{- with .Values.volumes }} +{{ toYaml . | trim | indent 8 }} +{{- end }} +{{- if .Values.persistentVolumeClaim.name }} + - name: {{.Values.persistentVolumeClaim.name}}-vol + persistentVolumeClaim: + claimName: {{.Values.persistentVolumeClaim.name }} +{{- end}} + {{- if .Values.ConfigMaps.enabled }} + {{- range .Values.ConfigMaps.maps }} + {{- if eq .type "volume"}} + - name: {{ .name | replace "." "-"}}-vol + configMap: + {{- if eq .external true }} + name: {{ .name }} + {{- else if eq .external false }} + name: {{ .name}}-{{ $.Values.app }} + {{- end }} + {{- if eq (len .filePermission) 0 }} + {{- else }} + defaultMode: {{ .filePermission}} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + + {{- if .Values.ConfigSecrets.enabled }} + {{- range .Values.ConfigSecrets.secrets }} + {{- if eq .type "volume"}} + - name: {{ .name | replace "." "-"}}-vol + secret: + {{- if eq .external true }} + secretName: {{ .name }} + {{- else if eq .external false }} + secretName: {{ .name}}-{{ $.Values.app }} + {{- end }} + {{- if eq (len .filePermission) 0 }} + {{- else }} + defaultMode: {{ .filePermission}} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }} + {{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }} + + revisionHistoryLimit: 3 +## pauseForSecondsBeforeSwitchActive: {{ $.Values.pauseForSecondsBeforeSwitchActive }} +# waitForSecondsBeforeScalingDown: {{ $.Values.waitForSecondsBeforeScalingDown }} + strategy: + {{- if eq .Values.deploymentType "ROLLING" }} + type: "RollingUpdate" + rollingUpdate: + maxSurge: {{ $.Values.deployment.strategy.rolling.maxSurge }} + maxUnavailable: {{ $.Values.deployment.strategy.rolling.maxUnavailable }} + {{- end }} + {{- if eq .Values.deploymentType "RECREATE" }} + type: "Recreate" + {{- end }} +{{- end }} \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml index ea0ee9f5dc..efd291af5d 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml @@ -8,8 +8,13 @@ apiVersion: external-secrets.io/v1beta1 kind: SecretStore metadata: name: {{ .name}} -{{- if $.Values.appLabels }} labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} spec: @@ -21,8 +26,13 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: name: {{ .name }} -{{- if $.Values.appLabels }} labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} spec: diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/hpa.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/hpa.yaml index cad686a0f1..91553a09f5 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/hpa.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/hpa.yaml @@ -13,8 +13,13 @@ metadata: annotations: {{ toYaml .Values.autoscaling.annotations | indent 4 }} {{- end }} - {{- if .Values.autoscaling.labels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + {{- if .Values.autoscaling.labels }} {{ toYaml .Values.autoscaling.labels | indent 4 }} {{- end }} spec: @@ -79,3 +84,87 @@ spec: {{- toYaml $.Values.autoscaling.behavior | nindent 4 }} {{- end }} {{- end }} +{{- if and $.Values.secondaryWorkload.enabled $.Values.secondaryWorkload.autoscaling.enabled }} +--- +{{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion }} +apiVersion: autoscaling/v2 +{{- else if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }} +apiVersion: autoscaling/v2beta2 +{{- else }} +apiVersion: autoscaling/v2beta1 +{{- end }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ template ".Chart.Name .fullname" $ }}-{{ $.Values.secondaryWorkload.postfix | default "sec" }}-hpa + {{- if .Values.autoscaling.annotations }} + annotations: +{{ toYaml .Values.autoscaling.annotations | indent 4 }} + {{- end }} + {{- if .Values.autoscaling.labels }} + labels: +{{ toYaml .Values.autoscaling.labels | indent 4 }} + {{- end }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include ".Chart.Name .fullname" $ }}-{{ $.Values.secondaryWorkload.postfix | default "sec" }} + {{- with $.Values.secondaryWorkload }} + minReplicas: {{ .autoscaling.MinReplicas }} + maxReplicas: {{ .autoscaling.MaxReplicas }} + metrics: + {{- if .autoscaling.containerResource.enabled }} + {{- with .autoscaling.containerResource }} + {{- if .TargetCPUUtilizationPercentage }} + - type: ContainerResource + containerResource: + name: cpu + container: {{ $.Chart.Name }} + target: + type: Utilization + averageUtilization: {{ .TargetCPUUtilizationPercentage }} + {{- end}} + {{- if .TargetMemoryUtilizationPercentage }} + - type: ContainerResource + containerResource: + name: memory + container: {{ $.Chart.Name }} + target: + type: Utilization + averageUtilization: {{ .TargetMemoryUtilizationPercentage }} + {{- end}} + {{- end }} + {{- end }} + {{- if .autoscaling.TargetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + {{- if semverCompare ">=1.16-0" $.Capabilities.KubeVersion.GitVersion }} + target: + type: Utilization + averageUtilization: {{ .autoscaling.TargetMemoryUtilizationPercentage }} + {{- else }} + targetAverageUtilization: {{ .autoscaling.TargetMemoryUtilizationPercentage }} + {{- end }} + {{- end }} + {{- if .autoscaling.TargetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + {{- if semverCompare ">=1.16-0" $.Capabilities.KubeVersion.GitVersion }} + target: + type: Utilization + averageUtilization: {{ .autoscaling.TargetCPUUtilizationPercentage }} + {{- else }} + targetAverageUtilization: {{ .autoscaling.TargetCPUUtilizationPercentage }} + {{- end }} + {{- end }} + {{- if and .autoscaling.extraMetrics (semverCompare ">=1.16-0" $.Capabilities.KubeVersion.GitVersion) }} + {{- toYaml .autoscaling.extraMetrics | nindent 2 }} + {{- end}} + {{- if and .autoscaling.behavior (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + behavior: + {{- toYaml .autoscaling.behavior | nindent 4 }} + {{- end }} + {{- end }} + {{- end }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ingress.yaml index 3a4921f69d..d9a2543e98 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ingress.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ingress.yaml @@ -21,7 +21,11 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: + {{- if $.Values.ingress.name }} + name: {{ $.Values.ingress.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" . }}-ingress + {{- end }} namespace: {{ $.Values.NameSpace }} labels: app: {{ template ".Chart.Name .name" . }} @@ -107,7 +111,11 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: + {{- if $.Values.ingressInternal.name }} + name: {{ $.Values.ingressInternal.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" . }}-ingress-internal + {{- end }} namespace: {{ $.Values.NameSpace }} labels: app: {{ template ".Chart.Name .name" . }} @@ -115,6 +123,9 @@ metadata: envId: {{ $.Values.env | quote }} chart: {{ template ".Chart.Name .chart" . }} release: {{ .Release.Name }} +{{- if .Values.appLabels }} +{{ toYaml .Values.appLabels | indent 4 }} +{{- end }} {{- if .Values.ingressInternal.annotations }} annotations: {{ toYaml .Values.ingressInternal.annotations | indent 4 }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/keda-autoscaling.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/keda-autoscaling.yaml index f92af5924d..371363ab1a 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/keda-autoscaling.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/keda-autoscaling.yaml @@ -2,12 +2,17 @@ apiVersion: keda.sh/v1alpha1 kind: ScaledObject metadata: + {{- if $.Values.kedaAutoscaling.name }} + name: {{ $.Values.kedaAutoscaling.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" $ }}-keda + {{- end }} labels: - app: {{ template ".Chart.Name .name" . }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} appId: {{ $.Values.app | quote }} envId: {{ $.Values.env | quote }} - chart: {{ template ".Chart.Name .chart" . }} release: {{ .Release.Name }} {{- if .Values.appLabels }} {{ toYaml .Values.appLabels | indent 4 }} @@ -58,6 +63,13 @@ apiVersion: keda.sh/v1alpha1 kind: TriggerAuthentication metadata: name: {{ $.Values.kedaAutoscaling.triggerAuthentication.name }} + labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + spec: {{ toYaml $.Values.kedaAutoscaling.triggerAuthentication.spec | indent 2 }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/poddisruptionbudget.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/poddisruptionbudget.yaml index c9cbb4162d..2736332531 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/poddisruptionbudget.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/poddisruptionbudget.yaml @@ -6,11 +6,17 @@ apiVersion: policy/v1beta1 {{- end }} kind: PodDisruptionBudget metadata: + {{- if .Values.podDisruptionBudget.name }} + name: {{ .Values.podDisruptionBudget.name }} + {{- else }} name: {{ include ".Chart.Name .fullname" $ }} + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} appId: {{ $.Values.app | quote }} envId: {{ $.Values.env | quote }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} spec: {{- if .Values.podDisruptionBudget.minAvailable }} minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} @@ -20,6 +26,10 @@ spec: {{- end }} selector: matchLabels: + {{- if .Values.customPodLabels }} +{{ toYaml .Values.customPodLabels | indent 6 }} + {{- else }} appId: {{ $.Values.app | quote }} envId: {{ $.Values.env | quote }} + {{- end }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/pre-sync-job.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/pre-sync-job.yaml index cd733d4857..54c9f636ee 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/pre-sync-job.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/pre-sync-job.yaml @@ -4,6 +4,12 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ template ".Chart.Name .fullname" $ }}-migrator + labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} annotations: argocd.argoproj.io/hook: PreSync # argocd.argoproj.io/hook-delete-policy: HookSucceeded diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/prometheusrules.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/prometheusrules.yaml index 90f398bff4..c285de1388 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/prometheusrules.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/prometheusrules.yaml @@ -2,13 +2,20 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template ".Chart.Name .fullname" . }} + {{- if .Values.prometheusRule.name }} + name: {{ .Values.prometheusRule.name }} + {{- else }} + name: {{ template ".Chart.Name .fullname" . }} + {{- end }} {{- if .Values.prometheusRule.namespace }} namespace: {{ .Values.prometheusRule.namespace }} {{- end }} labels: kind: Prometheus - chart: {{ template ".Chart.Name .chart" . }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} release: {{ .Values.prometheus.release }} {{- if .Values.prometheusRule.additionalLabels }} {{ toYaml .Values.prometheusRule.additionalLabels | indent 4 }} @@ -16,7 +23,11 @@ metadata: spec: {{- with .Values.prometheusRule.rules }} groups: + {{- if $.Values.prometheusRule.name }} + - name: {{ $.Values.prometheusRule.name }} + {{- else }} - name: {{ template ".Chart.Name .fullname" $ }} + {{- end }} rules: {{- toYaml . | nindent 6 }} {{- end }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/secret.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/secret.yaml index 26a17b968c..5ac3ae1410 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/secret.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/secret.yaml @@ -4,8 +4,13 @@ apiVersion: v1 kind: Secret metadata: name: app-secret -{{- if $.Values.appLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} type: Opaque @@ -22,8 +27,13 @@ apiVersion: v1 kind: Secret metadata: name: {{ .name}}-{{ $.Values.app }} -{{- if $.Values.appLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + release: {{ $.Release.Name }} + chart: {{ template ".Chart.Name .chart" $ }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} type: Opaque @@ -39,6 +49,11 @@ metadata: name: {{ .name}} {{- if $.Values.appLabels }} labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} spec: diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml index 03bbbc7c95..17c96b2ec7 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml @@ -47,7 +47,11 @@ spec: name: envoy-admin {{- end }} selector: + {{- if .Values.customPodLabels }} +{{ toYaml .Values.customPodLabels | indent 4 }} + {{- else }} app: {{ template ".Chart.Name .name" . }} + {{- end }} {{- if .Values.service.sessionAffinity.enabled }} sessionAffinity: ClientIP {{- end }} @@ -85,6 +89,10 @@ spec: name: envoy-admin {{- end }} selector: + {{- if .Values.customPodLabels }} +{{ toYaml .Values.customPodLabels | indent 4 }} + {{- else }} app: {{ template ".Chart.Name .name" . }} + {{- end }} {{- end }} {{- end }} \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/serviceaccount.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/serviceaccount.yaml index ac258610fa..f337548e94 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/serviceaccount.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/serviceaccount.yaml @@ -4,8 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "serviceAccountName" . }} - {{- if .Values.podLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} +{{- if .Values.podLabels }} {{ toYaml .Values.podLabels | indent 4 }} {{- end }} {{- if .Values.serviceAccount.annotations }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/servicemonitor.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/servicemonitor.yaml index 1f90c722cb..3cdacf236d 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/servicemonitor.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/servicemonitor.yaml @@ -4,7 +4,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: + {{- if .Values.servicemonitor.name }} + name: {{ .Values.servicemonitor.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" . }}-sm + {{- end }} labels: kind: Prometheus app: {{ template ".Chart.Name .name" . }} @@ -20,8 +24,50 @@ spec: {{- range .Values.ContainerPort }} {{- if .servicemonitor }} {{- if .servicemonitor.enabled}} - {{- if .servicePort }} + {{- if .servicemonitor.targetPort }} + - targetPort: {{ .servicemonitor.targetPort }} + {{- else if .servicePort }} - port: {{ .name }} + {{- end }} + {{- if .servicemonitor.path }} + path: {{ .servicemonitor.path}} + {{- end }} + {{- if .servicemonitor.scheme }} + scheme: {{ .servicemonitor.scheme}} + {{- end }} + {{- if .servicemonitor.interval }} + interval: {{ .servicemonitor.interval}} + {{- end }} + {{- if .servicemonitor.scrapeTimeout }} + scrapeTimeout: {{ .servicemonitor.scrapeTimeout | quote }} + {{- end }} + {{- if .servicemonitor.basicAuth }} + basicAuth: + {{- toYaml .servicemonitor.basicAuth | nindent 8 }} + {{- end }} + {{- if .servicemonitor.insecureTLS }} + tlsConfig: + insecureSkipVerify: true + {{- else if .servicemonitor.tlsConfig }} + tlsConfig: + {{- toYaml .servicemonitor.tlsConfig | nindent 8 }} + {{- end }} + {{- if .servicemonitor.metricRelabelings}} + metricRelabelings: +{{toYaml .servicemonitor.metricRelabelings | indent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- range .Values.containers }} + {{- range .ports }} + {{- if .servicemonitor }} + {{- if .servicemonitor.enabled}} + {{- if .servicemonitor.targetPort }} + - targetPort: {{ .servicemonitor.targetPort }} + {{- else if .servicePort }} + - port: {{ .name }} + {{- end }} {{- if .servicemonitor.path }} path: {{ .servicemonitor.path}} {{- end }} @@ -34,6 +80,17 @@ spec: {{- if .servicemonitor.scrapeTimeout }} scrapeTimeout: {{ .servicemonitor.scrapeTimeout}} {{- end }} + {{- if .servicemonitor.basicAuth }} + basicAuth: + {{- toYaml .servicemonitor.basicAuth | nindent 8 }} + {{- end }} + {{- if .servicemonitor.insecureTLS }} + tlsConfig: + insecureSkipVerify: true + {{- else if .servicemonitor.tlsConfig }} + tlsConfig: + {{- toYaml .servicemonitor.tlsConfig | nindent 8 }} + {{- end }} {{- if .servicemonitor.metricRelabelings}} metricRelabelings: {{toYaml .servicemonitor.metricRelabelings | indent 8 }} @@ -42,7 +99,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if .Values.servicemonitor.namespaceSelector }} + namespaceSelector: + matchNames: + {{- toYaml .Values.servicemonitor.namespaceSelector | nindent 6 }} + {{- end }} selector: matchLabels: + {{- if .Values.servicemonitor.matchLabels }} + {{- toYaml .Values.servicemonitor.matchLabels | nindent 6 }} + {{- else }} app: {{ template ".Chart.Name .name" $ }} {{- end }} +{{- end }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/winter-soldier.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/winter-soldier.yaml index b09b2533c0..314f0c6db0 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/winter-soldier.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/winter-soldier.yaml @@ -2,7 +2,11 @@ apiVersion: {{ $.Values.winterSoldier.apiVersion }} kind: Hibernator metadata: + {{- if .Values.winterSoldier.name }} + name: {{ .Values.winterSoldier.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" $ }}-hibernator + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} appId: {{ $.Values.app | quote }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml index 78df2f3141..dd0395f97f 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml @@ -763,4 +763,17 @@ affinity: operator: In values: - S1 - topologyKey: topology.kubernetes.io/zone \ No newline at end of file + topologyKey: topology.kubernetes.io/zone + +secondaryWorkload: + enabled: true + postfix: "od" + replicaCount: 1 + affinity: {} + tolerations: [] + autoscaling: + enabled: true + MinReplicas: 1 + MaxReplicas: 2 + TargetCPUUtilizationPercentage: 90 + TargetMemoryUtilizationPercentage: 80 \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/values.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/values.yaml index c5dd74b354..2d5215d050 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/values.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/values.yaml @@ -719,4 +719,18 @@ imagePullSecrets: [] persistentVolumeClaim: {} verticalPodScaling: - enabled: false \ No newline at end of file + enabled: false + +secondaryWorkload: + enabled: false + Spec: + Affinity: + Key: "" + Values: "" + replicaCount: 1 + affinity: {} + tolerations: [] + autoscaling: + enabled: false + containerResource: + enabled: false \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ambassador.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ambassador.yaml index 7c374a70e8..9d4a431c26 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ambassador.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ambassador.yaml @@ -5,10 +5,16 @@ apiVersion: getambassador.io/v3alpha1 kind: Mapping metadata: - name: {{ include ".Chart.Name .fullname" $ }}-mapping + {{- if .name }} + name: {{ .name }} + {{- else }} + name: {{ include ".Chart.Name .fullname" $ }}-mapping + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} chart: {{ template ".Chart.Name .chart" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} release: {{ $.Release.Name }} releaseVersion: {{ $.Values.releaseVersion | quote }} pipelineName: {{ $.Values.pipelineName }} @@ -57,6 +63,8 @@ kind: TLSContext metadata: name: {{ .tls.context }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} app: {{ template ".Chart.Name .name" $ }} chart: {{ template ".Chart.Name .chart" $ }} release: {{ $.Release.Name }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/configmap.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/configmap.yaml index 72d5ca8479..4e7879665e 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/configmap.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/configmap.yaml @@ -6,8 +6,13 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .name}}-{{ $.Values.app }} -{{- if $.Values.appLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} data: diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/externalsecrets.yaml index ea0ee9f5dc..efd291af5d 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/externalsecrets.yaml @@ -8,8 +8,13 @@ apiVersion: external-secrets.io/v1beta1 kind: SecretStore metadata: name: {{ .name}} -{{- if $.Values.appLabels }} labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} spec: @@ -21,8 +26,13 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: name: {{ .name }} -{{- if $.Values.appLabels }} labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} spec: diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/hpa.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/hpa.yaml index 8f424d15fd..c7ba46e15b 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/hpa.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/hpa.yaml @@ -13,8 +13,13 @@ metadata: annotations: {{ toYaml .Values.autoscaling.annotations | indent 4 }} {{- end }} - {{- if .Values.autoscaling.labels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + {{- if .Values.autoscaling.labels }} {{ toYaml .Values.autoscaling.labels | indent 4 }} {{- end }} spec: diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ingress.yaml index 1f231966b1..021d061b73 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ingress.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/ingress.yaml @@ -21,7 +21,11 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: + {{- if $.Values.ingress.name }} + name: {{ $.Values.ingress.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" . }}-ingress + {{- end }} namespace: {{ $.Values.NameSpace }} labels: app: {{ template ".Chart.Name .name" . }} @@ -106,7 +110,11 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: + {{- if $.Values.ingressInternal.name }} + name: {{ $.Values.ingressInternal.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" . }}-ingress-internal + {{- end }} namespace: {{ $.Values.NameSpace }} labels: app: {{ template ".Chart.Name .name" . }} @@ -114,6 +122,9 @@ metadata: envId: {{ $.Values.env | quote }} chart: {{ template ".Chart.Name .chart" . }} release: {{ .Release.Name }} +{{- if .Values.appLabels }} +{{ toYaml .Values.appLabels | indent 4 }} +{{- end }} {{- if .Values.ingressInternal.annotations }} annotations: {{ toYaml .Values.ingressInternal.annotations | indent 4 }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/keda-autoscaling.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/keda-autoscaling.yaml index 8c703a5647..faf89be125 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/keda-autoscaling.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/keda-autoscaling.yaml @@ -2,7 +2,28 @@ apiVersion: keda.sh/v1alpha1 kind: ScaledObject metadata: + {{- if $.Values.kedaAutoscaling.name }} + name: {{ $.Values.kedaAutoscaling.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" $ }}-keda + {{- end }} + labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + release: {{ .Release.Name }} + {{- if .Values.appLabels }} +{{ toYaml .Values.appLabels | indent 4 }} + {{- end }} + {{- if .Values.kedaAutoscaling.labels }} +{{ toYaml .Values.kedaAutoscaling.labels | indent 4 }} + {{- end }} + {{- if .Values.kedaAutoscaling.annotations }} + annotations: +{{ toYaml .Values.kedaAutoscaling.annotations | indent 4 }} + {{- end }} spec: scaleTargetRef: apiVersion: argoproj.io/v1alpha1 @@ -42,6 +63,13 @@ apiVersion: keda.sh/v1alpha1 kind: TriggerAuthentication metadata: name: {{ $.Values.kedaAutoscaling.triggerAuthentication.name }} + labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + spec: {{ toYaml $.Values.kedaAutoscaling.triggerAuthentication.spec | indent 2 }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/poddisruptionbudget.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/poddisruptionbudget.yaml index c9cbb4162d..2736332531 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/poddisruptionbudget.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/poddisruptionbudget.yaml @@ -6,11 +6,17 @@ apiVersion: policy/v1beta1 {{- end }} kind: PodDisruptionBudget metadata: + {{- if .Values.podDisruptionBudget.name }} + name: {{ .Values.podDisruptionBudget.name }} + {{- else }} name: {{ include ".Chart.Name .fullname" $ }} + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} appId: {{ $.Values.app | quote }} envId: {{ $.Values.env | quote }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} spec: {{- if .Values.podDisruptionBudget.minAvailable }} minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} @@ -20,6 +26,10 @@ spec: {{- end }} selector: matchLabels: + {{- if .Values.customPodLabels }} +{{ toYaml .Values.customPodLabels | indent 6 }} + {{- else }} appId: {{ $.Values.app | quote }} envId: {{ $.Values.env | quote }} + {{- end }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/pre-sync-job.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/pre-sync-job.yaml index cd733d4857..54c9f636ee 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/pre-sync-job.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/pre-sync-job.yaml @@ -4,6 +4,12 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ template ".Chart.Name .fullname" $ }}-migrator + labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} annotations: argocd.argoproj.io/hook: PreSync # argocd.argoproj.io/hook-delete-policy: HookSucceeded diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/prometheusrules.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/prometheusrules.yaml index 90f398bff4..c285de1388 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/prometheusrules.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/prometheusrules.yaml @@ -2,13 +2,20 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template ".Chart.Name .fullname" . }} + {{- if .Values.prometheusRule.name }} + name: {{ .Values.prometheusRule.name }} + {{- else }} + name: {{ template ".Chart.Name .fullname" . }} + {{- end }} {{- if .Values.prometheusRule.namespace }} namespace: {{ .Values.prometheusRule.namespace }} {{- end }} labels: kind: Prometheus - chart: {{ template ".Chart.Name .chart" . }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} release: {{ .Values.prometheus.release }} {{- if .Values.prometheusRule.additionalLabels }} {{ toYaml .Values.prometheusRule.additionalLabels | indent 4 }} @@ -16,7 +23,11 @@ metadata: spec: {{- with .Values.prometheusRule.rules }} groups: + {{- if $.Values.prometheusRule.name }} + - name: {{ $.Values.prometheusRule.name }} + {{- else }} - name: {{ template ".Chart.Name .fullname" $ }} + {{- end }} rules: {{- toYaml . | nindent 6 }} {{- end }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/secret.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/secret.yaml index 26a17b968c..5ac3ae1410 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/secret.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/secret.yaml @@ -4,8 +4,13 @@ apiVersion: v1 kind: Secret metadata: name: app-secret -{{- if $.Values.appLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} type: Opaque @@ -22,8 +27,13 @@ apiVersion: v1 kind: Secret metadata: name: {{ .name}}-{{ $.Values.app }} -{{- if $.Values.appLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + release: {{ $.Release.Name }} + chart: {{ template ".Chart.Name .chart" $ }} +{{- if $.Values.appLabels }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} type: Opaque @@ -39,6 +49,11 @@ metadata: name: {{ .name}} {{- if $.Values.appLabels }} labels: + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} {{ toYaml $.Values.appLabels | indent 4 }} {{- end }} spec: diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/service.yaml index f943af00ae..ac9f9bb2c7 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/service.yaml @@ -47,7 +47,11 @@ spec: name: envoy-admin {{- end }} selector: + {{- if .Values.customPodLabels }} +{{ toYaml .Values.customPodLabels | indent 4 }} + {{- else }} app: {{ template ".Chart.Name .name" . }} + {{- end }} {{- if .Values.service.sessionAffinity.enabled }} sessionAffinity: ClientIP {{- end }} @@ -88,6 +92,10 @@ spec: name: envoy-admin {{- end }} selector: + {{- if .Values.customPodLabels }} +{{ toYaml .Values.customPodLabels | indent 4 }} + {{- else }} app: {{ template ".Chart.Name .name" . }} + {{- end }} {{- end }} {{- end }} \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/serviceaccount.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/serviceaccount.yaml index ac258610fa..f337548e94 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/serviceaccount.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/serviceaccount.yaml @@ -4,8 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "serviceAccountName" . }} - {{- if .Values.podLabels }} labels: + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + app: {{ template ".Chart.Name .name" $ }} + chart: {{ template ".Chart.Name .chart" $ }} + release: {{ $.Release.Name }} +{{- if .Values.podLabels }} {{ toYaml .Values.podLabels | indent 4 }} {{- end }} {{- if .Values.serviceAccount.annotations }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/servicemonitor.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/servicemonitor.yaml index 1f90c722cb..1e9e092ca5 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/servicemonitor.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/servicemonitor.yaml @@ -4,7 +4,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: + {{- if .Values.servicemonitor.name }} + name: {{ .Values.servicemonitor.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" . }}-sm + {{- end }} labels: kind: Prometheus app: {{ template ".Chart.Name .name" . }} @@ -20,8 +24,50 @@ spec: {{- range .Values.ContainerPort }} {{- if .servicemonitor }} {{- if .servicemonitor.enabled}} - {{- if .servicePort }} + {{- if .servicemonitor.targetPort }} + - targetPort: {{ .servicemonitor.targetPort }} + {{- else if .servicePort }} - port: {{ .name }} + {{- end }} + {{- if .servicemonitor.path }} + path: {{ .servicemonitor.path}} + {{- end }} + {{- if .servicemonitor.scheme }} + scheme: {{ .servicemonitor.scheme}} + {{- end }} + {{- if .servicemonitor.interval }} + interval: {{ .servicemonitor.interval}} + {{- end }} + {{- if .servicemonitor.scrapeTimeout }} + scrapeTimeout: {{ .servicemonitor.scrapeTimeout | quote }} + {{- end }} + {{- if .servicemonitor.basicAuth }} + basicAuth: + {{- toYaml .servicemonitor.basicAuth | nindent 8 }} + {{- end }} + {{- if .servicemonitor.insecureTLS }} + tlsConfig: + insecureSkipVerify: true + {{- else if .servicemonitor.tlsConfig }} + tlsConfig: + {{- toYaml .servicemonitor.tlsConfig | nindent 8 }} + {{- end }} + {{- if .servicemonitor.metricRelabelings}} + metricRelabelings: +{{toYaml .servicemonitor.metricRelabelings | indent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- range .Values.containers }} + {{- range .ports }} + {{- if .servicemonitor }} + {{- if .servicemonitor.enabled}} + {{- if .servicemonitor.targetPort }} + - targetPort: {{ .servicemonitor.targetPort }} + {{- else if .servicePort }} + - port: {{ .name }} + {{- end }} {{- if .servicemonitor.path }} path: {{ .servicemonitor.path}} {{- end }} @@ -34,6 +80,17 @@ spec: {{- if .servicemonitor.scrapeTimeout }} scrapeTimeout: {{ .servicemonitor.scrapeTimeout}} {{- end }} + {{- if .servicemonitor.basicAuth }} + basicAuth: + {{- toYaml .servicemonitor.basicAuth | nindent 8 }} + {{- end }} + {{- if .servicemonitor.insecureTLS }} + tlsConfig: + insecureSkipVerify: true + {{- else if .servicemonitor.tlsConfig }} + tlsConfig: + {{- toYaml .servicemonitor.tlsConfig | nindent 8 }} + {{- end }} {{- if .servicemonitor.metricRelabelings}} metricRelabelings: {{toYaml .servicemonitor.metricRelabelings | indent 8 }} @@ -42,7 +99,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if .Values.servicemonitor.namespaceSelector }} + namespaceSelector: + matchNames: + {{- toYaml .Values.servicemonitor.namespaceSelector | nindent 6 }} + {{- end }} selector: matchLabels: + {{- if .Values.servicemonitor.matchLabels }} + {{- toYaml .Values.servicemonitor.matchLabels | nindent 6 }} + {{- else }} app: {{ template ".Chart.Name .name" $ }} + {{- end }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/winter-soldier.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/winter-soldier.yaml index 2d3e7bae0f..5ac2fd8443 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/winter-soldier.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/winter-soldier.yaml @@ -2,7 +2,11 @@ apiVersion: {{ $.Values.winterSoldier.apiVersion }} kind: Hibernator metadata: + {{- if .Values.winterSoldier.name }} + name: {{ .Values.winterSoldier.name }} + {{- else }} name: {{ template ".Chart.Name .fullname" $ }}-hibernator + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} appId: {{ $.Values.app | quote }} diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/app-values.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/app-values.yaml index 1b1912aa68..ffbe895ffd 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/app-values.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/app-values.yaml @@ -234,6 +234,9 @@ Spec: Key: # Key: kops.k8s.io/instancegroup Values: +affinity: + enabled: false + values: {} ambassadorMapping: enabled: false @@ -259,6 +262,10 @@ autoscaling: annotations: {} labels: {} behavior: {} + containerResource: + enabled: false + TargetCPUUtilizationPercentage: 90 + TargetMemoryUtilizationPercentage: 80 # scaleDown: # stabilizationWindowSeconds: 300 # policies: @@ -311,7 +318,7 @@ servicemonitor: additionalLabels: {} envoyproxy: - image: quay.io/devtron/envoy:v1.14.1 + image: quay.io/devtron/envoy:v1.16.0 configMapName: "" lifecycle: {} resources: @@ -386,3 +393,6 @@ hostAliases: [] # hostnames: # - "foo.remote" # - "bar.remote" + +verticalPodScaling: + enabled: false \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/_helpers.tpl b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/_helpers.tpl index efbdad6de4..75ceac27e9 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/_helpers.tpl +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/_helpers.tpl @@ -60,6 +60,14 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} +{{- define "VerticalPodAutoScalingEnabled" -}} + {{- $SMenabled := false -}} + {{- if and .Values.verticalPodScaling.enabled }} + {{- $SMenabled = true -}} + {{- end }} + {{- $SMenabled -}} +{{- end -}} + {{/* Create chart name and version as used by the chart label. */}} diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml index 129278add1..efd291af5d 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml @@ -51,7 +51,15 @@ spec: {{- end }} target: name: {{ .name}} + {{- if .esoSecretData.template }} + template: + {{- toYaml .esoSecretData.template | nindent 6 }} + {{- end }} creationPolicy: Owner + {{- if .esoSecretData.esoDataFrom }} + dataFrom: + {{- toYaml .esoSecretData.esoDataFrom | nindent 4 }} + {{- else }} data: {{- range .esoSecretData.esoData }} - secretKey: {{ .secretKey }} @@ -64,4 +72,5 @@ spec: {{- end}} {{- end}} {{- end}} +{{- end}} {{- end}} \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/hpa.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/hpa.yaml index a1fecd0cc3..bfe8efe8ae 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/hpa.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/hpa.yaml @@ -38,6 +38,28 @@ spec: minReplicas: {{ $.Values.autoscaling.MinReplicas }} maxReplicas: {{ $.Values.autoscaling.MaxReplicas }} metrics: + {{- if $.Values.autoscaling.containerResource.enabled }} + {{- with $.Values.autoscaling.containerResource }} + {{- if .TargetCPUUtilizationPercentage }} + - type: ContainerResource + containerResource: + name: cpu + container: {{ $.Chart.Name }} + target: + type: Utilization + averageUtilization: {{ .TargetCPUUtilizationPercentage }} + {{- end}} + {{- if .TargetMemoryUtilizationPercentage }} + - type: ContainerResource + containerResource: + name: memory + container: {{ $.Chart.Name }} + target: + type: Utilization + averageUtilization: {{ .TargetMemoryUtilizationPercentage }} + {{- end}} + {{- end }} + {{- end }} {{- if $.Values.autoscaling.TargetMemoryUtilizationPercentage }} - type: Resource resource: diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/keda-autoscaling.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/keda-autoscaling.yaml index b0e804f591..db5b1cf81b 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/keda-autoscaling.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/keda-autoscaling.yaml @@ -13,6 +13,17 @@ metadata: release: {{ $.Release.Name }} appId: {{ $.Values.app | quote }} envId: {{ $.Values.env | quote }} + release: {{ .Release.Name }} + {{- if .Values.appLabels }} +{{ toYaml .Values.appLabels | indent 4 }} + {{- end }} + {{- if .Values.kedaAutoscaling.labels }} +{{ toYaml .Values.kedaAutoscaling.labels | indent 4 }} + {{- end }} + {{- if .Values.kedaAutoscaling.annotations }} + annotations: +{{ toYaml .Values.kedaAutoscaling.annotations | indent 4 }} + {{- end }} spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml index 8890359e31..5900bf8890 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml @@ -43,7 +43,7 @@ spec: {{- if (and (eq $.Values.service.type "NodePort") .nodePort )}} nodePort: {{ .nodePort }} {{- end }} - protocol: TCP + protocol: {{ .protocol }} name: {{ .name }} {{- end }} {{- if $.Values.appMetrics }} @@ -56,6 +56,13 @@ spec: {{- else }} app: {{ template ".Chart.Name .name" . }} {{- end }} +{{- if .Values.service.sessionAffinity.enabled }} + sessionAffinity: ClientIP +{{- end }} +{{- if .Values.service.sessionAffinityConfig }} + sessionAffinityConfig: +{{ toYaml .Values.service.sessionAffinityConfig | indent 4 }} +{{- end }} {{- end }} --- {{- if or .Values.service.enabled .Values.serviceheadless.enabled }} @@ -114,6 +121,13 @@ spec: {{- else }} app: {{ template ".Chart.Name .name" . }} {{- end }} +{{- if .Values.serviceheadless.sessionAffinity.enabled }} + sessionAffinity: ClientIP +{{- end }} +{{- if .Values.serviceheadless.sessionAffinityConfig }} + sessionAffinityConfig: +{{ toYaml .Values.serviceheadless.sessionAffinityConfig | indent 4 }} +{{- end }} type: ClusterIP {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}} loadBalancerSourceRanges: @@ -121,4 +135,4 @@ spec: - {{ . }} {{- end }} {{- end }} -{{- end }} +{{- end }} \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/servicemonitor.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/servicemonitor.yaml index 276a50211e..57d745dbe8 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/servicemonitor.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/servicemonitor.yaml @@ -39,7 +39,7 @@ spec: interval: {{ .servicemonitor.interval}} {{- end }} {{- if .servicemonitor.scrapeTimeout }} - scrapeTimeout: {{ .servicemonitor.scrapeTimeout}} + scrapeTimeout: {{ .servicemonitor.scrapeTimeout | quote}} {{- end }} {{- if .servicemonitor.basicAuth }} basicAuth: diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/statefulset.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/statefulset.yaml index f693b05ff4..55cb8ed17a 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/statefulset.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/statefulset.yaml @@ -119,12 +119,18 @@ spec: operator: In values: - {{ $.Values.Spec.Affinity.Values | default "nodes" }} +{{- else if $.Values.affinity.enabled }} + affinity: +{{ toYaml .Values.affinity.values | indent 8 }} {{- end }} {{- if $.Values.serviceAccountName }} serviceAccountName: {{ $.Values.serviceAccountName }} {{- else }} serviceAccountName: {{ template "serviceAccountName" . }} {{- end }} +{{- if $.Values.schedulerName }} + schedulerName: {{ .Values.schedulerName }} +{{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml $.Values.nodeSelector | indent 10 }} @@ -148,6 +154,17 @@ spec: - maxSkew: {{ .maxSkew }} topologyKey: {{ .topologyKey }} whenUnsatisfiable: {{ .whenUnsatisfiable }} + {{- if semverCompare "<=1.30-0" $.Capabilities.KubeVersion.GitVersion }} + {{- if .minDomains }} + minDomains: {{ .minDomains }} + {{- end }} + {{- end }} + {{- if .nodeAffinityPolicy }} + nodeAffinityPolicy: {{ .nodeAffinityPolicy }} + {{- end }} + {{- if .nodeTaintsPolicy }} + nodeTaintsPolicy: {{ .nodeTaintsPolicy }} + {{- end }} labelSelector: matchLabels: {{- if and .autoLabelSelector .customLabelSelector }} @@ -181,6 +198,10 @@ spec: command: {{ toYaml .command | indent 12 -}} {{- end}} +{{- if .args}} + args: +{{ toYaml .args | indent 12 -}} +{{- end}} {{- if .resources}} resources: {{ toYaml .resources | indent 12 -}} @@ -198,7 +219,7 @@ spec: containers: {{- if $.Values.appMetrics }} - name: envoy - image: {{ $.Values.envoyproxy.image | default "envoyproxy/envoy:v1.14.1"}} + image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}} {{- if $.Values.envoyproxy.lifecycle }} lifecycle: {{ toYaml .Values.envoyproxy.lifecycle | indent 12 -}} @@ -286,7 +307,7 @@ spec: {{- range $.Values.ContainerPort }} - name: {{ .name}} containerPort: {{ .port }} - protocol: TCP + protocol: {{ .protocol }} {{- end}} {{- if and $.Values.command.enabled $.Values.command.workingDir }} workingDir: {{ $.Values.command.workingDir }} @@ -301,9 +322,9 @@ spec: {{- end }} env: - name: CONFIG_HASH - value: {{ include (print $.Chart.Name "/templates/configmap.yaml") . | sha256sum }} + value: {{ include (print $.Chart.Name "/templates/configmap.yaml") . | sha256sum }}{{ if and (.Values.devtronInternal) (.Values.devtronInternal.containerSpecs.ConfigHash) }}{{ .Values.devtronInternal.containerSpecs.ConfigHash }}{{ end }} - name: SECRET_HASH - value: {{ include (print $.Chart.Name "/templates/secret.yaml") . | sha256sum }} + value: {{ include (print $.Chart.Name "/templates/secret.yaml") . | sha256sum }}{{ if and (.Values.devtronInternal) (.Values.devtronInternal.containerSpecs.SecretHash) }}{{ .Values.devtronInternal.containerSpecs.SecretHash }}{{ end }} - name: DEVTRON_APP_NAME value: {{ template ".Chart.Name .name" $ }} - name: POD_NAME @@ -376,6 +397,7 @@ spec: httpGet: path: {{ $.Values.LivenessProbe.Path }} port: {{ $.Values.LivenessProbe.port }} + scheme: {{ $.Values.LivenessProbe.scheme }} {{- if $.Values.LivenessProbe.httpHeaders }} httpHeaders: {{- range $.Values.LivenessProbe.httpHeaders}} @@ -502,7 +524,22 @@ spec: mountPath: {{ $cmMountPath }} {{- else }} - {{- range $k, $v := .data }} + {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} + {{- if and (.esoSubPath) (ne (len .esoSubPath) 0) }} + {{- range .esoSubPath }} + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath}}/{{ . }} + subPath: {{ . }} + {{- end }} + {{- else }} + {{- range .esoSecretData.esoData }} + - name: {{ $cmName | replace "." "-"}}-vol + mountPath: {{ $cmMountPath}}/{{ .secretKey }} + subPath: {{ .secretKey }} + {{- end }} + {{- end }} + {{- else }} + {{- range $k, $v := .data }} # for others secrets the mount path will be .data[i].secretKey - name: {{ $cmName | replace "." "-"}}-vol mountPath: {{ $cmMountPath}}/{{ $k}} subPath: {{ $k}} @@ -511,8 +548,89 @@ spec: {{- end }} {{- end }} {{- end }} - {{- if and (eq (len .Values.volumes) 0) (eq (len .Values.statefulSetConfig.volumeClaimTemplates) 0) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }} - {{- if and (eq (len .Values.volumeMounts) 0) (eq (len .Values.statefulSetConfig.volumeClaimTemplates) 0) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }} + {{- end }} + {{- if and (eq (len .Values.volumes) 0) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }} + {{- if and (eq (len .Values.volumeMounts) 0) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }} +{{- if $.Values.appMetrics }} + - name: envoy + image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}} + {{- if $.Values.envoyproxy.lifecycle }} + lifecycle: +{{ toYaml .Values.envoyproxy.lifecycle | indent 12 -}} + {{- else if $.Values.containerSpec.lifecycle.enabled }} + lifecycle: + {{- if $.Values.containerSpec.lifecycle.preStop }} + preStop: +{{ toYaml $.Values.containerSpec.lifecycle.preStop | indent 12 -}} + {{- end }} + {{- end }} + resources: +{{ toYaml $.Values.envoyproxy.resources | trim | indent 12 }} + ports: + - containerPort: 9901 + protocol: TCP + name: envoy-admin + {{- range $index, $element := .Values.ContainerPort }} + - name: {{ $element.name}} + containerPort: {{ $element.envoyPort | default (add 8790 $index) }} + protocol: TCP + {{- end }} + command: ["/usr/local/bin/envoy"] + args: ["-c", "/etc/envoy-config/envoy-config.json", "-l", "info", "--log-format", "[METADATA][%Y-%m-%d %T.%e][%t][%l][%n] %v"] + volumeMounts: + - name: {{ $.Values.envoyproxy.configMapName | default "envoy-config-volume" }} + mountPath: /etc/envoy-config/ +{{- if $.Values.envoyproxy.readinessProbe}} + readinessProbe: +{{ toYaml $.Values.envoyproxy.readinessProbe | indent 12}} +{{- end }} +{{- if $.Values.envoyproxy.livenessProbe}} + livenessProbe: +{{ toYaml $.Values.envoyproxy.livenessProbe | indent 12}} +{{- end }} +{{- end}} +{{- if $.Values.containers }} +{{- range $i, $c := .Values.containers }} +{{- if .reuseContainerImage}} + - name: {{ $.Chart.Name }}-sidecontainer-{{ add1 $i }} + image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}" + imagePullPolicy: {{ $.Values.image.pullPolicy }} +{{- if .env }} + env: +{{ toYaml .env | indent 12 }} +{{- end }} + {{- if .envFrom }} + envFrom: +{{ toYaml .env | indent 12 }} +{{- end }} +{{- if .securityContext }} + securityContext: +{{ toYaml .securityContext | indent 12 }} +{{- end }} +{{- if .command}} + command: +{{ toYaml .command | indent 12 -}} +{{- end}} +{{- if .resizePolicy }} + resizePolicy: +{{ toYaml .resziePolicy | indent 12}} +{{- end }} +{{- if .resources}} + resources: +{{ toYaml .resources | indent 12 -}} +{{- end}} +{{- if .volumeMounts}} + volumeMounts: +{{ toYaml .volumeMounts | indent 12 -}} +{{- end}} +{{- else}} + - +{{ toYaml . | indent 10 }} +{{- end}} +{{- end}} +{{- end}} + + volumes: {{- if $.Values.appMetrics }} - name: envoy-config-volume diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/vertical-pod-autoscaler.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/vertical-pod-autoscaler.yaml new file mode 100644 index 0000000000..27de013e0e --- /dev/null +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/vertical-pod-autoscaler.yaml @@ -0,0 +1,27 @@ +{{ $VerticalPodAutoScalingEnabled := include "VerticalPodAutoScalingEnabled" . }} +{{- if eq "true" $VerticalPodAutoScalingEnabled -}} +apiVersion: autoscaling.k8s.io/v1 +kind: VerticalPodAutoscaler +metadata: + name: {{ template ".Chart.Name .fullname" . }}-vpa + labels: + kind: Prometheus + app: {{ template ".Chart.Name .name" . }} + appId: {{ $.Values.app | quote }} + envId: {{ $.Values.env | quote }} + chart: {{ template ".Chart.Name .chart" . }} + release: {{ .Values.prometheus.release }} +spec: +{{- if .Values.verticalPodScaling.resourcePolicy }} + resourcePolicy: +{{ toYaml .Values.verticalPodScaling.resourcePolicy}} +{{- end }} +{{- if .Values.verticalPodScaling.updatePolicy }} + updatePolicy: +{{ toYaml .Values.verticalPodScaling.updatePolicy}} +{{- end }} + targetRef: + apiVersion: apps/v1 + kind: StatefulSet + name: {{ include ".Chart.Name .fullname" $ }} +{{- end }} \ No newline at end of file diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/values.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/values.yaml index 5c534b4541..bc8aff2ffc 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/values.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/values.yaml @@ -114,18 +114,23 @@ kedaAutoscaling: secret: enabled: false serviceheadless: - enabled: true + enabled: false + sessionAffinity: + enabled: false service: type: ClusterIP enabled: false #name: "test-service" annotations: {} + sessionAffinity: + enabled: false # test1: test2 # test3: test4 statefulSetConfig: mountPath: "/tmp" serviceheadless: enabled: false + volumeClaimTemplates: [] # - spec: @@ -600,3 +605,9 @@ tolerations: [] imagePullSecrets: [] # - test1 # - test2 + +affinity: + enabled: false + +verticalPodScaling: + enabled: false \ No newline at end of file