diff options
| author | chrislu <chris.lu@gmail.com> | 2023-10-03 08:15:20 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-10-03 08:15:20 -0700 |
| commit | a78c4141e5075fd222dfff954fe6459c141ffe02 (patch) | |
| tree | 717cc9528546ff9e0ec5e637d1038fbe743f9673 | |
| parent | 451ec6504d07812b074555a1fbb2a831bfa8e5e3 (diff) | |
| parent | 763d1946f94c1e6566512a45f2514f3dbb68090d (diff) | |
| download | seaweedfs-a78c4141e5075fd222dfff954fe6459c141ffe02.tar.xz seaweedfs-a78c4141e5075fd222dfff954fe6459c141ffe02.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
| -rw-r--r-- | k8s/charts/seaweedfs/templates/s3-ingress.yaml | 46 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/values.yaml | 6 |
2 files changed, 52 insertions, 0 deletions
diff --git a/k8s/charts/seaweedfs/templates/s3-ingress.yaml b/k8s/charts/seaweedfs/templates/s3-ingress.yaml new file mode 100644 index 000000000..121495103 --- /dev/null +++ b/k8s/charts/seaweedfs/templates/s3-ingress.yaml @@ -0,0 +1,46 @@ +{{- if .Values.s3.ingress.enabled }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }} +apiVersion: networking.k8s.io/v1beta1 +{{- else }} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: ingress-{{ template "seaweedfs.name" . }}-s3 + namespace: {{ .Release.Namespace }} + {{- if .Values.s3.ingress.annotations }} + annotations: + {{ tpl .Values.s3.ingress.annotations . | nindent 4 | trim }} + {{- end }} + labels: + app.kubernetes.io/name: {{ template "seaweedfs.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/component: s3 +spec: + ingressClassName: {{ .Values.s3.ingress.className | quote }} + tls: + {{ .Values.s3.ingress.tls | default list | toYaml | nindent 6}} + rules: + - http: + paths: + - path: / + pathType: ImplementationSpecific + backend: +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} + service: + name: {{ template "seaweedfs.name" . }}-s3 + port: + number: {{ .Values.s3.port }} + #name: +{{- else }} + serviceName: {{ template "seaweedfs.name" . }}-s3 + servicePort: {{ .Values.s3.port }} +{{- end }} +{{- if .Values.s3.ingress.host }} + host: {{ .Values.s3.ingress.host }} +{{- end }} +{{- end }}
\ No newline at end of file diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index 6f69213ad..9d62f43cc 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -621,6 +621,12 @@ s3: failureThreshold: 100 timeoutSeconds: 10 + ingress: + enabled: false + className: "nginx" + # host: false for "*" hostname + host: "seaweedfs.cluster.local" + certificates: commonName: "SeaweedFS CA" ipAddresses: [] |