diff --git a/deploy/kubernetes/controller.yaml b/deploy/kubernetes/controller.yaml index 450317d..17b13cf 100644 --- a/deploy/kubernetes/controller.yaml +++ b/deploy/kubernetes/controller.yaml @@ -48,6 +48,5 @@ spec: - protocol: TCP port: 8000 targetPort: 8000 - nodePort: 30003 - type: NodePort + type: ClusterIP diff --git a/deploy/kubernetes/frontend.yaml b/deploy/kubernetes/frontend.yaml index 0f8e9e5..6c6b9e7 100644 --- a/deploy/kubernetes/frontend.yaml +++ b/deploy/kubernetes/frontend.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: frontend - image: oktopusp/frontend:latest + image: rogersacchelli/frontend:1.0.3 resources: requests: memory: 64Mi @@ -25,11 +25,11 @@ spec: memory: 256Mi cpu: 200m ports: - - containerPort: 8080 + - containerPort: 3000 imagePullPolicy: IfNotPresent env: - # - name: NEXT_PUBLIC_REST_ENDPOINT - # value: "192.168.1.130:30003" + - name: NEXT_PUBLIC_REST_ENDPOINT + value: "/api" #- name: NEXT_PUBLIC_WS_ENDPOINT # value: "192.168.1.130:30005" --- @@ -42,7 +42,7 @@ spec: app: frontend ports: - protocol: TCP - port: 8080 - targetPort: 8080 - externalTrafficPolicy: Local - type: LoadBalancer + port: 3000 + targetPort: 3000 + #externalTrafficPolicy: Local + type: ClusterIP diff --git a/deploy/kubernetes/haproxy-kubernetes-ingress-cm.yaml b/deploy/kubernetes/haproxy-kubernetes-ingress-cm.yaml deleted file mode 100644 index c4aabd9..0000000 --- a/deploy/kubernetes/haproxy-kubernetes-ingress-cm.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: haproxy-kubernetes-ingress - namespace: haproxy-controller -data: - syslog-server: "address:stdout, format: raw, facility:daemon" diff --git a/deploy/kubernetes/haproxy-tcp-services-cm.yaml b/deploy/kubernetes/haproxy-tcp-services-cm.yaml deleted file mode 100644 index a4b8f7f..0000000 --- a/deploy/kubernetes/haproxy-tcp-services-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: haproxy-tcp - namespace: default -data: - 1883: # Port where the frontend is going to listen to. - default/mqtt-svc:1883 # Kubernetes service in the format NS/ServiceName:ServicePort diff --git a/deploy/kubernetes/haproxy-tcp-services.yaml b/deploy/kubernetes/haproxy-tcp-services.yaml deleted file mode 100644 index 77db1d6..0000000 --- a/deploy/kubernetes/haproxy-tcp-services.yaml +++ /dev/null @@ -1,8 +0,0 @@ -controller: - service: - tcpPorts: - - name: mqtt - port: 1883 - targetPort: 1883 - extraArgs: - - --configmap-tcp-services=default/haproxy-tcp diff --git a/deploy/kubernetes/ingress.yaml b/deploy/kubernetes/ingress.yaml new file mode 100644 index 0000000..5072c8b --- /dev/null +++ b/deploy/kubernetes/ingress.yaml @@ -0,0 +1,27 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: web-ingress + namespace: default + annotations: +spec: + ingressClassName: "haproxy" + rules: + - host: oktopus.rdss.cloud + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: frontend-svc + port: + number: 3000 + - path: /api + pathType: Prefix + backend: + service: + name: controller-svc + port: + number: 8000 +