summaryrefslogtreecommitdiffstats
path: root/kubernetes/cds/components/cds-command-executor
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-05-25 14:33:16 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2023-05-25 14:36:49 +0200
commit11fcd6c6fccd43a3d59936ee987ab99beeb15835 (patch)
treee3ee042e428b65bd2ca07406bbf1270f0d60916b /kubernetes/cds/components/cds-command-executor
parentf0f8339055f0b5f9d46456009d9437aca50839ed (diff)
[CDS] Chart cleanup from TLS/AAF options
Remove checks and add the usage of common templates Issue-ID: OOM-3113 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: I8e08f1cdd7aa29619a7928ffb6e32d81c2d1b802
Diffstat (limited to 'kubernetes/cds/components/cds-command-executor')
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/templates/deployment.yaml27
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/templates/service.yaml34
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/values.yaml18
3 files changed, 18 insertions, 61 deletions
diff --git a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
index 003707a52b..883f7f8846 100755
--- a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
@@ -16,24 +16,12 @@
apiVersion: apps/v1
kind: Deployment
-metadata:
- name: {{ include "common.fullname" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
spec:
- selector:
- matchLabels:
- app: {{ include "common.name" . }}
+ selector: {{- include "common.selectors" . | nindent 4 }}
replicas: {{ .Values.replicaCount }}
template:
- metadata:
- labels:
- app: {{ include "common.name" . }}
- release: {{ include "common.release" . }}
+ metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
initContainers:
- command:
@@ -51,7 +39,7 @@ spec:
- name: PROMETHEUS_METRICS_ENABLED
value: {{ .Values.metrics.serviceMonitor.enabled | quote }}
- name: PROMETHEUS_PORT
- value: {{ .Values.service.metrics.internalPort | quote }}
+ value: {{ .Values.metrics.serviceMonitor.internalPort | quote }}
{{ end }}
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -60,19 +48,18 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- ports:
- - containerPort: {{ .Values.service.grpc.internalPort }}
+ ports: {{ include "common.containerPorts" . | nindent 12 }}
{{ if .Values.liveness.enabled }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.grpc.internalPort }}
+ port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
{{ end }}
readinessProbe:
tcpSocket:
- port: {{ .Values.service.grpc.internalPort }}
+ port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
diff --git a/kubernetes/cds/components/cds-command-executor/templates/service.yaml b/kubernetes/cds/components/cds-command-executor/templates/service.yaml
index 7540728ee9..c131358663 100755
--- a/kubernetes/cds/components/cds-command-executor/templates/service.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/service.yaml
@@ -1,5 +1,5 @@
{{/*
-# Copyright (c) 2019 Bell Canada
+# Copyright (C) 2023 Deutsche Telekom
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,34 +14,4 @@
# limitations under the License.
*/}}
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "common.servicename" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
- annotations:
-spec:
- type: {{ .Values.service.type }}
- ports:
- - port: {{ .Values.service.grpc.externalPort }}
- targetPort: {{ .Values.service.grpc.internalPort }}
- {{- if eq .Values.service.type "NodePort"}}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- {{- end}}
- name: {{ .Values.service.grpc.portName | default "grpc" }}
- {{- if .Values.metrics.serviceMonitor.enabled }}
- - port: {{ .Values.service.metrics.externalPort }}
- targetPort: {{ .Values.service.metrics.internalPort }}
- {{- if eq .Values.service.type "NodePort"}}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- {{- end}}
- name: {{ .Values.service.metrics.portName | default "metrics" }}
- {{- end}}
- selector:
- app: {{ include "common.name" . }}
- release: {{ include "common.release" . }} \ No newline at end of file
+{{ include "common.service" . }}
diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index 9b8e864bfb..168978c017 100755
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -62,14 +62,13 @@ readiness:
service:
type: ClusterIP
- grpc:
- portName: grpc
- internalPort: 50051
- externalPort: 50051
- metrics:
- portName: tcp-metrics
- internalPort: 10005
- externalPort: 10005
+ name: cds-command-executor
+ internalPort: 50051
+ ports:
+ - name: grpc
+ port: 50051
+ - name: &metricsPortname tcp-metrics
+ port: &metricsPort 10005
persistence:
enabled: false
@@ -105,7 +104,8 @@ serviceAccount:
metrics:
serviceMonitor:
enabled: false
- port: tcp-metrics
+ port: *metricsPortname
+ internalPort: *metricsPort
path: /actuator/prometheus
basicAuth:
enabled: false