Explorar o código

[k8s] Ingress and deployment for Daphne

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

+ 1 - 1
tools/kubernetes/helm/hue/templates/deployment-daphne.yaml

@@ -21,7 +21,7 @@ spec:
         - name: daphne-websocket
           image: {{ .Values.image.registry }}/hue:{{ .Values.image.tag }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: ['./build/env/bin/daphne', '-p', '8001', 'desktop.asgi:application']
+          command: ['./build/env/bin/daphne', '-p', '8001', 'desktop.asgi:application', '--bind', '0.0.0.0']
           resources:
             requests:
               # memory: "64Mi"

+ 7 - 4
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,14 +23,16 @@ spec:
   - host: {{ .Values.ingress.domain }}
     http:
       paths:
+      {{ if .Values.websocket.enabled }}
       - backend:
-          serviceName: hue-balancer
-          servicePort: 80
-        path: /
-        - backend:
           serviceName: daphne-websocket
           servicePort: 8001
         path: /(ws/.*)
+      {{- end -}}
+      - backend:
+          serviceName: hue-balancer
+          servicePort: 80
+        path: /(.*)
   {{- range .Values.ingress.extraHosts }}
   - host: {{ . | quote }}
     http: