266d7b41c5
The patch sets allowed_origin in cors section to have ability to operate along with CSRF operations and direct upload in horizon dashboard. Change-Id: Icdd9aa97d24c5bf3cc42d3cd1dfd5b2f7adbefc9
194 lines
12 KiB
YAML
194 lines
12 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.configmap_etc }}
|
|
{{- $envAll := . }}
|
|
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.auth_uri -}}
|
|
{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_uri" -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.auth_uri -}}
|
|
{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_uri" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.auth_url -}}
|
|
{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_url" -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.auth_url -}}
|
|
{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_url" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.region_name -}}
|
|
{{- $_ := set .Values.conf.glance.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.project_name -}}
|
|
{{- $_ := set .Values.conf.glance.keystone_authtoken "project_name" .Values.endpoints.identity.auth.glance.project_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.project_domain_name -}}
|
|
{{- $_ := set .Values.conf.glance.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.user_domain_name -}}
|
|
{{- $_ := set .Values.conf.glance.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.username -}}
|
|
{{- $_ := set .Values.conf.glance.keystone_authtoken "username" .Values.endpoints.identity.auth.glance.username -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.password -}}
|
|
{{- $_ := set .Values.conf.glance.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.region_name -}}
|
|
{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.project_name -}}
|
|
{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "project_name" .Values.endpoints.identity.auth.glance.project_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.project_domain_name -}}
|
|
{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.user_domain_name -}}
|
|
{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.username -}}
|
|
{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "username" .Values.endpoints.identity.auth.glance.username -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.password -}}
|
|
{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.memcached_servers -}}
|
|
{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance.keystone_authtoken "memcached_servers" -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.memcached_servers -}}
|
|
{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance_registry.keystone_authtoken "memcached_servers" -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance.keystone_authtoken.memcache_secret_key -}}
|
|
{{- $_ := set .Values.conf.glance.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.keystone_authtoken.memcache_secret_key -}}
|
|
{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.database.connection -}}
|
|
{{- $_ := tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance.database "connection" -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.connection -}}
|
|
{{- $_ := tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance_registry.database "connection" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.DEFAULT.transport_url -}}
|
|
{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "transport_url" -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.glance_registry.DEFAULT.transport_url -}}
|
|
{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.glance_registry.DEFAULT "transport_url" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.DEFAULT.registry_host -}}
|
|
{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
|
|
{{- $imageRegistryHostURI := split ":" $imageRegistry -}}
|
|
{{- $_ := $imageRegistryHostURI._0 | set .Values.conf.glance.DEFAULT "registry_host" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.DEFAULT.registry_port -}}
|
|
{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
|
|
{{- $imageRegistryHostURI := split ":" $imageRegistry -}}
|
|
{{- $_ := $imageRegistryHostURI._1 | set .Values.conf.glance.DEFAULT "registry_port" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.DEFAULT.public_endpoint -}}
|
|
{{- $_ := tuple "image" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "public_endpoint" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.glance_store.stores -}}
|
|
{{- if eq .Values.storage "rbd" }}
|
|
{{- $_ := "file, http, rbd" | set .Values.conf.glance.glance_store "stores" -}}
|
|
{{- end -}}
|
|
{{- if eq .Values.storage "pvc" }}
|
|
{{- $_ := "file, http" | set .Values.conf.glance.glance_store "stores" -}}
|
|
{{- end -}}
|
|
{{ if or (eq .Values.storage "radosgw") (eq .Values.storage "swift") }}
|
|
{{- $_ := "file, http, swift" | set .Values.conf.glance.glance_store "stores" -}}
|
|
{{- end -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.glance_store.default_store -}}
|
|
{{- if eq .Values.storage "rbd" }}
|
|
{{- $_ := "rbd" | set .Values.conf.glance.glance_store "default_store" -}}
|
|
{{- end -}}
|
|
{{- if eq .Values.storage "pvc" }}
|
|
{{- $_ := "file" | set .Values.conf.glance.glance_store "default_store" -}}
|
|
{{- end -}}
|
|
{{ if or (eq .Values.storage "radosgw") (eq .Values.storage "swift") }}
|
|
{{- $_ := "swift" | set .Values.conf.glance.glance_store "default_store" -}}
|
|
{{- end -}}
|
|
{{- 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" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance_registry.DEFAULT.bind_port -}}
|
|
{{- $_ := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance_registry.DEFAULT "bind_port" -}}
|
|
{{- end -}}
|
|
|
|
{{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}}
|
|
{{- $fluentd_host := tuple "fluentd" "internal" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
|
|
{{- $fluentd_port := tuple "fluentd" "internal" "service" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
{{- $fluent_args := printf "('%s.%s', '%s', %s)" .Release.Namespace .Release.Name $fluentd_host $fluentd_port }}
|
|
{{- $handler_fluent := dict "class" "fluent.handler.FluentHandler" "formatter" "fluent" "args" $fluent_args -}}
|
|
{{- $_ := set .Values.conf.logging "handler_fluent" $handler_fluent -}}
|
|
{{- end -}}
|
|
|
|
{{- if and (empty .Values.conf.logging.formatter_fluent) (has "fluent" .Values.conf.logging.formatters.keys) -}}
|
|
{{- $formatter_fluent := dict "class" "oslo_log.formatters.FluentFormatter" -}}
|
|
{{- $_ := set .Values.conf.logging "formatter_fluent" $formatter_fluent -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.glance.cors.allowed_origin -}}
|
|
{{- $endpointScheme := tuple "dashboard" "public" "web" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}
|
|
{{- $endpointHost := tuple "dashboard" "public" . | include "helm-toolkit.endpoints.endpoint_host_lookup" }}
|
|
{{- $endpointPort := tuple "dashboard" "public" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
# Common browsers don't add default ports like 80 and 443 to the headers
|
|
# and URLs therefore CORS should allow to use URLs both with 80,443 and
|
|
# without it in the URL.
|
|
{{- if eq $endpointPort "80" "443" }}
|
|
{{- $_ := set $envAll.Values.conf.glance.cors "allowed_origin" ( list ) }}
|
|
{{- $__allowed_origin := append $envAll.Values.conf.glance.cors.allowed_origin (printf "%s://%s" $endpointScheme $endpointHost) }}
|
|
{{- $_ := set $envAll.Values.conf.glance.cors "allowed_origin" $__allowed_origin }}
|
|
{{- $__allowed_origin := append $envAll.Values.conf.glance.cors.allowed_origin (printf "%s://%s:%s" $endpointScheme $endpointHost $endpointPort) }}
|
|
{{- $_ := set $envAll.Values.conf.glance.cors "allowed_origin" $__allowed_origin }}
|
|
{{- else }}
|
|
{{- printf "%s://%s:%s" $endpointScheme $endpointHost $endpointPort | set .Values.conf.glance.cors "allowed_origin" }}
|
|
{{- end }}
|
|
{{- end -}}
|
|
---
|
|
apiVersion: v1
|
|
kind: Secret
|
|
metadata:
|
|
name: glance-etc
|
|
type: Opaque
|
|
data:
|
|
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
|
|
glance-api.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | b64enc }}
|
|
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
|
|
glance-api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
|
|
glance-registry.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance_registry | b64enc }}
|
|
glance-registry-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste_registry | b64enc }}
|
|
policy.json: {{ toJson .Values.conf.policy | b64enc }}
|
|
api_audit_map.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.api_audit_map | b64enc }}
|
|
{{- include "helm-toolkit.snippets.values_template_renderer" ( dict "envAll" $envAll "template" .Values.conf.swift_store "key" "swift-store.conf" "format" "Secret" ) | indent 2 }}
|
|
{{- end }}
|