diff --git a/packages/grid/helm/syft/templates/global/ingress.yaml b/packages/grid/helm/syft/templates/global/ingress.yaml index 677a66313a6..a76c48d8260 100644 --- a/packages/grid/helm/syft/templates/global/ingress.yaml +++ b/packages/grid/helm/syft/templates/global/ingress.yaml @@ -20,13 +20,18 @@ spec: {{- end }} defaultBackend: service: + {{- if .Values.proxy.enabled }} name: proxy + {{- else }} + name: frontend + {{- end }} port: number: 80 rules: - host: {{ .Values.ingress.hostname | quote }} http: paths: + {{- if .Values.proxy.enabled }} - backend: service: name: proxy @@ -34,6 +39,36 @@ spec: number: 80 path: / pathType: Prefix + {{- else }} + - backend: + service: + name: frontend + port: + number: 80 + path: / + pathType: Prefix + - backend: + service: + name: backend + port: + number: 80 + path: /()(api)(.*) + pathType: Prefix + - backend: + service: + name: backend + port: + number: 80 + path: /()(docs|redoc) + pathType: Prefix + - backend: + service: + name: seaweedfs + port: + number: 8333 + path: /(blob/)(.*) + pathType: ImplementationSpecific + {{- end }} {{- if .Values.ingress.tls.enabled }} tls: - hosts: diff --git a/packages/grid/helm/syft/templates/proxy/proxy-configmap.yaml b/packages/grid/helm/syft/templates/proxy/proxy-configmap.yaml index 1989f399161..2ebc6d6a9ba 100644 --- a/packages/grid/helm/syft/templates/proxy/proxy-configmap.yaml +++ b/packages/grid/helm/syft/templates/proxy/proxy-configmap.yaml @@ -1,3 +1,4 @@ +{{- if .Values.proxy.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -72,4 +73,4 @@ data: providers: file: filename: /etc/traefik/dynamic.yml - +{{- end }} diff --git a/packages/grid/helm/syft/templates/proxy/proxy-deployment.yaml b/packages/grid/helm/syft/templates/proxy/proxy-deployment.yaml index 6adb42f6c9c..69b60f905ab 100644 --- a/packages/grid/helm/syft/templates/proxy/proxy-deployment.yaml +++ b/packages/grid/helm/syft/templates/proxy/proxy-deployment.yaml @@ -1,3 +1,4 @@ +{{- if .Values.proxy.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -59,3 +60,4 @@ spec: - configMap: name: proxy-config name: traefik-conf +{{- end }} diff --git a/packages/grid/helm/syft/templates/proxy/proxy-service.yaml b/packages/grid/helm/syft/templates/proxy/proxy-service.yaml index 464f4338d33..72a9a80c3bf 100644 --- a/packages/grid/helm/syft/templates/proxy/proxy-service.yaml +++ b/packages/grid/helm/syft/templates/proxy/proxy-service.yaml @@ -1,3 +1,4 @@ +{{- if .Values.proxy.enabled }} apiVersion: v1 kind: Service metadata: @@ -18,3 +19,4 @@ spec: protocol: TCP port: 80 targetPort: 80 +{{- end }} diff --git a/packages/grid/helm/syft/templates/registry/registry-service.yaml b/packages/grid/helm/syft/templates/registry/registry-service.yaml index c132545bf2c..89386a626cf 100644 --- a/packages/grid/helm/syft/templates/registry/registry-service.yaml +++ b/packages/grid/helm/syft/templates/registry/registry-service.yaml @@ -1,3 +1,4 @@ +{{- if .Values.registry.enabled }} apiVersion: v1 kind: Service metadata: @@ -15,3 +16,4 @@ spec: protocol: TCP port: 80 targetPort: 5000 +{{- end }} diff --git a/packages/grid/helm/syft/templates/registry/registry-statefulset.yaml b/packages/grid/helm/syft/templates/registry/registry-statefulset.yaml index baefc45dce0..028ef6d8dad 100644 --- a/packages/grid/helm/syft/templates/registry/registry-statefulset.yaml +++ b/packages/grid/helm/syft/templates/registry/registry-statefulset.yaml @@ -1,3 +1,4 @@ +{{- if .Values.registry.enabled }} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -73,3 +74,4 @@ spec: resources: requests: storage: {{ .Values.registry.storageSize | quote }} +{{- end }} diff --git a/packages/grid/helm/syft/values.yaml b/packages/grid/helm/syft/values.yaml index 69ac1413291..e44d2cf7982 100644 --- a/packages/grid/helm/syft/values.yaml +++ b/packages/grid/helm/syft/values.yaml @@ -112,6 +112,7 @@ seaweedfs: # ================================================================================= proxy: + enabled: true # Extra environment vars env: null @@ -132,6 +133,7 @@ proxy: # ================================================================================= registry: + enabled: true # Extra environment vars env: null @@ -201,6 +203,13 @@ node: ingress: hostname: null # do not make this localhost + annotations: null + + # When using nginx ingress controller without internal proxy , re-enable this + # annotations: + # nginx.ingress.kubernetes.io/use-regex: "true" + # nginx.ingress.kubernetes.io/rewrite-target: /$2$3 + # nginx.ingress.kubernetes.io/upstream-vhost: "$service_name:$service_port" tls: enabled: false @@ -236,4 +245,4 @@ attestation: # ================================================================================= -extraResources: [] \ No newline at end of file +extraResources: []