浏览代码

[k8s] Move api into its own section

Otherwise keep hititing:

Error: UPGRADE FAILED: YAML parse error on hue/templates/ingress-https.yaml: error converting YAML to JSON: yaml: line 24: mapping values are not allowed in this context
Romain Rigaux 4 年之前
父节点
当前提交
c633b4a8e0

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

@@ -7,6 +7,7 @@ metadata:
     kubernetes.io/ingress.class: nginx
     cert-manager.io/cluster-issuer: letsencrypt-hue-prod
     cert-manager.io/acme-challenge-type: http01
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/affinity: "cookie"
     nginx.ingress.kubernetes.io/session-cookie-name: "hue-balancer"
@@ -22,16 +23,16 @@ spec:
   - host: {{ .Values.ingress.domain }}
     http:
       paths:
-      {{ if .Values.hue.api.enabled }}
+      {{ if .Values.api.enabled }}
       - backend:
           serviceName: hue-api
           servicePort: 8005
         path: /api(.*)
-      {{- end -}}
+      {{ end }}
       - backend:
           serviceName: hue-balancer
           servicePort: 80
-        path: /
+        path: /(.*)
   tls:
   - hosts:
     - {{ .Values.ingress.domain }}

+ 1 - 1
tools/kubernetes/helm/hue/templates/service-hue-api.yaml

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

+ 2 - 2
tools/kubernetes/helm/hue/values.yaml

@@ -15,8 +15,6 @@ hue:
     #password_script=echo ${DATABASE_PASSWORD}
     name: "hue"
     storageName: "microk8s-hostpath"
-  api:
-    enabled: false
   interpreters: |
     [[[postgresql]]]
       name = postgresql
@@ -37,6 +35,8 @@ hue:
     celery_result_backend=redis://redis:6379/0
 balancer:
   enabled: true
+api:
+  enabled: false
 workers:
   enabled: false
   replicas: 1