Merge "Senlin: use endpoints section and lookups to set port"

senlin/templates/configmap-etc.yaml

@@ -62,6 +62,10 @@ limitations under the License.
 {{- tuple "oslo_messaging" "internal" "senlin" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.senlin.DEFAULT "transport_url" | quote | trunc 0 -}}
 {{- end -}}
 
+{{- if empty .Values.conf.senlin.senlin_api.bind_port -}}
+{{- tuple "clustering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.senlin.senlin_api "bind_port" | quote | trunc 0 -}}
+{{- end -}}
+
 ---
 apiVersion: v1
 kind: ConfigMap

senlin/templates/deployment-api.yaml

@@ -64,10 +64,11 @@ spec:
                   - /tmp/senlin-api.sh
                   - stop
           ports:
-            - containerPort: {{ .Values.conf.senlin.senlin_api.bind_port }}
+            - name: s-api
+              containerPort: {{ tuple "clustering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
             tcpSocket:
-              port: {{ .Values.conf.senlin.senlin_api.bind_port }}
+              port: {{ tuple "clustering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: senlin-bin
               mountPath: /tmp/senlin-api.sh

senlin/templates/service-api.yaml

@@ -24,7 +24,7 @@ metadata:
 spec:
   ports:
     - name: s-api
-      port: {{ .Values.conf.senlin.senlin_api.bind_port }}
+      port: {{ tuple "clustering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ if .Values.network.api.node_port.enabled }}
       nodePort: {{ .Values.network.api.node_port.port }}
     {{ end }}

senlin/values.yaml

@@ -130,7 +130,9 @@ conf:
       auth_version: v3
       memcache_security_strategy: ENCRYPT
     senlin_api:
-      bind_port: 8778
+      #NOTE(portdirect): the bind port should not be defined, and is manipulated
+      # via the endpoints section.
+      bind_port: null
 
 network:
   api: