From d4915a0fc05e2abb9381467a3d498b881f0af33b Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Sat, 6 Feb 2021 21:50:54 +0500 Subject: [PATCH 01/13] Update feature capability json --- features_capability.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/features_capability.json b/features_capability.json index 0a18d90692..6c65fe8262 100644 --- a/features_capability.json +++ b/features_capability.json @@ -22,5 +22,13 @@ "definitions/nodeIP": { "stable": {"min": "20.12-ALPHA"}, "nightlies": {"min": "20.12-MASTER"} + }, + "definitions/certificate": { + "stable": {"min": "21.02-ALPHA"}, + "nightlies": {"min": "21.02-MASTER"} + }, + "definitions/certificate_authority": { + "stable": {"min": "21.02-ALPHA"}, + "nightlies": {"min": "21.02-MASTER"} } -} \ No newline at end of file +} From 85ffa7530dcfafad4627cee56b205ccbe830f6e7 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Sat, 6 Feb 2021 21:55:40 +0500 Subject: [PATCH 02/13] Update minio version --- test/minio/1.2.0/.helmignore | 23 +++ test/minio/1.2.0/Chart.yaml | 19 ++ test/minio/1.2.0/README.md | 48 +++++ test/minio/1.2.0/app-readme.md | 1 + test/minio/1.2.0/charts/common-2101.0.0.tgz | Bin 0 -> 4091 bytes test/minio/1.2.0/default_values.yaml | 22 +++ test/minio/1.2.0/migrations/migrate | 28 +++ test/minio/1.2.0/questions.yaml | 181 ++++++++++++++++++ test/minio/1.2.0/requirements.lock | 6 + test/minio/1.2.0/templates/NOTES.txt | 2 + test/minio/1.2.0/templates/_helpers.tpl | 6 + test/minio/1.2.0/templates/deployment.yaml | 46 +++++ test/minio/1.2.0/templates/secrets.yaml | 9 + test/minio/1.2.0/templates/service.yaml | 10 + .../minio/1.2.0/templates/serviceaccount.yaml | 1 + test/minio/1.2.0/test_values.yaml | 23 +++ test/minio/1.2.0/values.yaml | 0 17 files changed, 425 insertions(+) create mode 100644 test/minio/1.2.0/.helmignore create mode 100644 test/minio/1.2.0/Chart.yaml create mode 100755 test/minio/1.2.0/README.md create mode 100644 test/minio/1.2.0/app-readme.md create mode 100644 test/minio/1.2.0/charts/common-2101.0.0.tgz create mode 100644 test/minio/1.2.0/default_values.yaml create mode 100755 test/minio/1.2.0/migrations/migrate create mode 100644 test/minio/1.2.0/questions.yaml create mode 100644 test/minio/1.2.0/requirements.lock create mode 100644 test/minio/1.2.0/templates/NOTES.txt create mode 100644 test/minio/1.2.0/templates/_helpers.tpl create mode 100644 test/minio/1.2.0/templates/deployment.yaml create mode 100644 test/minio/1.2.0/templates/secrets.yaml create mode 100644 test/minio/1.2.0/templates/service.yaml create mode 100644 test/minio/1.2.0/templates/serviceaccount.yaml create mode 100644 test/minio/1.2.0/test_values.yaml create mode 100644 test/minio/1.2.0/values.yaml diff --git a/test/minio/1.2.0/.helmignore b/test/minio/1.2.0/.helmignore new file mode 100644 index 0000000000..a9fe727881 --- /dev/null +++ b/test/minio/1.2.0/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +# OWNERS file for Kubernetes +OWNERS \ No newline at end of file diff --git a/test/minio/1.2.0/Chart.yaml b/test/minio/1.2.0/Chart.yaml new file mode 100644 index 0000000000..24b8727508 --- /dev/null +++ b/test/minio/1.2.0/Chart.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +description: High Performance, Kubernetes Native Object Storage +name: minio +version: 1.2.0 +appVersion: master +keywords: +- storage +- object-storage +- S3 +home: https://min.io +icon: https://min.io/resources/img/logo/MINIO_wordmark.png +sources: +- https://github.com/minio/minio +- https://github.com/minio/charts +upstream_version: 8.0.5 +dependencies: + - name: common + repository: file://../../../library/common/2101.0.0 + version: 2101.0.0 diff --git a/test/minio/1.2.0/README.md b/test/minio/1.2.0/README.md new file mode 100755 index 0000000000..e1eaee7605 --- /dev/null +++ b/test/minio/1.2.0/README.md @@ -0,0 +1,48 @@ +MinIO +===== + +[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. + +MinIO supports [distributed mode](https://docs.minio.io/docs/distributed-minio-quickstart-guide). In distributed mode, you can pool multiple drives (even on different machines) into a single object storage server. + +For more detailed documentation please visit [here](https://docs.minio.io/) + +Introduction +------------ + +This chart bootstraps MinIO deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + + +Configuration +------------- + +The following table lists the configurable parameters of the MinIO chart and their default values. + +| Parameter | Description | Default | +|:-------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------| +| `image.repository` | Image repository | `minio/minio` | +| `image.tag` | MinIO image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/). | `RELEASE.2020-11-06T23-17-07Z` | +| `image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `extraArgs` | Additional command line arguments to pass to the MinIO server | `[]` | +| `accessKey` | Default access key (5 to 20 characters) | random 20 chars | +| `secretKey` | Default secret key (8 to 40 characters) | random 40 chars | +| `persistence.enabled` | Use persistent volume to store data | `true` | +| `persistence.size` | Size of persistent volume claim | `500Gi` | +| `persistence.existingClaim` | Use an existing PVC to persist data | `nil` | +| `persistence.storageClass` | Storage class name of PVC | `nil` | +| `persistence.accessMode` | ReadWriteOnce or ReadOnly | `ReadWriteOnce` | +| `persistence.subPath` | Mount a sub directory of the persistent volume if set | `""` | +| `environment` | Set MinIO server relevant environment variables in `values.yaml` file. MinIO containers will be passed these variables when they start. | `MINIO_STORAGE_CLASS_STANDARD: EC:4"` | + +Some parameters above map to the env variables defined in the [MinIO DockerHub image](https://hub.docker.com/r/minio/minio/). + +Pass environment variables to MinIO containers +---------------------------------------------- + +To pass environment variables to MinIO containers when deploying via Helm chart, use the below command line format + +```bash +$ helm install --set environment.MINIO_BROWSER=on,environment.MINIO_DOMAIN=domain-name minio/minio +``` + +You can add as many environment variables as required, using the above format. Just add `environment.=` under `set` flag. diff --git a/test/minio/1.2.0/app-readme.md b/test/minio/1.2.0/app-readme.md new file mode 100644 index 0000000000..246e247c39 --- /dev/null +++ b/test/minio/1.2.0/app-readme.md @@ -0,0 +1 @@ +[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. diff --git a/test/minio/1.2.0/charts/common-2101.0.0.tgz b/test/minio/1.2.0/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..3a22457ea69f5da42b01b6548f9d39e6eed25924 GIT binary patch literal 4091 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 literal 0 HcmV?d00001 diff --git a/test/minio/1.2.0/default_values.yaml b/test/minio/1.2.0/default_values.yaml new file mode 100644 index 0000000000..7afa31dc0d --- /dev/null +++ b/test/minio/1.2.0/default_values.yaml @@ -0,0 +1,22 @@ +## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the +## +image: + repository: minio/minio + tag: RELEASE.2020-11-19T23-48-16Z + pullPolicy: IfNotPresent + +## Additional arguments to pass to minio binary +extraArgs: [] + +updateStrategy: RollingUpdate + +service: + nodePort: 9000 + +environment: + ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html + +appVolumeMounts: + export: + emptyDir: true + mountPath: "/export" diff --git a/test/minio/1.2.0/migrations/migrate b/test/minio/1.2.0/migrations/migrate new file mode 100755 index 0000000000..d9772faa1d --- /dev/null +++ b/test/minio/1.2.0/migrations/migrate @@ -0,0 +1,28 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + if values.get('appVolumeMounts'): + return values + + values.update({ + 'appVolumeMounts': { + 'export': { + 'hostPathEnabled': values['minioHostPathEnabled'], + **({'hostPath': values['minioHostPath']} if values.get('minioHostPath') else {}) + }, + }, + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/test/minio/1.2.0/questions.yaml b/test/minio/1.2.0/questions.yaml new file mode 100644 index 0000000000..e4753328ae --- /dev/null +++ b/test/minio/1.2.0/questions.yaml @@ -0,0 +1,181 @@ +groups: + - name: "Container Images" + description: "Image to be used for container" + - name: "Workload Configuration" + description: "Configure workload deployment" + - name: "Storage" + description: "Configure Storage for Nextcloud" + - name: "Minio Configuration" + description: "Configure Minio credentials" + +portals: + web_portal: + protocols: + - "http" + host: + - "$node_ip" + ports: + - "$variable-service.nodePort" + +questions: + # Image related + - variable: image + description: "Docker Image Details" + label: "Docker Image" + group: "Container Images" + schema: + type: dict + required: true + attrs: + - variable: repository + description: "Docker image repository" + label: "Image repository" + schema: + type: string + default: "minio/minio" + required: true + - variable: tag + description: "Tag to use for specified image" + label: "Image Tag" + schema: + type: string + default: "RELEASE.2020-11-19T23-48-16Z" + - variable: pullPolicy + description: "Docker Image Pull Policy" + label: "Image Pull Policy" + schema: + type: string + default: "IfNotPresent" + enum: + - value: "IfNotPresent" + description: "Only pull image if not present on host" + - value: "Always" + description: "Always pull image even if present on host" + - value: "Never" + description: "Never pull image even if it's not present on host" + + - variable: updateStrategy + label: "Minio update strategy" + group: "Workload Configuration" + schema: + type: string + default: "RollingUpdate" + enum: + - value: "RollingUpdate" + description: "Create new pods and then kill old ones" + - value: "Recreate" + description: "Kill existing pods before creating new ones" + + - variable: extraArgs + label: "Minio Extra Arguments" + group: "Minio Configuration" + schema: + type: list + default: [] + items: + - variable: arg + label: "Argument" + schema: + type: string + + - variable: accessKey + label: "Access Key" + group: "Minio Configuration" + description: "Enter the S3 access ID" + schema: + type: string + private: true + required: true + min_length: 5 + max_length: 20 + + - variable: secretKey + label: "Secret Key" + group: "Minio Configuration" + description: "Enter the S3 secret access key" + schema: + type: string + private: true + required: true + min_length: 8 + max_length: 40 + + - variable: environmentVariables + label: "Minio image environment" + group: "Minio Configuration" + schema: + type: list + default: [] + items: + - variable: environmentVariable + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string + + - variable: service + description: "Minio Service Configuration" + label: "Minio Service Configuration" + group: "Minio Configuration" + schema: + type: dict + required: true + attrs: + - variable: nodePort + label: "Node Port to use for Minio" + schema: + type: int + min: 9000 + max: 65535 + default: 9000 + required: true + + - variable: appVolumeMounts + label: "Minio Storage" + group: "Storage" + schema: + type: dict + attrs: + - variable: export + label: "Data Volume" + schema: + type: dict + attrs: + - variable: datasetName + label: "Minio Data Volume Name" + schema: + type: string + hidden: true + $ref: + - "normalize/ixVolume" + show_if: [["hostPathEnabled", "=", false]] + default: "ix-minio" + editable: false + - variable: mountPath + label: "Minio Data Mount Path" + description: "Path where the volume will be mounted inside the pod" + schema: + type: path + hidden: true + editable: false + default: "/export" + - variable: hostPathEnabled + label: "Enable Host Path for Minio Data Volume" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: hostPath + label: "Host Path for Minio Data Volume" + schema: + type: hostpath + required: true diff --git a/test/minio/1.2.0/requirements.lock b/test/minio/1.2.0/requirements.lock new file mode 100644 index 0000000000..74ceebcbc1 --- /dev/null +++ b/test/minio/1.2.0/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2101.0.0 + version: 2101.0.0 +digest: sha256:6ab46f958de11ae6a24d8f7e18417aa9852a8d968d5b0cc94ffa4700449931d6 +generated: "2021-02-04T01:15:55.416388+05:00" diff --git a/test/minio/1.2.0/templates/NOTES.txt b/test/minio/1.2.0/templates/NOTES.txt new file mode 100644 index 0000000000..88e8e93ef8 --- /dev/null +++ b/test/minio/1.2.0/templates/NOTES.txt @@ -0,0 +1,2 @@ +Minio can be accessed from the following URL: +http://$node_ip:{{ .Values.service.nodePort }}/ diff --git a/test/minio/1.2.0/templates/_helpers.tpl b/test/minio/1.2.0/templates/_helpers.tpl new file mode 100644 index 0000000000..c769c2fb2a --- /dev/null +++ b/test/minio/1.2.0/templates/_helpers.tpl @@ -0,0 +1,6 @@ +{{/* +Determine secret name. +*/}} +{{- define "minio.secretName" -}} +{{- include "common.names.fullname" . -}} +{{- end -}} diff --git a/test/minio/1.2.0/templates/deployment.yaml b/test/minio/1.2.0/templates/deployment.yaml new file mode 100644 index 0000000000..aed4ad032b --- /dev/null +++ b/test/minio/1.2.0/templates/deployment.yaml @@ -0,0 +1,46 @@ +{{ $scheme := "http" }} +apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} +kind: Deployment +metadata: + name: {{ template "common.names.fullname" . }} + labels: + app: {{ template "common.names.name" . }} + chart: {{ template "common.names.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: {{ (default 1 .Values.replicas) }} + strategy: + type: {{ (default "Recreate" .Values.updateStrategy ) }} + selector: + matchLabels: + app: {{ template "common.names.name" . }} + release: {{ .Release.Name }} + template: + metadata: + name: {{ template "common.names.fullname" . }} + labels: + app: {{ template "common.names.name" . }} + release: {{ .Release.Name }} + {{- include "common.labels.selectorLabels" . | nindent 8 }} + annotations: {{ include "common.annotations" . | nindent 8 }} + spec: + serviceAccountName: {{ include "common.names.serviceAccountName" . | quote }} + containers: + - name: {{ .Chart.Name }} + {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} + {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} + command: + - "/bin/sh" + - "-ce" + - "/usr/bin/docker-entrypoint.sh minio server /export {{ (.Values.extraArgs | default list) | join " " }}" + ports: + - name: {{ $scheme }} + containerPort: 9000 + env: + {{ $secretName := (include "minio.secretName" .) }} + {{ $envList := (default list .Values.environment) }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_ACCESS_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} + {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} +{{ include "common.storage.allAppVolumes" .Values | nindent 6 }} diff --git a/test/minio/1.2.0/templates/secrets.yaml b/test/minio/1.2.0/templates/secrets.yaml new file mode 100644 index 0000000000..f44495e5e1 --- /dev/null +++ b/test/minio/1.2.0/templates/secrets.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "minio.secretName" . }} + labels: {{ include "common.labels" . | nindent 4 }} +type: Opaque +data: + accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} + secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} diff --git a/test/minio/1.2.0/templates/service.yaml b/test/minio/1.2.0/templates/service.yaml new file mode 100644 index 0000000000..34e44be851 --- /dev/null +++ b/test/minio/1.2.0/templates/service.yaml @@ -0,0 +1,10 @@ +{{ $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" "http" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }} +{{ $params := . }} +{{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }} +{{ $_1 := set .Values "extraSelectorLabels" $selectors }} +{{ include "common.classes.service" $params }} diff --git a/test/minio/1.2.0/templates/serviceaccount.yaml b/test/minio/1.2.0/templates/serviceaccount.yaml new file mode 100644 index 0000000000..12bd3f4a39 --- /dev/null +++ b/test/minio/1.2.0/templates/serviceaccount.yaml @@ -0,0 +1 @@ +{{ include "common.serviceaccount" . }} diff --git a/test/minio/1.2.0/test_values.yaml b/test/minio/1.2.0/test_values.yaml new file mode 100644 index 0000000000..383d0bbdd5 --- /dev/null +++ b/test/minio/1.2.0/test_values.yaml @@ -0,0 +1,23 @@ +## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the +## +image: + repository: minio/minio + tag: RELEASE.2020-11-19T23-48-16Z + pullPolicy: IfNotPresent + +## Additional arguments to pass to minio binary +extraArgs: [] + +updateStrategy: RollingUpdate + +service: + nodePort: 32001 + +environmentVariables: [] + ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html + +emptyDirVolumes: true +appVolumeMounts: + export: + emptyDir: true + mountPath: "/export" diff --git a/test/minio/1.2.0/values.yaml b/test/minio/1.2.0/values.yaml new file mode 100644 index 0000000000..e69de29bb2 From 17078844c568bdd8a24d343288dde5575d0a66a3 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Sat, 6 Feb 2021 22:39:44 +0500 Subject: [PATCH 03/13] Specify minio cert in questions --- test/minio/1.2.0/questions.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/minio/1.2.0/questions.yaml b/test/minio/1.2.0/questions.yaml index e4753328ae..b0695e5228 100644 --- a/test/minio/1.2.0/questions.yaml +++ b/test/minio/1.2.0/questions.yaml @@ -138,6 +138,15 @@ questions: default: 9000 required: true + - variable: certificate + description: "Minio Certificate" + label: "Minio Certificate" + group: "Minio Configuration" + schema: + type: int + $ref: + - "definitions/certificate" + - variable: appVolumeMounts label: "Minio Storage" group: "Storage" From eaad608b764d638aad40da4beb170e6a4d74c207 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Sat, 6 Feb 2021 23:09:03 +0500 Subject: [PATCH 04/13] Add library function to retrieve certificates --- .../templates/lib/resources/_certs.tpl | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 library/common/2101.0.0/templates/lib/resources/_certs.tpl diff --git a/library/common/2101.0.0/templates/lib/resources/_certs.tpl b/library/common/2101.0.0/templates/lib/resources/_certs.tpl new file mode 100644 index 0000000000..740920d6f9 --- /dev/null +++ b/library/common/2101.0.0/templates/lib/resources/_certs.tpl @@ -0,0 +1,25 @@ +{{/* +Retrieve true/false if certificate is available in ixCertificates +*/}} +{{- define "common.resources.cert_present" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} +{{- hasKey $values.ixCertificates $values.commonCertOptions.certKeyName -}} +{{- end -}} + + +{{/* +Retrieve certificate from variable name +*/}} +{{- define "common.resources.cert" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} +{{- if hasKey $values.ixCertificates $values.commonCertOptions.certKeyName -}} +{{- $cert := get $values.ixCertificates $values.commonCertOptions.certKeyName -}} +{{- if $values.commonCertOptions.publicKey -}} +{{ $cert.certificate }} +{{- else -}} +{{ $cert.privatekey }} +{{- end -}} +{{- end -}} +{{- end -}} From 31530457d078a09ccb8f5f09ee51ae4a2efec331 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Sat, 6 Feb 2021 23:09:36 +0500 Subject: [PATCH 05/13] Add configured certificate to minio secret --- test/minio/1.2.0/templates/_helpers.tpl | 30 +++++++++++++++++++++++++ test/minio/1.2.0/templates/secrets.yaml | 4 ++++ 2 files changed, 34 insertions(+) diff --git a/test/minio/1.2.0/templates/_helpers.tpl b/test/minio/1.2.0/templates/_helpers.tpl index c769c2fb2a..1aeab6171a 100644 --- a/test/minio/1.2.0/templates/_helpers.tpl +++ b/test/minio/1.2.0/templates/_helpers.tpl @@ -4,3 +4,33 @@ Determine secret name. {{- define "minio.secretName" -}} {{- include "common.names.fullname" . -}} {{- end -}} + + +{{/* +Retrieve true/false if minio certificate is configured +*/}} +{{- define "minio.certAvailable" -}} +{{- $values := (. | mustDeepCopy) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.certificate) -}} +{{- template "common.resources.cert_present" $values -}} +{{- end -}} + + +{{/* +Retrieve public key of minio certificate +*/}} +{{- define "minio.cert.publicKey" -}} +{{- $values := (. | mustDeepCopy) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.certificate "publicKey" true) -}} +{{ include "common.resources.cert" $values }} +{{- end -}} + + +{{/* +Retrieve private key of minio certificate +*/}} +{{- define "minio.cert.privateKey" -}} +{{- $values := (. | mustDeepCopy) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.certificate) -}} +{{ include "common.resources.cert" $values }} +{{- end -}} diff --git a/test/minio/1.2.0/templates/secrets.yaml b/test/minio/1.2.0/templates/secrets.yaml index f44495e5e1..26c1d2c896 100644 --- a/test/minio/1.2.0/templates/secrets.yaml +++ b/test/minio/1.2.0/templates/secrets.yaml @@ -7,3 +7,7 @@ type: Opaque data: accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} + {{- if eq (include "minio.certAvailable" .) true -}} + certPublicKey: {{ template "minio.cert.publicKey" . }} + certPrivateKey: {{ template "minio.cert.privateKey" . }} + {{- end -}} From 916fd6e62573bb5a12a5ca4e2b6aa4552c390804 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 8 Feb 2021 00:33:05 +0500 Subject: [PATCH 06/13] Mount minio configured cert inside pod using secret --- test/minio/1.2.0/templates/_cert.tpl | 25 ++++++++++++++++++++++ test/minio/1.2.0/templates/_helpers.tpl | 6 +++--- test/minio/1.2.0/templates/deployment.yaml | 7 +++--- test/minio/1.2.0/templates/secrets.yaml | 8 +++---- 4 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 test/minio/1.2.0/templates/_cert.tpl diff --git a/test/minio/1.2.0/templates/_cert.tpl b/test/minio/1.2.0/templates/_cert.tpl new file mode 100644 index 0000000000..7376b1e410 --- /dev/null +++ b/test/minio/1.2.0/templates/_cert.tpl @@ -0,0 +1,25 @@ +{{/* +Formats volumeMount for Minio tls keys and trusted certs +*/}} +{{- define "minio.tlsKeysVolumeMount" -}} +{{- if eq (include "minio.certAvailable" .) "true" -}} +- name: cert-secret-volume + mountPath: "/etc/minio/certs" +{{- end }} +{{- end -}} + +{{/* +Formats volume for Minio tls keys and trusted certs +*/}} +{{- define "minio.tlsKeysVolume" -}} +{{- if eq (include "minio.certAvailable" .) "true" -}} +- name: cert-secret-volume + secret: + secretName: {{ include "minio.secretName" . }} + items: + - key: certPublicKey + path: public.crt + - key: certPrivateKey + path: private.key +{{- end }} +{{- end -}} diff --git a/test/minio/1.2.0/templates/_helpers.tpl b/test/minio/1.2.0/templates/_helpers.tpl index 1aeab6171a..526b122225 100644 --- a/test/minio/1.2.0/templates/_helpers.tpl +++ b/test/minio/1.2.0/templates/_helpers.tpl @@ -11,7 +11,7 @@ Retrieve true/false if minio certificate is configured */}} {{- define "minio.certAvailable" -}} {{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.certificate) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} {{- template "common.resources.cert_present" $values -}} {{- end -}} @@ -21,7 +21,7 @@ Retrieve public key of minio certificate */}} {{- define "minio.cert.publicKey" -}} {{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.certificate "publicKey" true) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate "publicKey" true) -}} {{ include "common.resources.cert" $values }} {{- end -}} @@ -31,6 +31,6 @@ Retrieve private key of minio certificate */}} {{- define "minio.cert.privateKey" -}} {{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.certificate) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} {{ include "common.resources.cert" $values }} {{- end -}} diff --git a/test/minio/1.2.0/templates/deployment.yaml b/test/minio/1.2.0/templates/deployment.yaml index aed4ad032b..743268e4fc 100644 --- a/test/minio/1.2.0/templates/deployment.yaml +++ b/test/minio/1.2.0/templates/deployment.yaml @@ -1,4 +1,3 @@ -{{ $scheme := "http" }} apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} kind: Deployment metadata: @@ -29,13 +28,14 @@ spec: containers: - name: {{ .Chart.Name }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} - {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} + volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} + {{- include "minio.tlsKeysVolumeMount" . | nindent 12 }} command: - "/bin/sh" - "-ce" - "/usr/bin/docker-entrypoint.sh minio server /export {{ (.Values.extraArgs | default list) | join " " }}" ports: - - name: {{ $scheme }} + - name: http containerPort: 9000 env: {{ $secretName := (include "minio.secretName" .) }} @@ -44,3 +44,4 @@ spec: {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} {{ include "common.storage.allAppVolumes" .Values | nindent 6 }} +{{- include "minio.tlsKeysVolume" . | nindent 8 }} diff --git a/test/minio/1.2.0/templates/secrets.yaml b/test/minio/1.2.0/templates/secrets.yaml index 26c1d2c896..4085fd585b 100644 --- a/test/minio/1.2.0/templates/secrets.yaml +++ b/test/minio/1.2.0/templates/secrets.yaml @@ -7,7 +7,7 @@ type: Opaque data: accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} - {{- if eq (include "minio.certAvailable" .) true -}} - certPublicKey: {{ template "minio.cert.publicKey" . }} - certPrivateKey: {{ template "minio.cert.privateKey" . }} - {{- end -}} + {{ if eq (include "minio.certAvailable" .) "true" }} + certPublicKey: {{ (include "minio.cert.publicKey" .) | toString | b64enc | quote }} + certPrivateKey: {{ (include "minio.cert.privateKey" .) | toString | b64enc | quote }} + {{ end }} From e19d7d634345a0d06b2b12b747ca89242d301c45 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 8 Feb 2021 02:44:31 +0500 Subject: [PATCH 07/13] Configure CAs directory for minio for https access --- test/minio/1.2.0/templates/_cert.tpl | 8 ++++++++ test/minio/1.2.0/templates/deployment.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/minio/1.2.0/templates/_cert.tpl b/test/minio/1.2.0/templates/_cert.tpl index 7376b1e410..f34777f65a 100644 --- a/test/minio/1.2.0/templates/_cert.tpl +++ b/test/minio/1.2.0/templates/_cert.tpl @@ -5,6 +5,8 @@ Formats volumeMount for Minio tls keys and trusted certs {{- if eq (include "minio.certAvailable" .) "true" -}} - name: cert-secret-volume mountPath: "/etc/minio/certs" +- name: trusted-cert-secret-volume + mountPath: "/etc/minio/certs/CAs" {{- end }} {{- end -}} @@ -21,5 +23,11 @@ Formats volume for Minio tls keys and trusted certs path: public.crt - key: certPrivateKey path: private.key +- name: trusted-cert-secret-volume + secret: + secretName: {{ include "minio.secretName" . }} + items: + - key: certPublicKey + path: public.crt {{- end }} {{- end -}} diff --git a/test/minio/1.2.0/templates/deployment.yaml b/test/minio/1.2.0/templates/deployment.yaml index 743268e4fc..f6eb4c5c90 100644 --- a/test/minio/1.2.0/templates/deployment.yaml +++ b/test/minio/1.2.0/templates/deployment.yaml @@ -33,7 +33,7 @@ spec: command: - "/bin/sh" - "-ce" - - "/usr/bin/docker-entrypoint.sh minio server /export {{ (.Values.extraArgs | default list) | join " " }}" + - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server /export {{ (.Values.extraArgs | default list) | join " " }}" ports: - name: http containerPort: 9000 From a7f85c693d8100aaaeac72668ea7974cc5aa1229 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 8 Feb 2021 02:44:44 +0500 Subject: [PATCH 08/13] Consider cert key as a string in library chart --- library/common/2101.0.0/templates/lib/resources/_certs.tpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/library/common/2101.0.0/templates/lib/resources/_certs.tpl b/library/common/2101.0.0/templates/lib/resources/_certs.tpl index 740920d6f9..9e091595e9 100644 --- a/library/common/2101.0.0/templates/lib/resources/_certs.tpl +++ b/library/common/2101.0.0/templates/lib/resources/_certs.tpl @@ -4,7 +4,7 @@ Retrieve true/false if certificate is available in ixCertificates {{- define "common.resources.cert_present" -}} {{- $values := . -}} {{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} -{{- hasKey $values.ixCertificates $values.commonCertOptions.certKeyName -}} +{{- hasKey $values.Values.ixCertificates ($values.commonCertOptions.certKeyName | toString) -}} {{- end -}} @@ -14,8 +14,9 @@ Retrieve certificate from variable name {{- define "common.resources.cert" -}} {{- $values := . -}} {{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} -{{- if hasKey $values.ixCertificates $values.commonCertOptions.certKeyName -}} -{{- $cert := get $values.ixCertificates $values.commonCertOptions.certKeyName -}} +{{- $certKey := ($values.commonCertOptions.certKeyName | toString) -}} +{{- if hasKey $values.Values.ixCertificates $certKey -}} +{{- $cert := get $values.Values.ixCertificates $certKey -}} {{- if $values.commonCertOptions.publicKey -}} {{ $cert.certificate }} {{- else -}} From 19ad9ab700956bbbc7aa0078f0fd73ce3b21d0fb Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 8 Feb 2021 02:45:08 +0500 Subject: [PATCH 09/13] Updated catalog item dependencies (test train) Following items were updated: Updated nextcloud (1.2.0 versions) Updated ipfs (1.0.1 versions) Updated ix-chart (2101.0.0 versions) Updated minio (1.1.0, 1.2.0 versions) Updated plex (1.1.0 versions) --- test/ipfs/1.0.1/charts/common-2101.0.0.tgz | Bin 4091 -> 4270 bytes .../2101.0.0/charts/common-2101.0.0.tgz | Bin 4091 -> 4270 bytes test/minio/1.1.0/charts/common-2101.0.0.tgz | Bin 4091 -> 4270 bytes test/minio/1.2.0/charts/common-2101.0.0.tgz | Bin 4091 -> 4270 bytes .../1.2.0/charts/common-2101.0.0.tgz | Bin 4091 -> 4270 bytes test/plex/1.1.0/charts/common-2101.0.0.tgz | Bin 4091 -> 4270 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/test/ipfs/1.0.1/charts/common-2101.0.0.tgz b/test/ipfs/1.0.1/charts/common-2101.0.0.tgz index 3a22457ea69f5da42b01b6548f9d39e6eed25924..91e9592a566e4ebd4431c7051ef448cce7330f3c 100644 GIT binary patch delta 4250 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 delta 4069 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 delta 4069 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 delta 4069 zcmVaiCjC}Tl0rJqkArF}uf6ykzfV88{?f5LBr0gWk1;gl$n z@?pTp7>~gaR-mRC9=ndg#KGR}b$d}a>IPqW{@;4B{I77Fr9`3Z+)5M^8Y78go--Ax z?8zcw8UODe^?w@tf4IN5;s3Rij~_d)f>TWdV0Rwu)(5XT4-dh|k2{dyfHH*85KC02 zkPvnr9)g-2=>>O`CC6}W8lG5qV^ky|iW~<3Mo4`82$aQXo>ah#7t#%3dtQ<;h7iFY z@IL1X;o-qTkQs>$nCK0rNF+v=uDaejC4Ed~(R62KNPqJ#l9*zwxOlA}&3KHm1et<; zJ;|aovPA#>(i``g$_)R`Tu4_B{&k$VgMx& z2?Y9Sj+vm$XnT^Tj;De5-(jpIs1Z>>1VSv3C`^KTsz#K78lklToc53A3KUCoj_bpc z*_wh|gE2raUqH!-s!Vab@=@CPVC z$KKBFn&F(zUPjzYl)IK&Tt^eO3 zOVFtILT&3E*8+hg2`z*yNw0LBHUb(Zz<w7%r`^v%V`Kj#1Pe0`L25QmGVfbEOcEm!4;2rYJu4&zxmDS zRoS{!(Aqed3)Cs1V)?Zuie}~gHf%AjoH~k_t>1PE3BXm^0i9g06n9NvJJY28^nZ;? z#BZz2$p4h~J6gMUZapLGIpu%1ceK}(|A)I9`M;Lp`+x4axJx-neCv9yaQE66kuG?e zS_vlzOHR^kL@x6&9Qclyzn}-@>n@AymQqWeiyQ3bGa@fhz?NU}_JCcSXR z&l)@iL(Eb>9T(qpk3_NT`0O}dE240ar;lGpX?w0?B|ja@Sa9}^_ZMNrsGK8%b>xVq1-a@|KJW96jGR{-rS&!W4$kAk5>8ByLT6Ap^c;F&Hh zhG{F5F=1qg$xeS-k2N|+NWH(2v)2~+C#~wt6700%wY`5HdE1`Ad(us$n(QgwJf+ncLKsk%yaDUH6giMST!kus% z9v#x*=F;2YeCCLa+$Zp7U)iyKDf1t)w%u1 zwQo8VYL1ZRR`{~eBtvP*N0I~xNCQ+0)q2xnQ7dW(Dna7>tjU&HeWGYwjawT`+7J{o z%v!Bdv26`7jep)PY`t;be4VA;{x^CJh3woSn^3`-_Kkkxr@*rO&!hd_y8XY~J?d`! zKWiy|{)e~KFd>4Hev0#*z9o%BUca}tnN`OCc51tmteMm=kS@M;g^y1 z{J8dFx|Z#^$xmA|r^jcPs}%!}yscZU!D3FixAmTj=`wz<4N~P!b{AV(OZTDR&`hAj z1?NpX)PG2tp8x50#moGiy9LN5?T1m8(w{@j&xKvI2aDzZQvFZIWcb8GAj|T94)$i^ z|NEQx|9Xmx2@8r71ijf1b2gyET>*Y&<8JARXF%2P9WEeu2 zzd1zZ&7I%x_xC{{kh?#goo~ zE#v>agTto%-#gs!|5{3&|9`srZ#eb2e-(ZoW_hj8LZEc^cN&D{TRba-&M;s14%I{$mFXLq)6 zu73pZa^_rH!}+bJ63f%2^ABb=&S^jSB$wyvEhi{2OKD7GM=C)S4yPRlZk2hOnp>G+ zY;&G1IE`-^#_W|2boX9|UEGkz{#m`UQ}_nW3EHsioo9s=bZxtV0pcBa8xs|eUO(@G zc@&ZHtZjMCT$< z&WM=Kza6U0iMQAdIM8`LTg|)%>+;*4eN*}VymZ1bm6EbyQC+~-6KMoW+*KQ{yN?3C zZ;s>6q(`s~1LB9qYGeHf<6NqfEPpGcPVG&!&@t~q1%3}#udnDR^Q?X~E#P|z1Hs4M zE`+dE>;DJ50ie&ws0J$-UGxG~&`=qA!+lD>^?pV?M3PHPhA{JEpv_Yz~<< zX~|F5m_vST6jc$_+>JLqxiHPgnVOza0WZs+cG*m0S9uH{YgdMuG*GuohU%(w!HDy;SQucaw3Dr>*Z>xmI!`oU3)-G9p`jYB4FV~q-h&>e-^23F>24iStw+pmGf>Ii%?2%yBvjN zR_qfNrPQW1+4LOiV}B|hyGSisfAvNC(&o@NR~Fm<^n>M;XTAUFpqc;OJ38Ftf2^m} zLs*4I)(XY=8R&;ncK3S-87g@E|*1H5!*K|Q~tFqAy)=cHXC z-OaxRhI2YsmPXy*^RlLH9jsE4t_Z8;zPztTq*?xtMwpK2kbiN3pMQ*{{67=_**!ek zoc~@+c>z~MDHKdQ`V0lY{RkQKbDAcU4Iv}(9T}pGf)}6<$Jq;kCCCw`DGXEIH@OIu z4SxWEDN%HSMvheVgeAcXU^q1Vyp;(Y&<~iHo1Xt|I|6+pF=x7Gff8gWAf*hWAUeCg zy;fXc@B-{@C4X;EuOXpA2GNkJj{eu6A4L8C6CM4ps~8PC#Xs&*PFSY`)F<&>p22|X zV*!!8&w^J`pWFqnA~i04b3uo}tN#yPz*{0H&m~-(oy#D~1b>II3L=^y>6qq%zYC&? zjCq2cKRN5`V)_5g`N`R@=g~NMjxm`APsecc^Tjos{(SQ01}?7Q^0yoK_59@W25x?X|2l_@%j=ty*RRjd;Oyef z`RUE;-(S57%<)<(fx!R#jOn;O{Qqu^l*;6Br{iuCN_Z?gif1&|rfJdiRv+J%ofk!$ z?FcT^-+v@zxyZQ00&+2hq2PH|2ru_12>6i3&_{KTXf8jy`w#h_BR;n0#$^OSa7|f^ zKp^Eh`e9zcfTttEihFfMFl2#j4&pYDP*Jo8gm^xsfM?} z^k zk$0F2!sro9cLJ1Usku|AaTgA&Ch};RH#PvQa?M z1RsGRtU%5(eB?R?QwMve-|I)cs26LhlFAX4Y5R33JGER z;UTEVk$!MXXmSKsrs1)LH^CAmNTQUI;gY?RkMFID`oPgbz8B z7#Kp&-ZD+5k@bM{@;=r8&p-VZm%K zrzp*_fPbT(Au?^<@I?#TN3p$X)-Fzld74ryL|jiYgfSAo;aM?CsG3~m!y)--PylEQ z@iT1c^%z3<<8=GSX;^)2K}98`jvcTN90uexzMf?oW7kDlO7N#z8kDCJ!sT+cU7%L* z@nv5C01M<_UEme-C&L0q)6%?BFF~?D&?K$DZ+``&=HCVrQOYDzCZ-2?8x$GMZ{t-Q z)o^Ka)ZK?G#3){^UJUUTX>SmS@E*dG4PCyTQqD=F?O#^ z`{L2;S9_!TdrXsZ@lt^m#0qK`EWwwI%g{$dQ-Ezz?Or?$5lJC@L(^G_G$5LQ1L!OP zp??`$}ABgM7evq{ja0iS1L>O|Bc?QCs_eY^nbs%cTm&+hljg|8~wkIqV@k zyHeYF$F)E}NkWv6Md_uk(?&qe1Xx+EJAc0SG^?lH?N9HeLBrFKreeFIMEpAa+X-`y z=m^8h8x6p;(v7xtGxN=$emM;x5g%cBS-dNseWg5>G7DXoj5En%mRex;$!~sra#^%4 z6tp%D<^pw!NG-qCL{U@TcVLS$>C{m~ZGFcnBmh@s2Xu11RNNJT?M##E(|0NnzkjdN zkpC$ebhUQx-grjVbISi-|8Tc1{}1{b`M;Lp`+x2jzfBoReCv9yaQE66k*UD+fMxQ3cfaZX-#OUG|8*4K{RWPf6;5N?MZcywHs z&I#z!M?`XsNo%@nx9Ncs9To>vEW$8P(;0loQA&nHX@o4(s~!daz-D^7y;PG_J0M_y zW0VUFf=w{|R!DENS3`o+#02V6G9eNtAQ{Lp5wJCw>3uxCxKeEi9f8Pj+=+toAy}bq zfW(YSM5wTteY%cFxPK#Q3IhzeP*$O2OOxcYq2SuubN^UqB;; zKCt1?3KgzQge8u}vKb(i9Hc6IHRsCPRVcZMrcbP5Tj|6q)R%N+*rj&-Y8Yl7?|4M1 z#FVw^6hUgjv{Y_dX}f6|aa!}Uf|9qSJ^`5DrNPK?mZBI#_xX0v&`wV>rAxy)N)3v|0kAKY5S>g+sn?dwj3 ziX)`H6}~Jq$xvGIp(FtW!T{Amwc1oIYDw)t1PDAoYqDilpC}qv)pcE8-M4`w^`clf1}qh7u_37r-U=AeWRcFDX=X6^KfscYX9%_4h}c|pS2V} z|HIpAm?BQlAjR{Yz6Fg$UcYy?n#A zq-_?sn&h?u!dpBvH82N6Ij~Fk0Jz1oc@32=smuQ7S`*#wkxS5Q;5mHeX!vDhJwL9! zn65>8Zt~OC%<1vwagpgXMbP)u6UWhbGHD~Y5QT6rS#_z^K)Sr?ZIOCzf}K|2^u}|5XiFppZ(oN{C{r~ z|6fmWF=0;d6ocMuh#4J{QO#*#~BkuGCm6-lxP$}nB{4D z$x;#*dRJq21fiFCU-pBCha>NWL?d{32u+{M0)JE`ZND7ho6K)o%Ksb-mh&f_16#)b zyZZ-q`@es%;s3RiD*yj-`QLEjbN?#*KFab+pM^~CE5~|A#XyeSbRM^MXxl@ZwUb7T zzK!D?b+6(#!;)()t^8klAVv2km*j~_Aj`i0`;Ge_4iEPCHvGSiQssZo_3X|T&XoXO z&VQV1YdF94RAOdDbINR_)XO0e+ zDY9*eSFJo9RX+DO8uc$#TJ=B0@{aLaLPy=3HgbME)*(tK37MjuM0*vi$9^5HTcc#D5xONh}J&WK=FYY%`T7UV! z_z3IX#Q3SFznABKAM_gjzuo@MhX2=5swRx&IqnXTy=+45JsA?6k46NbDI%$M{}T%2 z<4O5;el(?^q(}j~v7Y{Ca0^Cl4nfmjA^IjW7M_oA^63lJ$Y`0f7sYUu@zvlX zEFas~zn!Ilah4BK5|_ zcN_Qr?Qi@)>nSGBQt`bG#Ujvr&xUY|XC|xI%4{X{k-5CtbbW7t%f?U zbE}@$W+hXn`KA<9o-~>eAqX9*Y6V|Uq!uW59PhgODButEaon9G5p=*P#n!QYhDk2u zah55DuDppB^1Ty7eh*i#uV^arY=1W`;74IJM!5?iY*qUI3GW%95dH+dpstMW&%@jV zb?gDuJ5iwl$w04{o+S(vL4U9*NpP|_$?{7R_NJ^<+U37w9F1`I24&fm`TdON|MzzK zht2z+_BZl>9mQrsYYC3B>>W$<3I3hs)ZX^AJo0aeC34PAd|U-{PEQ<+@bep}HJmHv zX?;FQ>D23dLEQe%=?-O`{{%15bfR;t>Wxb{g-c(3P3aC1rpmxiI)8o;RMi)&+swi* zPFpN(Xq_E?HeH!PH&NJKA~`lM6s)4kT>w>}Bl1C6Zy(BjmACEj)p@lox%Zle#!MJY z^u=OsMdyD`&Zjl8X4;x##}pS<&LOipE&1tsbI7laqDq3AyYZ$cGv!sh+fMtM19>8XNo^fMS(eq+5RUWJctK_o?0 z0k~N1#vClOaO-*a)h_qnIh&Aw8ZcprQ|sMu^UqVSaKPplEPwT#f>Vp}YT+=4HcHbr z?*1%N-D1?9fw@q~L@VcA))t|V;C4BbWR~<37NyXp71{J0>tiY&yGSisfAvNC(&o^2 zR~Fm<${H`#Z)48-Xs{Wpr6?N-i6_RvCSS|OZemf$~ z@_#hO>4c0Zepbtme3*iNbF-}t$rEFkw(Fh&=1RSSGk|{QFq<^eOGzne+#UsPdTN%eg@)0NI zrvHEIM4)e^XH@r8C_#ofq=e!qh)%C=t|a3)cmejds&^+>kPt3{XhdXJ|7*|>qQU?1 zuKw3mj7MGdk9!nT+ARSMP<)$bFeLg|SS0SU;8iq0x52AOPSkJ4$tZaB|G^7*hd5!m zfb-Kc5r0G(XYX+=gNP&;bxm{5-UrcC#4N$xublODvHbt`?D+KevuKh$#~4fFKfMP3 z_crH$)>B@2YY^DDS`a}B?r z9ba6-^&9xFGdRDvx;}pW`s@@=&)=S%T)+O~)qktNT(3X`Ao!nOaXP6E|G!&fDKl}@ z?Yf)f5*CZDWEqLIX{wsu=<7Q~_l0WHiQruRO+c3Oj0v5mpr$b5EYFnia({w`jYtdw zEblNjmtWrghxpGio7j6pLQVwr{>%X3p3w_&;zJiI*0L5c%j3F2?lqyUHSWV^h z?H^GPym$fURC1Q&I%H!P)LedIBQwIyx=0os<21uuz}=X{V~7zgZuOB25d~0O?X@nE(I) delta 4069 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 delta 4069 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 delta 4069 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 Date: Mon, 8 Feb 2021 02:52:22 +0500 Subject: [PATCH 10/13] Update check if cert available check --- test/minio/1.2.0/templates/_helpers.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/minio/1.2.0/templates/_helpers.tpl b/test/minio/1.2.0/templates/_helpers.tpl index 526b122225..f4d59c96f8 100644 --- a/test/minio/1.2.0/templates/_helpers.tpl +++ b/test/minio/1.2.0/templates/_helpers.tpl @@ -10,9 +10,13 @@ Determine secret name. Retrieve true/false if minio certificate is configured */}} {{- define "minio.certAvailable" -}} +{{- if .Values.certificate -}} {{- $values := (. | mustDeepCopy) -}} {{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} {{- template "common.resources.cert_present" $values -}} +{{- else -}} +{{- false -}} +{{- end -}} {{- end -}} From f34d4be81c45fc71894e8e0409275dfdf5a1fda8 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 8 Feb 2021 03:02:52 +0500 Subject: [PATCH 11/13] Update nodeport for minio 1.2.0 ci test --- test/minio/1.2.0/test_values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/minio/1.2.0/test_values.yaml b/test/minio/1.2.0/test_values.yaml index 383d0bbdd5..a5e7f6a8d6 100644 --- a/test/minio/1.2.0/test_values.yaml +++ b/test/minio/1.2.0/test_values.yaml @@ -11,7 +11,7 @@ extraArgs: [] updateStrategy: RollingUpdate service: - nodePort: 32001 + nodePort: 32324 environmentVariables: [] ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html From b2420eebc2df2e4498d58f85aa29b62c20d7f7bf Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 8 Feb 2021 18:55:59 +0500 Subject: [PATCH 12/13] Add configmap retrieving configured scheme --- test/minio/1.2.0/questions.yaml | 2 +- test/minio/1.2.0/templates/configmap.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 test/minio/1.2.0/templates/configmap.yaml diff --git a/test/minio/1.2.0/questions.yaml b/test/minio/1.2.0/questions.yaml index b0695e5228..75dc5c81cd 100644 --- a/test/minio/1.2.0/questions.yaml +++ b/test/minio/1.2.0/questions.yaml @@ -11,7 +11,7 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_minio-config_protocol" host: - "$node_ip" ports: diff --git a/test/minio/1.2.0/templates/configmap.yaml b/test/minio/1.2.0/templates/configmap.yaml new file mode 100644 index 0000000000..0c9aeea644 --- /dev/null +++ b/test/minio/1.2.0/templates/configmap.yaml @@ -0,0 +1,10 @@ +{{ $scheme := "http" }} +{{ if eq (include "minio.certAvailable" .) "true" }} +{{ $scheme = "https" }} +{{ end }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: minio-config +data: + protocol: {{ $scheme }} From c28754235a36ab42dd1592ba22f89f127bf84895 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 8 Feb 2021 23:10:09 +0500 Subject: [PATCH 13/13] Use camel case for certificate authority definition --- features_capability.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features_capability.json b/features_capability.json index 6c65fe8262..6cb3eace1f 100644 --- a/features_capability.json +++ b/features_capability.json @@ -27,7 +27,7 @@ "stable": {"min": "21.02-ALPHA"}, "nightlies": {"min": "21.02-MASTER"} }, - "definitions/certificate_authority": { + "definitions/certificateAuthority": { "stable": {"min": "21.02-ALPHA"}, "nightlies": {"min": "21.02-MASTER"} }