DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 35 Packages Projects Releases 1 Wiki Activity

fix(minio): Fix services and add ingress option for both services (#1911)

Browse Source 
* fix(minio): Run app with the specified user always

* use consoles port for web portal

* map ports exactly

* update ports to questions

* add ingress option for console

* update description

* bump minor

* make console (webui) service main, and create new service for the api(server)

* update doc ports

* revert minio uid/gid set

* update probes towards api

* use more defaults

* try tpl

* revert to hardcoded values
This commit is contained in:
Stavros Kois
2022-02-20 21:03:13 +01:00
committed by GitHub
parent 816f5c46d6
commit f7d74faf46
4 changed files with 103 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/stable/minio/Chart.yaml
+1 -1
View File
@@ -19,7 +19,7 @@ maintainers:
name: minio name: minio
sources: sources:
- https://github.com/minio/minio - https://github.com/minio/minio
version: 1.0.28 version: 1.1.0
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- media - media
charts/stable/minio/questions.yaml
+78 -57
View File
@@ -104,6 +104,13 @@ questions:
required: true required: true
- variable: MINIO_BROWSER_REDIRECT_URL - variable: MINIO_BROWSER_REDIRECT_URL
label: "MINIO_BROWSER_REDIRECT_URL" label: "MINIO_BROWSER_REDIRECT_URL"
description: "Specify the URL the MinIO Console provides as the redirect URL eg. https://minioconsole.mydomain.com"
schema:
type: string
default: ""
- variable: MINIO_SERVER_URL
label: "MINIO_SERVER_URL"
description: "Specify the URL hostname the MinIO Console should use for connecting to the MinIO Server. eg. https://minioserver.mydomain.com"
schema: schema:
type: string type: string
default: "" default: ""
@@ -127,62 +134,6 @@ questions:
# Include{serviceSelector} # Include{serviceSelector}
- variable: main - variable: main
label: "Main Service Port Configuration" label: "Main Service Port Configuration"
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 10106
required: true
- variable: advanced
label: "Show Advanced settings"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: protocol
label: "Port Type"
schema:
type: string
default: "HTTP"
enum:
- value: HTTP
description: "HTTP"
- value: "HTTPS"
description: "HTTPS"
- value: TCP
description: "TCP"
- value: "UDP"
description: "UDP"
- variable: nodePort
label: "Node Port (Optional)"
description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
schema:
type: int
min: 9000
max: 65535
- variable: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 9000
- variable: console
label: "Console Service"
description: "The Primary service on which the healthcheck runs, often the webUI"
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: console
label: "Console Service Port Configuration"
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -227,7 +178,63 @@ questions:
description: "The internal(!) port on the container the Application runs on" description: "The internal(!) port on the container the Application runs on"
schema: schema:
type: int type: int
default: 9001 default: 10107
- variable: api
label: "API Service"
description: "The Primary service on which the healthcheck runs, often the webUI"
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: api
label: "API Service Port Configuration"
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 10106
required: true
- variable: advanced
label: "Show Advanced settings"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: protocol
label: "Port Type"
schema:
type: string
default: "HTTP"
enum:
- value: HTTP
description: "HTTP"
- value: "HTTPS"
description: "HTTPS"
- value: TCP
description: "TCP"
- value: "UDP"
description: "UDP"
- variable: nodePort
label: "Node Port (Optional)"
description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
schema:
type: int
min: 9000
max: 65535
- variable: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 10106
- variable: serviceexpert - variable: serviceexpert
group: "Networking and Services" group: "Networking and Services"
@@ -320,6 +327,20 @@ questions:
# Include{ingressTraefik} # Include{ingressTraefik}
# Include{ingressExpert}
- variable: api
label: "Console Ingress"
schema:
additional_attrs: true
type: dict
attrs:
# Include{ingressDefault}
# Include{ingressTLS}
# Include{ingressTraefik}
# Include{ingressExpert} # Include{ingressExpert}
# Include{ingressList} # Include{ingressList}
charts/stable/minio/values.yaml
+20 -22
View File
@@ -1,49 +1,47 @@
image: image:
# -- image repository
repository: tccr.io/truecharts/minio repository: tccr.io/truecharts/minio
# -- image tag
tag: latest@sha256:8129f69c85b84e13f085a1ce127f108cee0ea84a1f496e8065796c7a15a08442 tag: latest@sha256:8129f69c85b84e13f085a1ce127f108cee0ea84a1f496e8065796c7a15a08442
# -- image pull policy
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# -- Override the args for the default container. args: ["server", "/data", "--address", ":10106", "--console-address", ":10107"]
args: ["server", "/data", "--console-address", ":9001"]
secret: secret:
# -- Minio Password
MINIO_ROOT_PASSWORD: "changeme" MINIO_ROOT_PASSWORD: "changeme"
# -- environment variables. See more environment variables in the [minio documentation](https://docs.min.io).
# @default -- See below
env: env:
# -- Set the container timezone
TZ: UTC
# -- Minio Username
MINIO_ROOT_USER: "minio" MINIO_ROOT_USER: "minio"
MINIO_BROWSER_REDIRECT_URL: "" MINIO_BROWSER_REDIRECT_URL: ""
MINIO_SERVER_URL: ""
probes: probes:
liveness: liveness:
path: "/minio/health/live" custom: true
spec:
httpGet:
scheme: HTTP
path: "/minio/health/live"
port: 10106
readiness: readiness:
path: "/minio/health/ready" custom: true
spec:
httpGet:
scheme: HTTP
path: "/minio/health/ready"
port: 10106
# -- Configures service settings for the chart.
# @default -- See values.yaml
service: service:
main: main:
ports: ports:
main: main:
port: 10106 port: 10107
targetPort: 9000 targetPort: 10107
console: api:
enabled: true enabled: true
ports: ports:
console: api:
enabled: true enabled: true
targetPort: 9001 targetPort: 10106
port: 10107 port: 10106
securityContext: securityContext:
readOnlyRootFilesystem: false readOnlyRootFilesystem: false
docs/manual/default-ports.md
+4 -4
View File
@@ -131,8 +131,8 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
| gaps | main | main | 8484 | TCP | | | gaps | main | main | 8484 | TCP | |
| lidarr | main | main | 8686 | TCP | | | lidarr | main | main | 8686 | TCP | |
| readarr | main | main | 8787 | TCP | | | readarr | main | main | 8787 | TCP | |
| omada-controller | userportal | websecure | 8843 | HTTPS | Potential conflict with unifi | | omada-controller | userportal | websecure | 8843 | HTTPS | Potential conflict with unifi |
| unifi | guestportal | websecure | 8843 | HTTPS | Potential conflict with omada | | unifi | guestportal | websecure | 8843 | HTTPS | Potential conflict with omada |
| minisatip | main | main | 8875 | TCP | | | minisatip | main | main | 8875 | TCP | |
| unifi | guestportal | web | 8880 | HTTP | | | unifi | guestportal | web | 8880 | HTTP | |
| resilio-sync | main | main | 8888 | TCP | | | resilio-sync | main | main | 8888 | TCP | |
@@ -258,8 +258,8 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
| zigbee2mqtt | main | main | 10103 | TCP | | | zigbee2mqtt | main | main | 10103 | TCP | |
| tt-rss | main | main | 10104 | TCP | | | tt-rss | main | main | 10104 | TCP | |
| collabora-online | main | main | 10105 | TCP | | | collabora-online | main | main | 10105 | TCP | |
| minio | main | main | 10106 | TCP | | | minio | api | api | 10106 | TCP | |
| minio | console | console | 10107 | TCP | | | minio | main | main | 10107 | TCP | |
| transmission | main | main | 10109 | TCP | | | transmission | main | main | 10109 | TCP | |
| anonaddy | main | main | 10110 | TCP | | | anonaddy | main | main | 10110 | TCP | |
| blog | main | main | 10111 | TCP | | | blog | main | main | 10111 | TCP | |