diff options
| author | JesseBot <jessebot@linux.com> | 2024-04-28 18:33:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-28 09:33:46 -0700 |
| commit | 70551019d65579cb88c6d519c6a1e057e3d0acee (patch) | |
| tree | 1ef1c79a7b627948e01aa6d7456324b044568caa | |
| parent | 6f9267ebdfa3aeeec2cebdf26399f67ead099298 (diff) | |
| download | seaweedfs-70551019d65579cb88c6d519c6a1e057e3d0acee.tar.xz seaweedfs-70551019d65579cb88c6d519c6a1e057e3d0acee.zip | |
helm: Fix annotations parameters to be standard maps (#5543)helm-3.65.1
| -rw-r--r-- | k8s/charts/seaweedfs/Chart.yaml | 2 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/templates/filer-ingress.yaml (renamed from k8s/charts/seaweedfs/templates/filler-ingress.yaml) | 4 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/templates/master-ingress.yaml | 4 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/templates/s3-ingress.yaml | 4 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/values.yaml | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/k8s/charts/seaweedfs/Chart.yaml b/k8s/charts/seaweedfs/Chart.yaml index 7e6db9c26..de35cd51b 100644 --- a/k8s/charts/seaweedfs/Chart.yaml +++ b/k8s/charts/seaweedfs/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: SeaweedFS name: seaweedfs appVersion: "3.65" -version: 3.65.0 +version: 3.65.1 diff --git a/k8s/charts/seaweedfs/templates/filler-ingress.yaml b/k8s/charts/seaweedfs/templates/filer-ingress.yaml index e5cc9a275..7a7c98860 100644 --- a/k8s/charts/seaweedfs/templates/filler-ingress.yaml +++ b/k8s/charts/seaweedfs/templates/filer-ingress.yaml @@ -11,9 +11,9 @@ kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-filer namespace: {{ .Release.Namespace }} - {{- if .Values.filer.ingress.annotations }} + {{- with .Values.filer.ingress.annotations }} annotations: - {{ tpl .Values.filer.ingress.annotations . | nindent 4 | trim }} + {{- toYaml . | nindent 4 }} {{- end }} labels: app.kubernetes.io/name: {{ template "seaweedfs.name" . }} diff --git a/k8s/charts/seaweedfs/templates/master-ingress.yaml b/k8s/charts/seaweedfs/templates/master-ingress.yaml index 7bac95809..62d7f7a50 100644 --- a/k8s/charts/seaweedfs/templates/master-ingress.yaml +++ b/k8s/charts/seaweedfs/templates/master-ingress.yaml @@ -11,9 +11,9 @@ kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-master namespace: {{ .Release.Namespace }} - {{- if .Values.master.ingress.annotations }} + {{- with .Values.master.ingress.annotations }} annotations: - {{ tpl .Values.master.ingress.annotations . | nindent 4 | trim }} + {{- toYaml . | nindent 4 }} {{- end }} labels: app.kubernetes.io/name: {{ template "seaweedfs.name" . }} diff --git a/k8s/charts/seaweedfs/templates/s3-ingress.yaml b/k8s/charts/seaweedfs/templates/s3-ingress.yaml index 08d58f662..7b279793b 100644 --- a/k8s/charts/seaweedfs/templates/s3-ingress.yaml +++ b/k8s/charts/seaweedfs/templates/s3-ingress.yaml @@ -10,9 +10,9 @@ kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-s3 namespace: {{ .Release.Namespace }} - {{- if .Values.s3.ingress.annotations }} + {{- with .Values.s3.ingress.annotations }} annotations: - {{- tpl .Values.s3.ingress.annotations . | nindent 4 }} + {{- toYaml . | nindent 4 }} {{- end }} labels: app.kubernetes.io/name: {{ template "seaweedfs.name" . }} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index 26009a28b..c382371ca 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -171,7 +171,7 @@ master: className: "nginx" # host: false for "*" hostname host: "master.seaweedfs.local" - annotations: | + annotations: nginx.ingress.kubernetes.io/auth-type: "basic" nginx.ingress.kubernetes.io/auth-secret: "default/ingress-basic-auth-secret" nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - SW-Master' @@ -540,7 +540,7 @@ filer: className: "nginx" # host: false for "*" hostname host: "seaweedfs.cluster.local" - annotations: | + annotations: nginx.ingress.kubernetes.io/backend-protocol: GRPC nginx.ingress.kubernetes.io/auth-type: "basic" nginx.ingress.kubernetes.io/auth-secret: "default/ingress-basic-auth-secret" @@ -746,7 +746,7 @@ s3: # host: false for "*" hostname host: "seaweedfs.cluster.local" # additional ingress annotations for the s3 endpoint - annotations: "" + annotations: {} tls: [] certificates: |