Explorar o código

HUE-8888 [k8s] Avoid hyphen in helm values

Romain %!s(int64=5) %!d(string=hai) anos
pai
achega
7d086d9390

+ 3 - 3
tools/kubernetes/helm/website/templates/NOTES.txt

@@ -16,13 +16,13 @@ Run below commands to get the recommended URLs:
 
 {{ else if and .Values.ingress.create (eq .Values.ingress.type "nginx-ssl") }}
 
-  {{- if .Values.website.enabled -}}
+  {{ if .Values.website.enabled }}
   echo https://{{ .Values.website.domain }}
   {{- end -}}
-   {{- if .Values.website-jp.enabled -}}
+  {{ if .Values.website.jp.enabled }}
   echo https://{{ .Values.website.domain }}
   {{- end -}}
-  {{- if .Values.docs.enabled -}}
+  {{ if .Values.docs.enabled }}
   echo https://{{ .Values.docs.domain }}
   {{- end -}}
 

+ 1 - 1
tools/kubernetes/helm/website/templates/deployment-website-jp.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.website-jp.enabled -}}
+{{- if .Values.website.jp.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

+ 2 - 2
tools/kubernetes/helm/website/templates/ingress-http.yaml

@@ -29,8 +29,8 @@ spec:
           servicePort: 9002
         path: /
   {{ end }}
-  {{ if .Values.website-jp.enabled }}
-  - host: {{ .Values.website-jp.domain }}
+  {{ if .Values.website.jp.enabled }}
+  - host: {{ .Values.website.jp.domain }}
     http:
       paths:
       - backend:

+ 4 - 4
tools/kubernetes/helm/website/templates/ingress-https.yaml

@@ -37,8 +37,8 @@ spec:
           servicePort: 9002
         path: /
   {{ end }}
-  {{ if .Values.website-jp.enabled }}
-  - host: {{ .Values.website-jp.domain }}
+  {{ if .Values.website.jp.enabled }}
+  - host: {{ .Values.website.jp.domain }}
     http:
       paths:
       - backend:
@@ -54,8 +54,8 @@ spec:
     {{ if .Values.website.enabled }}
     - {{ .Values.website.domain }}
     {{ end }}
-    {{ if .Values.website-jp.enabled }}
-    - {{ .Values.website-jp.domain }}
+    {{ if .Values.website.jp.enabled }}
+    - {{ .Values.website.jp.domain }}
     {{ end }}
     secretName: letsencrypt-website-prod-tls
 {{- end -}}

+ 1 - 1
tools/kubernetes/helm/website/templates/service-website-jp.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.website-jp.enabled -}}
+{{- if .Values.website.jp.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:

+ 4 - 4
tools/kubernetes/helm/website/values.yaml

@@ -9,10 +9,10 @@ website:
   enabled: true
   replicas: 1
   domain: "gethue.com"
-website-jp:
-  enabled: true
-  replicas: 1
-  domain: "jp.gethue.com"
+  jp:
+    enabled: true
+    replicas: 1
+    domain: "jp.gethue.com"
 docs:
   enabled: true
   replicas: 1