diff --git a/glance/Chart.yaml b/glance/Chart.yaml index 4ad4a0d5c1..433ad30f2d 100644 --- a/glance/Chart.yaml +++ b/glance/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Glance name: glance -version: 0.3.9 +version: 0.3.10 home: https://docs.openstack.org/glance/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png sources: diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml index 0a779f0723..1f89a8132c 100644 --- a/glance/templates/configmap-etc.yaml +++ b/glance/templates/configmap-etc.yaml @@ -97,7 +97,7 @@ limitations under the License. {{- end -}} {{- if empty .Values.conf.glance.DEFAULT.bind_port -}} -{{- $_ := tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance.DEFAULT "bind_port" -}} +{{- $_ := tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance.DEFAULT "bind_port" -}} {{- end -}} {{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}} diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index ac4f540bf4..6ba5041ed0 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -102,10 +102,10 @@ spec: {{ dict "envAll" $envAll "application" "glance" "container" "nginx" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} ports: - name: g-api - containerPort: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + containerPort: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} env: - name: PORT - value: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} + value: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} - name: POD_IP valueFrom: fieldRef: @@ -114,7 +114,7 @@ spec: value: {{ tuple "image" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }} readinessProbe: tcpSocket: - port: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} command: - /tmp/nginx.sh - start @@ -159,24 +159,24 @@ spec: command: - python - -c - - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')" + - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')" livenessProbe: exec: command: - python - -c - - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')" + - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')" initialDelaySeconds: 30 {{- else }} ports: - name: g-api - containerPort: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + containerPort: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} readinessProbe: tcpSocket: - port: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} livenessProbe: tcpSocket: - port: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{- end }} volumeMounts: - name: pod-tmp diff --git a/glance/templates/service-api.yaml b/glance/templates/service-api.yaml index 5b03dd3df2..f2cbadf6df 100644 --- a/glance/templates/service-api.yaml +++ b/glance/templates/service-api.yaml @@ -22,7 +22,7 @@ metadata: spec: ports: - name: g-api - port: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "image" "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/glance/values.yaml b/glance/values.yaml index 23361bd0af..a3742d0a9d 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -601,6 +601,7 @@ endpoints: default: null scheme: default: http + service: http port: api: default: 9292 diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml index 3909cb509f..19f6fc617e 100644 --- a/releasenotes/notes/glance.yaml +++ b/releasenotes/notes/glance.yaml @@ -30,4 +30,5 @@ glance: - 0.3.7 Fix glance-etc template changing due to comment and whitespace between install and first upgrade - 0.3.8 Added OCI registry authentication - 0.3.9 Support TLS endpoints + - 0.3.10 Distinguish between port number of internal endpoint and binding port number ...