diff --git a/placement/Chart.yaml b/placement/Chart.yaml index 715159da9e..e2321d2109 100644 --- a/placement/Chart.yaml +++ b/placement/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Placement name: placement -version: 0.2.10 +version: 0.2.11 home: https://docs.openstack.org/placement/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png sources: diff --git a/placement/templates/deployment.yaml b/placement/templates/deployment.yaml index 9dcde00855..81aa5c88fd 100644 --- a/placement/templates/deployment.yaml +++ b/placement/templates/deployment.yaml @@ -75,16 +75,16 @@ spec: - stop ports: - name: p-api - containerPort: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + containerPort: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} readinessProbe: # NOTE(portdirect): use tcpSocket check as HTTP will return 401 tcpSocket: - port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} initialDelaySeconds: 15 periodSeconds: 10 livenessProbe: tcpSocket: - port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} initialDelaySeconds: 50 periodSeconds: 10 volumeMounts: diff --git a/placement/templates/service.yaml b/placement/templates/service.yaml index 3d9bd0190c..aa0168e157 100644 --- a/placement/templates/service.yaml +++ b/placement/templates/service.yaml @@ -24,7 +24,7 @@ metadata: spec: ports: - name: p-api - port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "placement" "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/placement/values.yaml b/placement/values.yaml index 578d9478e1..4566dca42f 100644 --- a/placement/values.yaml +++ b/placement/values.yaml @@ -184,13 +184,13 @@ conf: format: "%(message)s" datefmt: "%Y-%m-%d %H:%M:%S" wsgi_placement: | - Listen 0.0.0.0:{{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + Listen 0.0.0.0:{{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded - + WSGIDaemonProcess placement-api processes=4 threads=1 user=placement group=placement display-name=%{GROUP} WSGIProcessGroup placement-api WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api @@ -325,10 +325,12 @@ endpoints: default: / scheme: default: 'http' + service: 'http' port: api: default: 8778 public: 80 + service: 8778 pod: security_context: diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml index b02a2fb46a..4c70f2249b 100644 --- a/releasenotes/notes/placement.yaml +++ b/releasenotes/notes/placement.yaml @@ -19,4 +19,5 @@ placement: - 0.2.8 Migrated PodDisruptionBudget resource to policy/v1 API version - 0.2.9 Add Xena and Yoga values overrides - 0.2.10 Added OCI registry authentication + - 0.2.11 Distinguish between port number of internal endpoint and binding port number ...