Merge "Distinguish between port number of internal endpoint and binding port number in barbican"

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:

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) -}}

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

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 }}

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:

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
 ...