diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-14 19:44:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-03-14 19:44:19 +0000 |
| commit | 8a626708ed05ca337586695b2056441fc6405fec (patch) | |
| tree | 92003f4373c76afaa9e26bb2684968017248d29f /kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml | |
| parent | 1ca95eead50a3b8994751b013d7b39dc1e5e3562 (diff) | |
| parent | 6910bbe1e3f2e44e5e100b8fec34a6da8b8eb231 (diff) | |
Merge "[POLICY-PPNT] Move policy-clamp-ppnt use case to use strimzi kafka"
Diffstat (limited to 'kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml index 23ef33b79b..550957b717 100644 --- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,21 +28,8 @@ spec: metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: initContainers: -{{- if .Values.config.useStrimziKafka }} - - command: - - /app/ready.py - args: - - --container-name - - message-router - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: {{ include "repositoryGenerator.image.readiness" . }} - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-readiness +{{- if not .Values.global.useStrimziKafka }} +{{ include "common.readinessCheck.waitFor" . | nindent 6 }} {{- end }} - command: - sh @@ -54,9 +41,12 @@ spec: {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "login") | indent 10 }} - name: RESTSERVER_PASSWORD {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "password") | indent 10 }} -{{- if .Values.config.useStrimziKafka }} - - name: JAASLOGIN - {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "policy-kafka-user" "key" "sasl.jaas.config") | indent 10 }} +{{- if .Values.global.useStrimziKafka }} + - name: SASL_JAAS_CONFIG + valueFrom: + secretKeyRef: + name: {{ include "common.name" . }}-ku + key: sasl.jaas.config {{- end }} volumeMounts: - mountPath: /config-input |