diff --git a/ranger/templates/ingress-ranger.yaml b/ranger/templates/ingress-ranger.yaml index 2f7625e1..60246a21 100755 --- a/ranger/templates/ingress-ranger.yaml +++ b/ranger/templates/ingress-ranger.yaml @@ -39,13 +39,3 @@ limitations under the License. {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} {{- 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 }} - diff --git a/ranger/templates/secret-ingress-tls.yaml b/ranger/templates/secret-ingress-tls.yaml index 02d2bcdc..6eb01f26 100755 --- a/ranger/templates/secret-ingress-tls.yaml +++ b/ranger/templates/secret-ingress-tls.yaml @@ -15,9 +15,9 @@ limitations under the License. */}} {{- 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" . "backendServiceType" "fms" ) }} -{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "ims" ) }} -{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "rms" ) }} -{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "rds" ) }} +{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "cms" "backendServiceType" "cms" ) }} +{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "fms" "backendServiceType" "fms" ) }} +{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "ims" "backendServiceType" "ims" ) }} +{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "rms" "backendServiceType" "rms" ) }} +{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "rds" "backendServiceType" "rds" ) }} {{- end }} diff --git a/ranger/values.yaml b/ranger/values.yaml index 800e85b2..87460cf3 100755 --- a/ranger/values.yaml +++ b/ranger/values.yaml @@ -221,19 +221,19 @@ secrets: ranger: ranger-db-user tls: cms: - api: + cms: public: cms fms: - api: + fms: public: fms ims: - api: + ims: public: ims rms: - api: + rms: public: rms rds: - api: + rds: public: rds # typically overriden by environmental @@ -491,8 +491,7 @@ manifests: ingress_fms: true ingress_rms: true ingress_ims: true - ingress_uuid: true - ingress_audit: true + ingress_rds: true secret_db: true secret_ssh_key: true secret_ingress_tls: true