Support TLS endpoints in neutron
This allows neutron to consume TLS openstack endpoints. Jobs consume openstack endpoints, typically identity endpoints. And neutron itself interact with other openstack services via endpoints. Change-Id: I204b8a1a5a1fb253ea4207f5f5d76d47fac41bef
This commit is contained in:
parent
ced30abead
commit
753e43072d
@ -14,7 +14,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Neutron
|
description: OpenStack-Helm Neutron
|
||||||
name: neutron
|
name: neutron
|
||||||
version: 0.2.24
|
version: 0.2.25
|
||||||
home: https://docs.openstack.org/neutron/latest/
|
home: https://docs.openstack.org/neutron/latest/
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -153,6 +153,11 @@ spec:
|
|||||||
command:
|
command:
|
||||||
- /tmp/neutron-server.sh
|
- /tmp/neutron-server.sh
|
||||||
- start
|
- start
|
||||||
|
{{- if or .Values.manifests.certificates .Values.tls.identity }}
|
||||||
|
env:
|
||||||
|
- name: REQUESTS_CA_BUNDLE
|
||||||
|
value: "/etc/neutron/certs/ca.crt"
|
||||||
|
{{- end }}
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
exec:
|
exec:
|
||||||
@ -241,7 +246,7 @@ spec:
|
|||||||
subPath: policy.yaml
|
subPath: policy.yaml
|
||||||
readOnly: true
|
readOnly: true
|
||||||
{{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
{{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
||||||
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.network.server.internal "path" "/etc/neutron/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.network.server.internal "path" "/etc/neutron/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
||||||
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal "path" "/etc/rabbitmq/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal "path" "/etc/rabbitmq/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
||||||
{{ if $mounts_neutron_server.volumeMounts }}{{ toYaml $mounts_neutron_server.volumeMounts | indent 12 }}{{ end }}
|
{{ if $mounts_neutron_server.volumeMounts }}{{ toYaml $mounts_neutron_server.volumeMounts | indent 12 }}{{ end }}
|
||||||
volumes:
|
volumes:
|
||||||
@ -266,7 +271,7 @@ spec:
|
|||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
{{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
||||||
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.network.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.network.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
||||||
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
||||||
{{ if $mounts_neutron_server.volumes }}{{ toYaml $mounts_neutron_server.volumes | indent 8 }}{{ end }}
|
{{ if $mounts_neutron_server.volumes }}{{ toYaml $mounts_neutron_server.volumes | indent 8 }}{{ end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -19,7 +19,7 @@ helm.sh/hook-weight: "5"
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
|
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
|
||||||
{{- $bootstrapJob := dict "envAll" . "serviceName" "neutron" "keystoneUser" .Values.bootstrap.ks_user "logConfigFile" .Values.conf.neutron.DEFAULT.log_config_append -}}
|
{{- $bootstrapJob := dict "envAll" . "serviceName" "neutron" "keystoneUser" .Values.bootstrap.ks_user "logConfigFile" .Values.conf.neutron.DEFAULT.log_config_append -}}
|
||||||
{{- if .Values.manifests.certificates -}}
|
{{- if or .Values.manifests.certificates .Values.tls.identity -}}
|
||||||
{{- $_ := set $bootstrapJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
{{- $_ := set $bootstrapJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- if .Values.helm3_hook }}
|
{{- if .Values.helm3_hook }}
|
||||||
|
@ -19,7 +19,7 @@ helm.sh/hook-weight: "-2"
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_ks_endpoints }}
|
{{- if .Values.manifests.job_ks_endpoints }}
|
||||||
{{- $ksEndpointsJob := dict "envAll" . "serviceName" "neutron" "serviceTypes" ( tuple "network" ) -}}
|
{{- $ksEndpointsJob := dict "envAll" . "serviceName" "neutron" "serviceTypes" ( tuple "network" ) -}}
|
||||||
{{- if .Values.manifests.certificates -}}
|
{{- if or .Values.manifests.certificates .Values.tls.identity -}}
|
||||||
{{- $_ := set $ksEndpointsJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
{{- $_ := set $ksEndpointsJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- if .Values.helm3_hook }}
|
{{- if .Values.helm3_hook }}
|
||||||
|
@ -19,7 +19,7 @@ helm.sh/hook-weight: "-3"
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_ks_service }}
|
{{- if .Values.manifests.job_ks_service }}
|
||||||
{{- $ksServiceJob := dict "envAll" . "serviceName" "neutron" "serviceTypes" ( tuple "network" ) -}}
|
{{- $ksServiceJob := dict "envAll" . "serviceName" "neutron" "serviceTypes" ( tuple "network" ) -}}
|
||||||
{{- if .Values.manifests.certificates -}}
|
{{- if or .Values.manifests.certificates .Values.tls.identity -}}
|
||||||
{{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
{{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- if .Values.helm3_hook }}
|
{{- if .Values.helm3_hook }}
|
||||||
|
@ -19,7 +19,7 @@ helm.sh/hook-weight: "-1"
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_ks_user }}
|
{{- if .Values.manifests.job_ks_user }}
|
||||||
{{- $ksUserJob := dict "envAll" . "serviceName" "neutron" -}}
|
{{- $ksUserJob := dict "envAll" . "serviceName" "neutron" -}}
|
||||||
{{- if .Values.manifests.certificates -}}
|
{{- if or .Values.manifests.certificates .Values.tls.identity -}}
|
||||||
{{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
{{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.network.server.internal -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- if .Values.helm3_hook }}
|
{{- if .Values.helm3_hook }}
|
||||||
|
@ -2544,6 +2544,11 @@ health_probe:
|
|||||||
logging:
|
logging:
|
||||||
level: ERROR
|
level: ERROR
|
||||||
|
|
||||||
|
tls:
|
||||||
|
identity: false
|
||||||
|
oslo_messaging: false
|
||||||
|
oslo_db: false
|
||||||
|
|
||||||
manifests:
|
manifests:
|
||||||
certificates: false
|
certificates: false
|
||||||
configmap_bin: true
|
configmap_bin: true
|
||||||
|
14
neutron/values_overrides/tls-offloading.yaml
Normal file
14
neutron/values_overrides/tls-offloading.yaml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
---
|
||||||
|
endpoints:
|
||||||
|
identity:
|
||||||
|
auth:
|
||||||
|
admin:
|
||||||
|
cacert: /etc/ssl/certs/openstack-helm.crt
|
||||||
|
neutron:
|
||||||
|
cacert: /etc/ssl/certs/openstack-helm.crt
|
||||||
|
test:
|
||||||
|
cacert: /etc/ssl/certs/openstack-helm.crt
|
||||||
|
|
||||||
|
tls:
|
||||||
|
identity: true
|
||||||
|
...
|
@ -38,4 +38,5 @@ neutron:
|
|||||||
- 0.2.22 Fix /run/xtables.lock may be a directory
|
- 0.2.22 Fix /run/xtables.lock may be a directory
|
||||||
- 0.2.23 Add neutron_netns_cleanup_cron release image override, so that the respective release image is used
|
- 0.2.23 Add neutron_netns_cleanup_cron release image override, so that the respective release image is used
|
||||||
- 0.2.24 Added OCI registry authentication
|
- 0.2.24 Added OCI registry authentication
|
||||||
|
- 0.2.25 Support TLS endpoints
|
||||||
...
|
...
|
||||||
|
Loading…
x
Reference in New Issue
Block a user