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

heat/templates/configmap-etc.yaml

@@ -109,6 +109,18 @@ limitations under the License.
 {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path.default | set .Values.conf.heat.trustee "auth_url" | quote | trunc 0 -}}
 {{- end -}}
 
+{{- if empty .Values.conf.heat.heat_api.bind_port -}}
+{{- tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api "bind_port" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.conf.heat.heat_api_cloudwatch.bind_port -}}
+{{- tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cloudwatch "bind_port" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.conf.heat.heat_api_cfn.bind_port -}}
+{{- tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cfn "bind_port" | quote | trunc 0 -}}
+{{- end -}}
+
 ---
 apiVersion: v1
 kind: ConfigMap

heat/templates/deployment-api.yaml

@@ -64,10 +64,11 @@ spec:
                   - /tmp/heat-api.sh
                   - stop
           ports:
-            - containerPort: {{ .Values.conf.heat.heat_api.bind_port }}
+            - name: h-api
+              containerPort: {{ tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
             tcpSocket:
-              port: {{ .Values.conf.heat.heat_api.bind_port }}
+              port: {{ tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-etc-heat
               mountPath: /etc/heat

heat/templates/deployment-cfn.yaml

@@ -64,10 +64,11 @@ spec:
                   - /tmp/heat-cfn.sh
                   - stop
           ports:
-            - containerPort: {{ .Values.conf.heat.heat_api_cfn.bind_port }}
+            - name: h-cfn
+              containerPort: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
             tcpSocket:
-              port: {{ .Values.conf.heat.heat_api_cfn.bind_port }}
+              port: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-etc-heat
               mountPath: /etc/heat

heat/templates/deployment-cloudwatch.yaml

@@ -64,10 +64,11 @@ spec:
                   - /tmp/heat-cloudwatch.sh
                   - stop
           ports:
-            - containerPort: {{ .Values.conf.heat.heat_api_cloudwatch.bind_port }}
+            - name: h-cwh
+              containerPort: {{ tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
             tcpSocket:
-              port: {{ .Values.conf.heat.heat_api_cloudwatch.bind_port }}
+              port: {{ tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-etc-heat
               mountPath: /etc/heat

heat/templates/service-api.yaml

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

heat/templates/service-cfn.yaml

@@ -24,7 +24,7 @@ metadata:
 spec:
   ports:
     - name: h-cfn
-      port: {{ .Values.conf.heat.heat_api_cfn.bind_port }}
+      port: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ if .Values.network.cfn.node_port.enabled }}
       nodePort: {{ .Values.network.cfn.node_port.port }}
     {{ end }}

heat/templates/service-cloudwatch.yaml

@@ -24,7 +24,7 @@ metadata:
 spec:
   ports:
     - name: h-cwh
-      port: {{ .Values.conf.heat.heat_api_cloudwatch.bind_port }}
+      port: {{ tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ if .Values.network.cloudwatch.node_port.enabled }}
       nodePort: {{ .Values.network.cloudwatch.node_port.port }}
     {{ end }}

heat/values.yaml

@@ -223,13 +223,19 @@ conf:
       auth_type: password
       auth_version: v3
     heat_api:
-      bind_port: 8004
+      #NOTE(portdirect): the bind port should not be defined, and is manipulated
+      # via the endpoints section.
+      bind_port: null
       workers: 4
     heat_api_cloudwatch:
-      bind_port: 8003
+      #NOTE(portdirect): the bind port should not be defined, and is manipulated
+      # via the endpoints section.
+      bind_port: null
       workers: 4
     heat_api_cfn:
-      bind_port: 8000
+      #NOTE(portdirect): the bind port should not be defined, and is manipulated
+      # via the endpoints section.
+      bind_port: null
       workers: 4
     paste_deploy:
       api_paste_config: /etc/heat/api-paste.ini