openstack
/
openstack-helm-addons
Code Issues Proposed changes

Merge "Fix tls, services chart configurations 1. Fix tls secret keys identification for services 2. Removed ingress definitions for uuid and audit which are not required for now 3. Fix flag for ingress definitions in rds"

This commit is contained in:
Zuul 2018-11-07 17:48:47 +00:00 committed by Gerrit Code Review
parent beee7494c2 ca2878611e
commit 27ffec19c8
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ranger/templates/ingress-ranger.yaml
View File

@ -39,13 +39,3 @@ limitations under the License.
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
{{- end }} {{- end }}
{{- if .Values.manifests.ingress_uuid }}
{{- $ingressOpts := dict "envAll" . "backendService" "uuid" "backendServiceType" "uuid" "backendPort" "uuid" -}}
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
{{- end }}
{{- if .Values.manifests.ingress_audit }}
{{- $ingressOpts := dict "envAll" . "backendService" "audit" "backendServiceType" "audit" "backendPort" "audit" -}}
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
{{- end }}

10
ranger/templates/secret-ingress-tls.yaml
View File

@ -15,9 +15,9 @@ limitations under the License.
*/}} */}}
{{- if .Values.manifests.secret_ingress_tls }} {{- if .Values.manifests.secret_ingress_tls }}
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "cms" ) }} {{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "cms" "backendServiceType" "cms" ) }}
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "fms" ) }} {{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "fms" "backendServiceType" "fms" ) }}
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "ims" ) }} {{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "ims" "backendServiceType" "ims" ) }}
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "rms" ) }} {{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "rms" "backendServiceType" "rms" ) }}
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "rds" ) }} {{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "rds" "backendServiceType" "rds" ) }}
{{- end }} {{- end }}

13
ranger/values.yaml
View File

@ -221,19 +221,19 @@ secrets:
ranger: ranger-db-user ranger: ranger-db-user
tls: tls:
cms: cms:
api: cms:
public: cms public: cms
fms: fms:
api: fms:
public: fms public: fms
ims: ims:
api: ims:
public: ims public: ims
rms: rms:
api: rms:
public: rms public: rms
rds: rds:
api: rds:
public: rds public: rds
# typically overriden by environmental # typically overriden by environmental
@ -491,8 +491,7 @@ manifests:
ingress_fms: true ingress_fms: true
ingress_rms: true ingress_rms: true
ingress_ims: true ingress_ims: true
ingress_uuid: true ingress_rds: true
ingress_audit: true
secret_db: true secret_db: true
secret_ssh_key: true secret_ssh_key: true
secret_ingress_tls: true secret_ingress_tls: true