Browse Source

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"

Zuul 5 months ago
parent
commit
27ffec19c8

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

@@ -39,13 +39,3 @@ limitations under the License.
39 39
 {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
40 40
 {{- end }}
41 41
 
42
-{{- if .Values.manifests.ingress_uuid }}
43
-{{- $ingressOpts := dict "envAll" . "backendService" "uuid" "backendServiceType" "uuid" "backendPort" "uuid" -}}
44
-{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
45
-{{- end }}
46
-
47
-{{- if .Values.manifests.ingress_audit }}
48
-{{- $ingressOpts := dict "envAll" . "backendService" "audit" "backendServiceType" "audit" "backendPort" "audit" -}}
49
-{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
50
-{{- end }}
51
-

+ 5
- 5
ranger/templates/secret-ingress-tls.yaml View File

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

+ 6
- 7
ranger/values.yaml View File

@@ -221,19 +221,19 @@ secrets:
221 221
     ranger: ranger-db-user
222 222
   tls:
223 223
     cms:
224
-      api:
224
+      cms:
225 225
         public: cms
226 226
     fms:
227
-      api:
227
+      fms:
228 228
         public: fms
229 229
     ims:
230
-      api:
230
+      ims:
231 231
         public: ims
232 232
     rms:
233
-      api:
233
+      rms:
234 234
         public: rms
235 235
     rds:
236
-      api:
236
+      rds:
237 237
         public: rds
238 238
 
239 239
 # typically overriden by environmental
@@ -491,8 +491,7 @@ manifests:
491 491
   ingress_fms: true
492 492
   ingress_rms: true
493 493
   ingress_ims: true
494
-  ingress_uuid: true
495
-  ingress_audit: true
494
+  ingress_rds: true
496 495
   secret_db: true
497 496
   secret_ssh_key: true
498 497
   secret_ingress_tls: true

Loading…
Cancel
Save