diff options
| -rw-r--r-- | 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/values.yaml | 22 |
3 files changed, 17 insertions, 13 deletions
diff --git a/k8s/charts/seaweedfs/templates/filler-ingress.yaml b/k8s/charts/seaweedfs/templates/filler-ingress.yaml index b16fd7403..5580bb188 100644 --- a/k8s/charts/seaweedfs/templates/filler-ingress.yaml +++ b/k8s/charts/seaweedfs/templates/filler-ingress.yaml @@ -10,8 +10,10 @@ kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-filer namespace: {{ .Release.Namespace }} + {{- if .Values.filer.ingress.annotations }} annotations: - {{ omit .Values.filer.ingress.annotations "kubernetes.io/ingress.class" | toYaml | nindent 4 }} + {{ tpl .Values.filer.ingress.annotations . | nindent 4 | trim }} + {{- end }} labels: app.kubernetes.io/name: {{ template "seaweedfs.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/k8s/charts/seaweedfs/templates/master-ingress.yaml b/k8s/charts/seaweedfs/templates/master-ingress.yaml index 4522f0a06..cce4c1d8f 100644 --- a/k8s/charts/seaweedfs/templates/master-ingress.yaml +++ b/k8s/charts/seaweedfs/templates/master-ingress.yaml @@ -10,8 +10,10 @@ kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-master namespace: {{ .Release.Namespace }} + {{- if .Values.master.ingress.annotations }} annotations: - {{ omit .Values.master.ingress.annotations "kubernetes.io/ingress.class" | toYaml | nindent 4 }} + {{ tpl .Values.master.ingress.annotations . | nindent 4 | trim }} + {{- end }} labels: app.kubernetes.io/name: {{ template "seaweedfs.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index af73cda93..786200bec 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -106,9 +106,9 @@ master: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: - app: {{ template "seaweedfs.name" . }} - release: "{{ .Release.Name }}" - component: master + app.kubernetes.io/name: {{ template "seaweedfs.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/component: master topologyKey: kubernetes.io/hostname # Toleration Settings for master pods @@ -137,7 +137,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' @@ -245,9 +245,9 @@ volume: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: - app: {{ template "seaweedfs.name" . }} - release: "{{ .Release.Name }}" - component: volume + app.kubernetes.io/name: {{ template "seaweedfs.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/component: volume topologyKey: kubernetes.io/hostname # Resource requests, limits, etc. for the server cluster placement. This @@ -352,9 +352,9 @@ filer: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: - app: {{ template "seaweedfs.name" . }} - release: "{{ .Release.Name }}" - component: filer + app.kubernetes.io/name: {{ template "seaweedfs.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/component: filer topologyKey: kubernetes.io/hostname # updatePartition is used to control a careful rolling update of SeaweedFS @@ -393,7 +393,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" |