mirror of
https://github.com/truenas/charts.git
synced 2026-10-25 07:55:50 +00:00
Do not setup nodeport services with hostnetwork for minio
This commit is contained in:
@@ -16,4 +16,4 @@ sources:
|
||||
- https://github.com/minio/minio
|
||||
- https://github.com/minio/charts
|
||||
upstream_version: 8.0.5
|
||||
version: 1.6.16
|
||||
version: 1.6.17
|
||||
+2
-2
@@ -56,11 +56,11 @@ Retrieve scheme/protocol for minio
|
||||
Retrieve command for minio application
|
||||
*/}}
|
||||
{{- define "minio.commandArgs" -}}
|
||||
{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}}
|
||||
{{- $arg := (printf "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':%d'" (.Values.service.consolePort | int)) -}}
|
||||
{{- if .Values.distributedMode -}}
|
||||
{{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}}
|
||||
{{- else -}}
|
||||
{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
|
||||
{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
+2
-2
@@ -46,9 +46,9 @@ spec:
|
||||
- {{ include "minio.commandArgs" . }}
|
||||
ports:
|
||||
- name: api
|
||||
containerPort: 9000
|
||||
containerPort: {{ .Values.service.nodePort | int }}
|
||||
- name: console
|
||||
containerPort: 9001
|
||||
containerPort: {{ .Values.service.consolePort | int }}
|
||||
env:
|
||||
{{ $secretName := (include "minio.secretName" .) }}
|
||||
{{ $envList := (default list .Values.environmentVariables) }}
|
||||
+4
-2
@@ -1,11 +1,13 @@
|
||||
{{ if eq (include "minio.hostNetworking" .) "false" }}
|
||||
{{ $svc := .Values.service }}
|
||||
{{ $selectors := list }}
|
||||
{{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }}
|
||||
{{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }}
|
||||
{{ $ports := list }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" (.Values.service.nodePort | int)) }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" (.Values.service.consolePort | int)) }}
|
||||
{{ $params := . }}
|
||||
{{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }}
|
||||
{{ $_1 := set .Values "extraSelectorLabels" $selectors }}
|
||||
{{ include "common.classes.service" $params }}
|
||||
{{ end }}
|
||||
@@ -16,4 +16,4 @@ sources:
|
||||
- https://github.com/minio/minio
|
||||
- https://github.com/minio/charts
|
||||
upstream_version: 8.0.5
|
||||
version: 1.6.16
|
||||
version: 1.6.17
|
||||
+2
-2
@@ -56,11 +56,11 @@ Retrieve scheme/protocol for minio
|
||||
Retrieve command for minio application
|
||||
*/}}
|
||||
{{- define "minio.commandArgs" -}}
|
||||
{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}}
|
||||
{{- $arg := (printf "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':%d'" (.Values.service.consolePort | int)) -}}
|
||||
{{- if .Values.distributedMode -}}
|
||||
{{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}}
|
||||
{{- else -}}
|
||||
{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
|
||||
{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
+2
-2
@@ -46,9 +46,9 @@ spec:
|
||||
- {{ include "minio.commandArgs" . }}
|
||||
ports:
|
||||
- name: api
|
||||
containerPort: 9000
|
||||
containerPort: {{ .Values.service.nodePort | int }}
|
||||
- name: console
|
||||
containerPort: 9001
|
||||
containerPort: {{ .Values.service.consolePort | int }}
|
||||
env:
|
||||
{{ $secretName := (include "minio.secretName" .) }}
|
||||
{{ $envList := (default list .Values.environmentVariables) }}
|
||||
+4
-2
@@ -1,11 +1,13 @@
|
||||
{{ if eq (include "minio.hostNetworking" .) "false" }}
|
||||
{{ $svc := .Values.service }}
|
||||
{{ $selectors := list }}
|
||||
{{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }}
|
||||
{{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }}
|
||||
{{ $ports := list }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" (.Values.service.nodePort | int)) }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" (.Values.service.consolePort | int)) }}
|
||||
{{ $params := . }}
|
||||
{{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }}
|
||||
{{ $_1 := set .Values "extraSelectorLabels" $selectors }}
|
||||
{{ include "common.classes.service" $params }}
|
||||
{{ end }}
|
||||
Reference in New Issue
Block a user