openstack/openstack-helm
Code Issues Proposed changes

Distinguish between port number of internal endpoint and binding

Browse Source 
port number in heat

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: If393517aeb983e0cef7f370376f2bf4d12f65f4f
This commit is contained in:
josebb 2021-12-02 17:11:11 +02:00
parent ced30abead
commit 35c23a2324
10 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Heat description: OpenStack-Helm Heat
name: heat name: heat
version: 0.2.14 version: 0.2.15
home: https://docs.openstack.org/heat/latest/ home: https://docs.openstack.org/heat/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
sources: sources:

6
heat/templates/configmap-etc.yaml
View File

@ -112,15 +112,15 @@ limitations under the License.
{{- end -}} {{- end -}}
{{- if empty .Values.conf.heat.heat_api.bind_port -}} {{- 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" -}} {{- $_ := tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api "bind_port" -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.heat.heat_api_cloudwatch.bind_port -}} {{- 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" -}} {{- $_ := tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cloudwatch "bind_port" -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.heat.heat_api_cfn.bind_port -}} {{- 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" -}} {{- $_ := tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cfn "bind_port" -}}
{{- end -}} {{- end -}}
{{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}} {{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}}

6
heat/templates/deployment-api.yaml
View File

@ -73,13 +73,13 @@ spec:
- stop - stop
ports: ports:
- name: h-api - name: h-api
containerPort: {{ tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} containerPort: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
readinessProbe: readinessProbe:
tcpSocket: tcpSocket:
port: {{ tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
livenessProbe: livenessProbe:
tcpSocket: tcpSocket:
port: {{ tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 30 initialDelaySeconds: 30
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp

6
heat/templates/deployment-cfn.yaml
View File

@ -73,13 +73,13 @@ spec:
- stop - stop
ports: ports:
- name: h-cfn - name: h-cfn
containerPort: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} containerPort: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
readinessProbe: readinessProbe:
tcpSocket: tcpSocket:
port: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
livenessProbe: livenessProbe:
tcpSocket: tcpSocket:
port: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 30 initialDelaySeconds: 30
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp

4
heat/templates/deployment-cloudwatch.yaml
View File

@ -72,10 +72,10 @@ spec:
- stop - stop
ports: ports:
- name: h-cwh - name: h-cwh
containerPort: {{ tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} containerPort: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
readinessProbe: readinessProbe:
tcpSocket: tcpSocket:
port: {{ tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp
mountPath: /tmp mountPath: /tmp

2
heat/templates/service-api.yaml
View File

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

2
heat/templates/service-cfn.yaml
View File

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

2
heat/templates/service-cloudwatch.yaml
View File

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

6
heat/values.yaml
View File

@ -910,10 +910,12 @@ endpoints:
default: '/v1/%(project_id)s' default: '/v1/%(project_id)s'
scheme: scheme:
default: 'http' default: 'http'
service: 'http'
port: port:
api: api:
default: 8004 default: 8004
public: 80 public: 80
service: 8004
cloudformation: cloudformation:
name: heat-cfn name: heat-cfn
hosts: hosts:
@ -932,10 +934,12 @@ endpoints:
default: /v1 default: /v1
scheme: scheme:
default: 'http' default: 'http'
service: 'http'
port: port:
api: api:
default: 8000 default: 8000
public: 80 public: 80
service: 8000
# Cloudwatch does not get an entry in the keystone service catalog # Cloudwatch does not get an entry in the keystone service catalog
cloudwatch: cloudwatch:
name: heat-cloudwatch name: heat-cloudwatch
@ -949,10 +953,12 @@ endpoints:
type: null type: null
scheme: scheme:
default: 'http' default: 'http'
service: 'http'
port: port:
api: api:
default: 8003 default: 8003
public: 80 public: 80
service: 8003
oslo_db: oslo_db:
auth: auth:
admin: admin:

1
releasenotes/notes/heat.yaml
View File

@ -21,4 +21,5 @@ heat:
- 0.2.12 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1 - 0.2.12 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
- 0.2.13 Add Xena and Yoga values overrides - 0.2.13 Add Xena and Yoga values overrides
- 0.2.14 Added OCI registry authentication - 0.2.14 Added OCI registry authentication
- 0.2.15 Distinguish between port number of internal endpoint and binding port number
... ...