From 497f2bbfa8457f224a777aa7835d37f997ef0c7d Mon Sep 17 00:00:00 2001
From: josebb <jose.bautista.barato@gmail.com>
Date: Thu, 2 Dec 2021 16:25:53 +0200
Subject: [PATCH] Distinguish between port number of internal endpoint and
 binding port number in barbican

Now binding ports of service and pod spec are configured using
internal endpoint values.
To support reverse proxy for internalUrl, need to distinguish
between binding ports and internal endpoint ports.

I added `service` section in endpoint items apart from admin,public
,internal and default.

Change-Id: I33dbc62338ef8e21fab774e3b91bc474efd6bf36
---
 barbican/Chart.yaml                    | 2 +-
 barbican/templates/configmap-etc.yaml  | 4 ++--
 barbican/templates/deployment-api.yaml | 4 ++--
 barbican/templates/service-api.yaml    | 2 +-
 barbican/values.yaml                   | 2 ++
 releasenotes/notes/barbican.yaml       | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 0191c8435d..266ed33e37 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 0.2.15
+version: 0.2.16
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml
index c8e08cb121..d9323e08f8 100644
--- a/barbican/templates/configmap-etc.yaml
+++ b/barbican/templates/configmap-etc.yaml
@@ -68,11 +68,11 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.barbican.barbican_api.bind_port -}}
-{{- $_ := tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.barbican.barbican_api "bind_port" -}}
+{{- $_ := tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.barbican.barbican_api "bind_port" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.barbican_api.uwsgi.socket -}}
-{{- $_ := printf ":%s" ( tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" ) | set .Values.conf.barbican_api.uwsgi "socket" -}}
+{{- $_ := printf ":%s" ( tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" ) | set .Values.conf.barbican_api.uwsgi "socket" -}}
 {{- end -}}
 
 {{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}}
diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml
index 9033971f87..fb17b7b8ad 100644
--- a/barbican/templates/deployment-api.yaml
+++ b/barbican/templates/deployment-api.yaml
@@ -72,10 +72,10 @@ spec:
                   - stop
           ports:
             - name: b-api
-              containerPort: {{ tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+              containerPort: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
             tcpSocket:
-              port: {{ tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+              port: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
diff --git a/barbican/templates/service-api.yaml b/barbican/templates/service-api.yaml
index 0f63ee3234..b995fdc6af 100644
--- a/barbican/templates/service-api.yaml
+++ b/barbican/templates/service-api.yaml
@@ -22,7 +22,7 @@ metadata:
 spec:
   ports:
   - name: b-api
-    port: {{ tuple "key-manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+    port: {{ tuple "key-manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ if .Values.network.api.node_port.enabled }}
     nodePort: {{ .Values.network.api.node_port.port }}
     {{ end }}
diff --git a/barbican/values.yaml b/barbican/values.yaml
index f595d9e6d9..704267b960 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -570,10 +570,12 @@ endpoints:
       default: /
     scheme:
       default: http
+      service: http
     port:
       api:
         default: 9311
         public: 80
+        service: 9311
   oslo_db:
     auth:
       admin:
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index 574a186ae3..82d7d616c0 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -19,4 +19,5 @@ barbican:
   - 0.2.13 Migrated PodDisruptionBudget resource to policy/v1 API version
   - 0.2.14 Add Xena and Yoga values overrides
   - 0.2.15 Added OCI registry authentication
+  - 0.2.16 Distinguish between port number of internal endpoint and binding port number
 ...