mirror of
https://github.com/truenas/charts.git
synced 2026-04-05 11:48:55 +08:00
upgrade minio to newer version in charts
This commit is contained in:
@@ -1,6 +0,0 @@
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
repository: minio/minio
|
||||
tag: RELEASE.2022-11-10T18-20-21Z
|
||||
runAsGroup: 473
|
||||
runAsUser: 473
|
||||
@@ -1,23 +0,0 @@
|
||||
appVolumeMounts:
|
||||
export:
|
||||
emptyDir: true
|
||||
mountPath: /export
|
||||
distributedIps: []
|
||||
distributedMode: false
|
||||
dnsConfig:
|
||||
options: []
|
||||
emptyDirVolumes: true
|
||||
environmentVariables: []
|
||||
extraAppVolumeMounts: []
|
||||
extraArgs: []
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
repository: minio/minio
|
||||
tag: RELEASE.2022-11-10T18-20-21Z
|
||||
minioDomain: null
|
||||
runAsGroup: 473
|
||||
runAsUser: 473
|
||||
service:
|
||||
consolePort: 32325
|
||||
nodePort: 32324
|
||||
updateStrategy: RollingUpdate
|
||||
@@ -1,5 +1,5 @@
|
||||
apiVersion: v1
|
||||
appVersion: '2022-11-10'
|
||||
appVersion: '2022-10-24'
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: file://../../../library/common/2207.0.0
|
||||
@@ -16,4 +16,4 @@ sources:
|
||||
- https://github.com/minio/minio
|
||||
- https://github.com/minio/charts
|
||||
upstream_version: 8.0.5
|
||||
version: 1.6.62
|
||||
version: 1.7.0
|
||||
13
charts/minio/1.7.0/ix_values.yaml
Normal file
13
charts/minio/1.7.0/ix_values.yaml
Normal file
@@ -0,0 +1,13 @@
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
repository: minio/minio
|
||||
tag: RELEASE.2022-11-10T18-20-21Z
|
||||
logSearchImage:
|
||||
pullPolicy: IfNotPresent
|
||||
repository: minio/operator
|
||||
tag: v4.5.4
|
||||
logsearchapi:
|
||||
enabled: false
|
||||
diskCapacityGB: 5
|
||||
runAsGroup: 473
|
||||
runAsUser: 473
|
||||
@@ -184,6 +184,27 @@ questions:
|
||||
$ref:
|
||||
- "definitions/certificate"
|
||||
|
||||
- variable: logsearchapi
|
||||
label: Log Search API Configuration
|
||||
description: Log Search API Configuration
|
||||
group: Minio Configuration
|
||||
schema:
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: enabled
|
||||
label: Enable Log Search API
|
||||
description: Enables Log Search API and configures MinIO to use it. It also deploys a postgres DB for it.
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
- variable: diskCapacityGB
|
||||
label: Disk Capacity in GB
|
||||
description: Capacity in GB that logs are allowed to occupy.
|
||||
schema:
|
||||
type: int
|
||||
show_if: [["enabled", "=", true]]
|
||||
default: 5
|
||||
|
||||
- variable: appVolumeMounts
|
||||
label: "Minio Storage"
|
||||
group: "Storage"
|
||||
@@ -252,6 +273,85 @@ questions:
|
||||
type: hostpath
|
||||
required: true
|
||||
|
||||
- variable: postgresAppVolumeMounts
|
||||
label: Postgres Storage
|
||||
group: Storage
|
||||
schema:
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: postgres-data
|
||||
label: Postgres Data Volume
|
||||
schema:
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: datasetName
|
||||
label: Postgres Data Volume Name
|
||||
schema:
|
||||
type: string
|
||||
hidden: true
|
||||
$ref:
|
||||
- normalize/ixVolume
|
||||
default: ix-postgres_data
|
||||
show_if: [["hostPathEnabled", "=", false]]
|
||||
editable: false
|
||||
- variable: mountPath
|
||||
label: Postgresql Data Mount Path
|
||||
description: Path where the volume will be mounted inside the pod
|
||||
schema:
|
||||
type: path
|
||||
hidden: true
|
||||
editable: false
|
||||
default: /var/lib/postgresql/data
|
||||
- variable: hostPathEnabled
|
||||
label: Enable Host Path for Postgres Data Volume
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
show_subquestions_if: true
|
||||
subquestions:
|
||||
- variable: hostPath
|
||||
label: Host Path for Postgres Data Volume
|
||||
schema:
|
||||
type: hostpath
|
||||
required: true
|
||||
immutable: true
|
||||
|
||||
- variable: postgres-backup
|
||||
label: Postgres Backup Volume
|
||||
schema:
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: datasetName
|
||||
label: Postgres Backup Volume Name
|
||||
schema:
|
||||
type: string
|
||||
hidden: true
|
||||
$ref:
|
||||
- normalize/ixVolume
|
||||
default: ix-postgres_backups
|
||||
show_if: [["hostPathEnabled", "=", false]]
|
||||
editable: false
|
||||
- variable: mountPath
|
||||
label: Postgresql Backup Mount Path
|
||||
description: Path where the volume will be mounted inside the pod
|
||||
schema:
|
||||
type: path
|
||||
hidden: true
|
||||
editable: false
|
||||
default: /postgres_backups
|
||||
- variable: hostPathEnabled
|
||||
label: Enable Host Path for Postgres Backup Volume
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
show_subquestions_if: true
|
||||
subquestions:
|
||||
- variable: hostPath
|
||||
label: Host Path for Postgres Backup Volume
|
||||
schema:
|
||||
type: hostpath
|
||||
required: true
|
||||
|
||||
- variable: enableResourceLimits
|
||||
label: "Enable Pod resource limits"
|
||||
group: "Resource Limits"
|
||||
34
charts/minio/1.7.0/templates/_logsearchapi.tpl
Normal file
34
charts/minio/1.7.0/templates/_logsearchapi.tpl
Normal file
@@ -0,0 +1,34 @@
|
||||
{{- define "logsearchapi.imageName" -}}
|
||||
{{- printf "%s:%s" .Values.logSearchImage.repository .Values.logSearchImage.tag -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "logsearchapi.nameSuffix" -}}
|
||||
{{- print "logsearchapi" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "logsearchapi.command" -}}
|
||||
{{- print "/logsearchapi" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "logsearchapi.secretName" -}}
|
||||
{{- print "logsearchapi-details" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "logsearchapi.envVariableConfiguration" -}}
|
||||
{{- $envList := list -}}
|
||||
{{- $secretName := (include "logsearchapi.secretName" .) -}}
|
||||
{{- $postgresSecretName := (include "postgres.secretName" .) -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "MINIO_LOG_QUERY_AUTH_TOKEN" "valueFromSecret" true "secretName" $secretName "secretKey" "queryToken") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "LOGSEARCH_AUDIT_AUTH_TOKEN" "valueFromSecret" true "secretName" $secretName "secretKey" "auditToken") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "LOGSEARCH_PG_CONN_STR" "valueFromSecret" true "secretName" $postgresSecretName "secretKey" "postgresURL") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "LOGSEARCH_DISK_CAPACITY_GB" "value" .Values.logsearchapi.diskCapacityGB) -}}
|
||||
{{- include "common.containers.environmentVariables" (dict "environmentVariables" $envList) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/* Used in the minio init container (checks that logsearchapi is available) */}}
|
||||
{{- define "logsearchapiInit.envVariableConfiguration" -}}
|
||||
{{- $envList := list -}}
|
||||
{{- $secretName := (include "logsearchapi.secretName" .) -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "apiURL" "valueFromSecret" true "secretName" $secretName "secretKey" "logQueryURL") -}}
|
||||
{{- include "common.containers.environmentVariables" (dict "environmentVariables" $envList) -}}
|
||||
{{- end -}}
|
||||
71
charts/minio/1.7.0/templates/_postgres.tpl
Normal file
71
charts/minio/1.7.0/templates/_postgres.tpl
Normal file
@@ -0,0 +1,71 @@
|
||||
{{- define "postgres.imageName" -}}
|
||||
{{- print "postgres:14.5" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "postgres.nameSuffix" -}}
|
||||
{{- print "postgres" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "postgres.secretName" -}}
|
||||
{{- print "postgres-details" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "postgres.dbName" -}}
|
||||
{{- print "logsearchapi" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "postgres.dbUser" -}}
|
||||
{{- print "logsearchapi" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Retrieve postgres backup name
|
||||
This will return a unique name based on revision and chart numbers specified.
|
||||
*/}}
|
||||
{{- define "postgres.backupName" -}}
|
||||
{{- $upgradeDict := .Values.ixChartContext.upgradeMetadata -}}
|
||||
{{- printf "postgres-backup-from-%s-to-%s-revision-%d" $upgradeDict.oldChartVersion $upgradeDict.newChartVersion (int64 $upgradeDict.preUpgradeRevision) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "postgres.envVariableConfiguration" -}}
|
||||
{{- $envList := list -}}
|
||||
{{- $secretName := (include "postgres.secretName" .) -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "POSTGRES_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "db_user") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "POSTGRES_DB" "valueFromSecret" true "secretName" $secretName "secretKey" "db_name") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "POSTGRES_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "db_password") -}}
|
||||
{{- include "common.containers.environmentVariables" (dict "environmentVariables" $envList) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "postgresBackup.envVariableConfiguration" -}}
|
||||
{{- $envList := list -}}
|
||||
{{- $secretName := (include "postgres.secretName" .) -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "POSTGRES_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "db_user") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "POSTGRES_DB" "valueFromSecret" true "secretName" $secretName "secretKey" "db_name") -}}
|
||||
{{/* PGPASSWORD is used by pg_dump */}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "PGPASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "db_password") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "pgHost" "valueFromSecret" true "secretName" $secretName "secretKey" "postgresHost") -}}
|
||||
{{- include "common.containers.environmentVariables" (dict "environmentVariables" $envList) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/* Used in the logsearchapi init container (checks that postgres is available) */}}
|
||||
{{- define "postgresInit.envVariableConfiguration" -}}
|
||||
{{- $envList := list -}}
|
||||
{{- $secretName := (include "postgres.secretName" .) -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "pgHost" "valueFromSecret" true "secretName" $secretName "secretKey" "postgresHost") -}}
|
||||
{{- $envList = mustAppend $envList (dict "name" "pguser" "valueFromSecret" true "secretName" $secretName "secretKey" "db_user") -}}
|
||||
{{- include "common.containers.environmentVariables" (dict "environmentVariables" $envList) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Retrieve postgres volume configuration
|
||||
*/}}
|
||||
{{- define "postgres.volumeConfiguration" -}}
|
||||
{{ include "common.storage.configureAppVolumes" (dict "appVolumeMounts" .Values.postgresAppVolumeMounts "emptyDirVolumes" .Values.emptyDirVolumes "ixVolumes" .Values.ixVolumes) | nindent 0 }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Retrieve postgres volume mounts configuration
|
||||
*/}}
|
||||
{{- define "postgres.volumeMountsConfiguration" -}}
|
||||
{{ include "common.storage.configureAppVolumeMountsInContainer" (dict "appVolumeMounts" .Values.postgresAppVolumeMounts ) | nindent 0 }}
|
||||
{{- end -}}
|
||||
15
charts/minio/1.7.0/templates/backup-postgres-config.yaml
Normal file
15
charts/minio/1.7.0/templates/backup-postgres-config.yaml
Normal file
@@ -0,0 +1,15 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: postgres-backup-hook-config-map
|
||||
annotations:
|
||||
rollme: {{ randAlphaNum 5 | quote }}
|
||||
data:
|
||||
entrypoint.sh: |-
|
||||
#!/bin/sh
|
||||
cmd="/docker-entrypoint.sh postgres"
|
||||
eval "${cmd}" & disown;
|
||||
until pg_isready -U "$POSTGRES_USER" -h "$pgHost"; do
|
||||
sleep 5;
|
||||
done;
|
||||
pg_dump -U "$POSTGRES_USER" -d "$POSTGRES_DB" -h "$pgHost" -f /postgres_backups/$BACKUP_NAME.sql;
|
||||
40
charts/minio/1.7.0/templates/backup-postgres-hook.yaml
Normal file
40
charts/minio/1.7.0/templates/backup-postgres-hook.yaml
Normal file
@@ -0,0 +1,40 @@
|
||||
{{- if .Values.logsearchapi.enabled -}}
|
||||
{{- if .Values.ixChartContext.isUpgrade -}}
|
||||
{{ $values := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $values "common" (dict "nameSuffix" (include "postgres.nameSuffix" .)) }}
|
||||
apiVersion: batch/v1
|
||||
kind: Job
|
||||
metadata:
|
||||
name: pre-upgrade-hook
|
||||
annotations:
|
||||
"helm.sh/hook": pre-upgrade
|
||||
"helm.sh/hook-weight": "1"
|
||||
"helm.sh/hook-delete-policy": hook-succeeded
|
||||
rollme: {{ randAlphaNum 5 | quote }}
|
||||
spec:
|
||||
template:
|
||||
metadata:
|
||||
name: pre-upgrade-hook
|
||||
spec:
|
||||
restartPolicy: Never
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}-postgres-backup
|
||||
image: {{ include "postgres.imageName" . }}
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
env: {{ include "postgresBackup.envVariableConfiguration" $values | nindent 10 }}
|
||||
- name: BACKUP_NAME
|
||||
value: {{ include "postgres.backupName" . }}
|
||||
volumeMounts: {{ include "postgres.volumeMountsConfiguration" $values | nindent 10 }}
|
||||
- name: backup-script-configmap
|
||||
mountPath: /bin/backup_entrypoint.sh
|
||||
readOnly: true
|
||||
subPath: entrypoint.sh
|
||||
command:
|
||||
- /bin/backup_entrypoint.sh
|
||||
volumes: {{ include "postgres.volumeConfiguration" $values | nindent 8 }}
|
||||
- name: backup-script-configmap
|
||||
configMap:
|
||||
defaultMode: 0700
|
||||
name: postgres-backup-hook-config-map
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
@@ -1,4 +1,6 @@
|
||||
{{ include "common.storage.hostPathValidate" .Values }}
|
||||
{{ $logsearchValues := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $logsearchValues "common" (dict "nameSuffix" (include "logsearchapi.nameSuffix" .)) }}
|
||||
apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
|
||||
kind: Deployment
|
||||
metadata:
|
||||
@@ -32,6 +34,17 @@ spec:
|
||||
runAsGroup: {{ .Values.runAsGroup }}
|
||||
serviceAccountName: {{ include "common.names.serviceAccountName" . | quote }}
|
||||
hostNetwork: {{ include "minio.hostNetworking" . }}
|
||||
{{ if .Values.logsearchapi.enabled }}
|
||||
initContainers:
|
||||
- name: {{ .Chart.Name }}-waitapi
|
||||
image: alpine/curl
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
env: {{ include "logsearchapiInit.envVariableConfiguration" $logsearchValues | nindent 10 }}
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- "until curl $apiURL/status; do sleep 2; done"
|
||||
{{ end }}
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}
|
||||
{{ include "common.resources.limitation" . | nindent 10 }}
|
||||
@@ -60,6 +73,18 @@ spec:
|
||||
{{ end }}
|
||||
{{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }}
|
||||
{{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }}
|
||||
{{ if .Values.logsearchapi.enabled }}
|
||||
{{/*
|
||||
We can put any ID we want here. Just make sure it's unique
|
||||
It can be rolled on each startup without problems, or se can set a static one.
|
||||
*/}}
|
||||
{{ $webhookID := (printf "ix-%v" (randAlphaNum 5)) }}
|
||||
{{ $logsearchSecretName := (include "logsearchapi.secretName" .) }}
|
||||
{{ $envList = mustAppend $envList (dict "name" "MINIO_LOG_QUERY_AUTH_TOKEN" "valueFromSecret" true "secretName" $logsearchSecretName "secretKey" "queryToken") }}
|
||||
{{ $envList = mustAppend $envList (dict "name" "MINIO_LOG_QUERY_URL" "valueFromSecret" true "secretName" $logsearchSecretName "secretKey" "logQueryURL") }}
|
||||
{{ $envList = mustAppend $envList (dict "name" (printf "MINIO_AUDIT_WEBHOOK_ENDPOINT_%v" $webhookID) "valueFromSecret" true "secretName" $logsearchSecretName "secretKey" "webhookURL") }}
|
||||
{{ $envList = mustAppend $envList (dict "name" (printf "MINIO_AUDIT_WEBHOOK_ENABLE_%v" $webhookID) "value" "on") }}
|
||||
{{ end }}
|
||||
{{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }}
|
||||
{{ include "common.networking.dnsConfiguration" .Values | nindent 6 }}
|
||||
volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
|
||||
51
charts/minio/1.7.0/templates/logsearchapi-deployment.yaml
Normal file
51
charts/minio/1.7.0/templates/logsearchapi-deployment.yaml
Normal file
@@ -0,0 +1,51 @@
|
||||
{{ if .Values.logsearchapi.enabled }}
|
||||
{{ $values := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $values "common" (dict "nameSuffix" (include "logsearchapi.nameSuffix" .)) }}
|
||||
{{ $pg_values := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $pg_values "common" (dict "nameSuffix" (include "postgres.nameSuffix" .)) }}
|
||||
{{ include "common.deployment.common_config" $values | nindent 0 }}
|
||||
spec: {{ include "common.deployment.common_spec" $values | nindent 2 }}
|
||||
template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }}
|
||||
spec:
|
||||
initContainers:
|
||||
- name: {{ .Chart.Name }}-{{ include "logsearchapi.nameSuffix" . }}-waitdb
|
||||
image: {{ include "postgres.imageName" . }}
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
env: {{ include "postgresInit.envVariableConfiguration" $pg_values | nindent 10 }}
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- 'until pg_isready -U "$pgUser" -h "$pgHost"; do sleep 2; done'
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}-{{ include "logsearchapi.nameSuffix" . }}
|
||||
image: {{ include "logsearchapi.imageName" . }}
|
||||
imagePullPolicy: {{ .Values.logSearchImage.pullPolicy }}
|
||||
env: {{ include "logsearchapi.envVariableConfiguration" $values | nindent 10 }}
|
||||
command:
|
||||
- {{ include "logsearchapi.command" . }}
|
||||
ports:
|
||||
- name: logsearchapi
|
||||
containerPort: 8080
|
||||
protocol: TCP
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /status
|
||||
port: 8080
|
||||
failureThreshold: 5
|
||||
periodSeconds: 15
|
||||
initialDelaySeconds: 15
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /status
|
||||
port: 8080
|
||||
failureThreshold: 5
|
||||
periodSeconds: 15
|
||||
initialDelaySeconds: 15
|
||||
startupProbe:
|
||||
httpGet:
|
||||
path: /status
|
||||
port: 8080
|
||||
failureThreshold: 5
|
||||
periodSeconds: 15
|
||||
initialDelaySeconds: 15
|
||||
{{ end }}
|
||||
25
charts/minio/1.7.0/templates/logsearchapi-secret.yaml
Normal file
25
charts/minio/1.7.0/templates/logsearchapi-secret.yaml
Normal file
@@ -0,0 +1,25 @@
|
||||
{{ if .Values.logsearchapi.enabled }}
|
||||
{{ $logSearchValues := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $logSearchValues "common" (dict "nameSuffix" (include "logsearchapi.nameSuffix" .)) }}
|
||||
|
||||
{{ $auditToken := randAlphaNum 32 | b64enc }}
|
||||
{{ $queryToken := randAlphaNum 32 | b64enc }}
|
||||
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ include "logsearchapi.secretName" . }}
|
||||
data:
|
||||
{{ with (lookup "v1" "Secret" .Release.Namespace (include "logsearchapi.secretName" .)) }}
|
||||
{{ $auditToken = (index .data "auditToken") }}
|
||||
{{ end }}
|
||||
auditToken: {{ $auditToken }}
|
||||
|
||||
{{ with (lookup "v1" "Secret" .Release.Namespace (include "logsearchapi.secretName" .)) }}
|
||||
{{ $queryToken = (index .data "queryToken") }}
|
||||
{{ end }}
|
||||
queryToken: {{ $queryToken }}
|
||||
|
||||
logQueryURL: {{ (printf "http://%v:8080" (include "common.names.fullname" $logSearchValues)) | b64enc }}
|
||||
webhookURL: {{ (printf "http://%v:8080/api/ingest?token=%v" (include "common.names.fullname" $logSearchValues) ($auditToken | b64dec)) | b64enc }}
|
||||
{{ end }}
|
||||
6
charts/minio/1.7.0/templates/logsearchapi-service.yaml
Normal file
6
charts/minio/1.7.0/templates/logsearchapi-service.yaml
Normal file
@@ -0,0 +1,6 @@
|
||||
{{ $ports := list }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "logsearchapi-tcp" "port" 8080 "targetPort" 8080) }}
|
||||
{{ $values := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $values "common" (dict "nameSuffix" (include "logsearchapi.nameSuffix" .)) }}
|
||||
{{ $_1 := set $values "commonService" (dict "type" "ClusterIP" "ports" $ports ) }}
|
||||
{{ include "common.classes.service" $values }}
|
||||
56
charts/minio/1.7.0/templates/postgres-deployment.yaml
Normal file
56
charts/minio/1.7.0/templates/postgres-deployment.yaml
Normal file
@@ -0,0 +1,56 @@
|
||||
{{ if .Values.logsearchapi.enabled }}
|
||||
{{ $values := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $values "common" (dict "nameSuffix" (include "postgres.nameSuffix" .)) }}
|
||||
{{ include "common.deployment.common_config" $values | nindent 0 }}
|
||||
spec:
|
||||
replicas: {{ (default 1 .Values.replicas) }}
|
||||
strategy:
|
||||
type: Recreate
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ template "common.names.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }}
|
||||
spec:
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}-{{ include "postgres.nameSuffix" .}}
|
||||
image: {{ template "postgres.imageName" . }}
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
env: {{ include "postgres.envVariableConfiguration" $values | nindent 10 }}
|
||||
volumeMounts: {{ include "postgres.volumeMountsConfiguration" $values | nindent 10 }}
|
||||
ports:
|
||||
- name: postgres-tcp
|
||||
containerPort: 5432
|
||||
protocol: TCP
|
||||
readinessProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- "until pg_isready -U${POSTGRES_USER} -h localhost; do sleep 2; done"
|
||||
initialDelaySeconds: 15
|
||||
failureThreshold: 5
|
||||
periodSeconds: 15
|
||||
timeoutSeconds: 2
|
||||
livenessProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- "until pg_isready -U${POSTGRES_USER} -h localhost; do sleep 2; done"
|
||||
initialDelaySeconds: 15
|
||||
failureThreshold: 5
|
||||
periodSeconds: 15
|
||||
timeoutSeconds: 2
|
||||
startupProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- "until pg_isready -U${POSTGRES_USER} -h localhost; do sleep 2; done"
|
||||
initialDelaySeconds: 15
|
||||
failureThreshold: 20
|
||||
periodSeconds: 15
|
||||
timeoutSeconds: 2
|
||||
volumes: {{ include "postgres.volumeConfiguration" $values | nindent 8 }}
|
||||
{{ end }}
|
||||
22
charts/minio/1.7.0/templates/postgres-secret.yaml
Normal file
22
charts/minio/1.7.0/templates/postgres-secret.yaml
Normal file
@@ -0,0 +1,22 @@
|
||||
{{ if .Values.logsearchapi.enabled }}
|
||||
{{ $pgValues := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $pgValues "common" (dict "nameSuffix" (include "postgres.nameSuffix" .)) }}
|
||||
|
||||
{{ $dbPass := randAlphaNum 32 | b64enc }}
|
||||
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ include "postgres.secretName" . }}
|
||||
data:
|
||||
{{ with (lookup "v1" "Secret" .Release.Namespace (include "postgres.secretName" .)) }}
|
||||
{{ $dbPass = (index .data "db_password") }}
|
||||
{{ end }}
|
||||
db_password: {{ $dbPass }}
|
||||
|
||||
db_user: {{ include "postgres.dbUser" . | b64enc }}
|
||||
db_name: {{ include "postgres.dbName" . | b64enc }}
|
||||
|
||||
postgresURL: {{ printf "postgres://%v:%v@%v:5432/%v?sslmode=disable" (include "postgres.dbUser" .) ($dbPass | b64dec) (include "common.names.fullname" $pgValues) (include "postgres.dbName" .) | b64enc }}
|
||||
postgresHost: {{ printf "%v" (include "common.names.fullname" $pgValues) | b64enc }}
|
||||
{{ end }}
|
||||
6
charts/minio/1.7.0/templates/postgres-service.yaml
Normal file
6
charts/minio/1.7.0/templates/postgres-service.yaml
Normal file
@@ -0,0 +1,6 @@
|
||||
{{ $ports := list }}
|
||||
{{ $ports = mustAppend $ports (dict "name" "postgres-tcp" "port" 5432 "targetPort" 5432) }}
|
||||
{{ $values := (. | mustDeepCopy) }}
|
||||
{{ $_ := set $values "common" (dict "nameSuffix" (include "postgres.nameSuffix" .)) }}
|
||||
{{ $_1 := set $values "commonService" (dict "type" "ClusterIP" "ports" $ports ) }}
|
||||
{{ include "common.classes.service" $values }}
|
||||
45
charts/minio/1.7.0/test_values.yaml
Normal file
45
charts/minio/1.7.0/test_values.yaml
Normal file
@@ -0,0 +1,45 @@
|
||||
appVolumeMounts:
|
||||
export:
|
||||
emptyDir: true
|
||||
mountPath: /export
|
||||
postgresAppVolumeMounts:
|
||||
postgres-backup:
|
||||
emptyDir: true
|
||||
mountPath: /postgres_backups
|
||||
postgres-data:
|
||||
emptyDir: true
|
||||
mountPath: /var/lib/postgresql/data
|
||||
postgresql:
|
||||
backupVolume:
|
||||
datasetName: ix-postgres_backups
|
||||
mountPath: /postgres_backups
|
||||
dataVolume:
|
||||
datasetName: ix-postgres_data
|
||||
mountPath: /var/lib/postgresql/data
|
||||
ixChartContext: {}
|
||||
distributedIps: []
|
||||
distributedMode: false
|
||||
dnsConfig:
|
||||
options: []
|
||||
emptyDirVolumes: true
|
||||
environmentVariables: []
|
||||
extraAppVolumeMounts: []
|
||||
extraArgs: []
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
repository: minio/minio
|
||||
tag: RELEASE.2022-10-24T18-35-07Z
|
||||
logSearchImage:
|
||||
pullPolicy: IfNotPresent
|
||||
repository: minio/operator
|
||||
tag: v4.5.4
|
||||
logsearchapi:
|
||||
enabled: true
|
||||
diskCapacityGB: 5
|
||||
minioDomain: null
|
||||
runAsGroup: 473
|
||||
runAsUser: 473
|
||||
service:
|
||||
consolePort: 32325
|
||||
nodePort: 32324
|
||||
updateStrategy: RollingUpdate
|
||||
Reference in New Issue
Block a user