From 81935d973f46eeaf83600a6c8bccd01b0ac88df5 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Wed, 7 Apr 2021 22:13:39 +0500 Subject: [PATCH] Add updated version of minio to charts train --- charts/minio/1.1.0/charts/common-2101.0.0.tgz | Bin 4091 -> 0 bytes charts/minio/1.1.0/templates/_helpers.tpl | 6 --- charts/minio/{1.1.0 => 1.2.1}/.helmignore | 0 charts/minio/{1.1.0 => 1.2.1}/Chart.yaml | 4 +- charts/minio/{1.1.0 => 1.2.1}/README.md | 0 charts/minio/{1.1.0 => 1.2.1}/app-readme.md | 0 charts/minio/1.2.1/charts/common-2101.0.0.tgz | Bin 0 -> 4270 bytes .../{1.1.0 => 1.2.1}/default_values.yaml | 0 charts/minio/1.2.1/ix_values.yaml | 4 ++ .../migrations/migrate_from_1.0.0} | 3 ++ charts/minio/{1.1.0 => 1.2.1}/questions.yaml | 47 ++++-------------- .../minio/{1.1.0 => 1.2.1}/requirements.lock | 0 .../{1.1.0 => 1.2.1}/templates/NOTES.txt | 0 charts/minio/1.2.1/templates/_cert.tpl | 33 ++++++++++++ charts/minio/1.2.1/templates/_helpers.tpl | 40 +++++++++++++++ charts/minio/1.2.1/templates/configmap.yaml | 10 ++++ .../templates/deployment.yaml | 9 ++-- .../{1.1.0 => 1.2.1}/templates/secrets.yaml | 4 ++ .../{1.1.0 => 1.2.1}/templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../minio/{1.1.0 => 1.2.1}/test_values.yaml | 4 +- charts/minio/{1.1.0 => 1.2.1}/values.yaml | 0 22 files changed, 113 insertions(+), 51 deletions(-) delete mode 100644 charts/minio/1.1.0/charts/common-2101.0.0.tgz delete mode 100644 charts/minio/1.1.0/templates/_helpers.tpl rename charts/minio/{1.1.0 => 1.2.1}/.helmignore (100%) rename charts/minio/{1.1.0 => 1.2.1}/Chart.yaml (88%) rename charts/minio/{1.1.0 => 1.2.1}/README.md (100%) rename charts/minio/{1.1.0 => 1.2.1}/app-readme.md (100%) create mode 100644 charts/minio/1.2.1/charts/common-2101.0.0.tgz rename charts/minio/{1.1.0 => 1.2.1}/default_values.yaml (100%) create mode 100644 charts/minio/1.2.1/ix_values.yaml rename charts/minio/{1.1.0/migrations/migrate => 1.2.1/migrations/migrate_from_1.0.0} (90%) rename charts/minio/{1.1.0 => 1.2.1}/questions.yaml (77%) rename charts/minio/{1.1.0 => 1.2.1}/requirements.lock (100%) rename charts/minio/{1.1.0 => 1.2.1}/templates/NOTES.txt (100%) create mode 100644 charts/minio/1.2.1/templates/_cert.tpl create mode 100644 charts/minio/1.2.1/templates/_helpers.tpl create mode 100644 charts/minio/1.2.1/templates/configmap.yaml rename charts/minio/{1.1.0 => 1.2.1}/templates/deployment.yaml (82%) rename charts/minio/{1.1.0 => 1.2.1}/templates/secrets.yaml (65%) rename charts/minio/{1.1.0 => 1.2.1}/templates/service.yaml (100%) rename charts/minio/{1.1.0 => 1.2.1}/templates/serviceaccount.yaml (100%) rename charts/minio/{1.1.0 => 1.2.1}/test_values.yaml (89%) rename charts/minio/{1.1.0 => 1.2.1}/values.yaml (100%) diff --git a/charts/minio/1.1.0/charts/common-2101.0.0.tgz b/charts/minio/1.1.0/charts/common-2101.0.0.tgz deleted file mode 100644 index 3a22457ea69f5da42b01b6548f9d39e6eed25924..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4091 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 diff --git a/charts/minio/1.1.0/templates/_helpers.tpl b/charts/minio/1.1.0/templates/_helpers.tpl deleted file mode 100644 index c769c2fb2a..0000000000 --- a/charts/minio/1.1.0/templates/_helpers.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{/* -Determine secret name. -*/}} -{{- define "minio.secretName" -}} -{{- include "common.names.fullname" . -}} -{{- end -}} diff --git a/charts/minio/1.1.0/.helmignore b/charts/minio/1.2.1/.helmignore similarity index 100% rename from charts/minio/1.1.0/.helmignore rename to charts/minio/1.2.1/.helmignore diff --git a/charts/minio/1.1.0/Chart.yaml b/charts/minio/1.2.1/Chart.yaml similarity index 88% rename from charts/minio/1.1.0/Chart.yaml rename to charts/minio/1.2.1/Chart.yaml index 52ba59d832..5fe99fe60f 100644 --- a/charts/minio/1.1.0/Chart.yaml +++ b/charts/minio/1.2.1/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: High Performance, Kubernetes Native Object Storage name: minio -version: 1.1.0 -appVersion: master +version: 1.2.1 +appVersion: RELEASE.2021-02-19T04-38-02Z keywords: - storage - object-storage diff --git a/charts/minio/1.1.0/README.md b/charts/minio/1.2.1/README.md similarity index 100% rename from charts/minio/1.1.0/README.md rename to charts/minio/1.2.1/README.md diff --git a/charts/minio/1.1.0/app-readme.md b/charts/minio/1.2.1/app-readme.md similarity index 100% rename from charts/minio/1.1.0/app-readme.md rename to charts/minio/1.2.1/app-readme.md diff --git a/charts/minio/1.2.1/charts/common-2101.0.0.tgz b/charts/minio/1.2.1/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..91e9592a566e4ebd4431c7051ef448cce7330f3c GIT binary patch literal 4270 zcmV;f5K-?RiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PH<$Z`-(*^I5;*tlGhiyA#>Ya}i*G%_g}s!F1A~$@bpCViC|1 zZL^U{m86_{GuhvM!Iwlm{7BQd?bQ6xS`>MBNS>F@Ib>osnK0Tt86z&E8JeU&eE!nw z^?C<;d;0%guUG%Sx6|wW(BJFzd%gX`ebuhNv$x;>0ea7XOQYmMBK||~$z#k zk$0F2!sro9cLJ1Usku|AaTgA&Ch};RH#PvQa?M z1RsGRtU%5(eB?R?QwMve-|I)cs26^+< z9v&sY%ixM z&9Q)^pCK}B-S9;V+efjzYSu1JhIyJ&D@0sRGK4V_zu{RiN~oG#<-;NQXixxX4DmB; z>Gc>w_~Uf@$7xu7Z9zpPq>df15F7^NG`^l?8e`W*SxWGyS{jt662j$jwOycA@bP6| z000Z*UtQo8^C!asN7K^0QZGTWKhPwtzi$Pj=HCVrQOYDzCZ-2?8x$GMZ{t-Q)o^K< zMGXP}Nn|)aDv{b^9JcU>a)ZK?G#3){^UJUUTX>SmS@E*dG4PCyTQqD=F?O#^`{L2; zS9_!TdrXsZ@lt^m#0qK`EWwwI%g{$dQ-Ezz?Or?$5lJC@L(^G_G$5LQ1L!OPp&47` zS;n};2@vX7T7LnA^ES6eUp4lQ6f_aSRzhM4p+z?ICT3P7EEux`e}d#>;_d8?8P4hK zWyHNixqG_(ucO*mDogeMjoz&%SpiG*f4{ePP}Bd1hr5Rx{lAW)_5WK;6KvGGQrmjR zwLm~gLX?n2>7}mIMnKI3SXr$*zV|e%r{3*P@1;S*(~zcOyP`z=I{n)TbB^c;!^;~D zz_ikhwskY}&7gic4IvR9VR>1+E1!L(JeD#GU6+hA$zqmTVD`yxetmLTv@R61HV)eu8~MMM;`@K@7{5&!N_^{ju5kC-7?I9dnpz3R5lxQMY>Y1Q z3GDlhn7^P0<=ZZc_&-J&8jzGof}bP+mf3$hI}QFn?DsbOzm8(bLVfXv6OmVeNpC&iAvx^7APt(ftILQ3*UD+fMxQ3cfaZX-#OUG|8*4K{OQ;Dbsw3GmE$5`0kpF`i*EA)<`hdTBEq^w!h!k>ZggoeOk1H$5Je-LY!7DD zSfg`qyd^X$%LuHX>wVtPpO89e8wHm(B_3(nmycjY(^| zY`5uw6CD-@R4l?UPtzHE$Wcm$L}`R9)2ki@|G;K?y1i7BR68JGfMb*k41!HC{8mVB zvsXic)5HYoQZgYDCm*$O2OOxcYq2SuubN^UqB;;KCt1?3KgzQge8u} zvKb(i9Hc6IHRsCPRVcZMrcbP5Tj|6q)R%N+*rj&-Y8Yl7?|4M1#FVw^6hUgjv{Y_d zX}f6|aa!}Uf|9qSJ^`5DrNPK?mZBI#`0pWvH{nXu=1=JqOUx$^ySq>rRD=Bc#3+zAQA!P+Ib# zBmo4%0M$aZ+EguSN$o%c2s}S)vSn7EC>mGe)*6%61Vw{c%T-d_Rs&P(-NM!z=gqfS z+UMVi@AM81H~ycs6hHsN+iI91PS7C5^PRp0 zjYM9*cea}++c2HFTK(ByO0t^R7x5TRkouY@36l6XJS&sLii|KHS{RRUd~4gKL`WkF z!%jt7`dy5x;P0GGu5iq;d{$h99>Pd^`|ul{IqbH*j7=XyTBL0jxSHg)0>WE7G&L{> zL^-fa_yD-Yvw01bE~(4@=UNlp?vYE-Y~VS3=4kk3WIaEwy_l{=dv5a6*39Yg=5n=S z;E}g=tJPS{DfhPCb1_}U&y_*S+{xZzOKa&qC=Sgy7I?vV6Av|%re|OMu6UWhbGHD~ zY5QT6rS#_z^K)Sr?ZIOCzf}K|2^u}|5XiFppZ(oN{C{r~|6fmWF=0;d6ocMuh#4J{ zQO#*#~BkuGCm6-lxP$}nB{4D$x;#*dRJq21fiFCU-pBC zha>NWL?d{32u+{M0#qe!zZ~J4%x_xC{~QaJ^Cz7HTgLyp`v-OVzkjgd|Fx7V|NnCN z-*Dn{|0?`G%JNE|g-q`&$9hM_K#tsW9=CRA+e4eRlSYlcjpH13ui`hul4~uk{9k$? zMfWC`l>lDOoNH@1zx7mNak_N=!OYq@ z?I)k)@?5>e1Ub%95+l(Sk|T*nv#tZT$~;ZYjmU6pbDk|Yjc*ag>=zDn_g;rx+>l59 zS-qlD_!gTJv|-UZ&y*E(WxIg^;vIOKAQ_KeKktHh6p^vyZ{ksOk+I|}qmAmx(Kbkx zy!J;em37>ED;BS$N}B{0d&aYW0Jv?fR>@=4>t~J*mnpJsiC3*W9aTQ}HyZUXRa*5w z#qy5vTS7P+IxF_z3IX#Q3SFznABKAM_gjzuo@M zhX2=5swRx&IqnXTy=+45JsA?6k46NbDI%$M{}T%2<4O5;el(?^q(}j~v7Y{Ca0^Cl z4nfmjA^IjW7MXc+6jYuxnh+rf9jR&s zUr(eKD0dw1y89^L5A|`}og@)-z$nGmv3`b0F642RDTc1Ri5Bv`6GMIvSFf*VD)MZ9 zH!a{tVKhd$3n6S(`u_><8KDsV1iqlIjPB3F+yr&(0n|HDp#jN2ua}-B3=~1IDM@g$ zILY!$6ZWR8RNCdgWE_of_XcIzmHGXQ=l}P1`iIT?pY}KMe;vhULTd?*vg{p8^9lZ) z<<#Exv^?@}i6wH*PJCPib52hjjPUats5P7`=4pLCO6k<=d_mm)&gl+io&N+c(R8A7 ztm=(RIE71JeNE{O5vIz(Pda`ORMi)&+swi*PFpN(Xq_E?HeH!PH&NJKA~`lM6s)4k zT>w>}Bl1C6Zy(BjmACEj)p@lox%Zle#!MJY^u=OsMdyD`&Zjl8X4;x##}pS<&LOip zE&1tsbI7laqDq3AyYZ$cv{OqF8AL#n~;ARFky*P z>)mkk&r`2(z~&b$^__xKi}7mVFo!lu(>Ct@EK=QK)SiL4P{>3p=Uvtop^)HqIh16U z^b;1P(54mH^c?GBDjvH?En0u|Mf=j`(05lB+yCUF<&$3k`wkiZEr3RXcac2=*ZdTK_I5)dDMf|t%LsOI-6L&?*APTD2H-TbaF zoYT3qG^+ldmlbvEU=@;dMOZEOrG7gi&GLUV#_5ENDC79^kFk{h8}a|0gTu}JA8RQu z;1WrRIn|CnLjiC%#uNrQNfSaxkfHb%jj)J<7oZPE+Y8|Zh%ru67^Q4ra?uDK{RAAR zNRlZwa-^(BGzne+#UsPdTN%eg@)0NIrvHEIM4)e^XH@r8C_#ofq=e!qh)%C=t|a3) zcmejds&^+>kPt3{XhdXJ|7*|>qQU?1uKw3mj7MGdk9!nT+ARSMP<)$bFeLg|SS0SU z;8iq0x52AOPSkJ4$tZaB|G^7*hd5!mfb-Kc5kwhh?{O@Hh$I+wO>@rP2hmi-EWzEc zob`3F{Qvgs`1JR)Xp%g~7)#?ny$1jHHs^oVQ(nMp`$yeQ7X48-Ri_&S!K+vQIDUI^ ze(}o@T>pB01t-5AzrBX@E4X-b4ZoiqUtGiW8~Cp?IKQ~MK7RfB>=aJV-=3XZzy9OZ ztH4~ZKm;K8pI>o0sSf|YTVp9Ran$X)o8%G}i>_oDiM45}n%?N^J4E+|YSW3}T>ec! zmh+4Wou{CtFybuFl<;zYf`*Mq3d~01ppj`Tzg` literal 0 HcmV?d00001 diff --git a/charts/minio/1.1.0/default_values.yaml b/charts/minio/1.2.1/default_values.yaml similarity index 100% rename from charts/minio/1.1.0/default_values.yaml rename to charts/minio/1.2.1/default_values.yaml diff --git a/charts/minio/1.2.1/ix_values.yaml b/charts/minio/1.2.1/ix_values.yaml new file mode 100644 index 0000000000..3a1e63df71 --- /dev/null +++ b/charts/minio/1.2.1/ix_values.yaml @@ -0,0 +1,4 @@ +image: + repository: minio/minio + tag: RELEASE.2021-02-19T04-38-02Z + pullPolicy: IfNotPresent diff --git a/charts/minio/1.1.0/migrations/migrate b/charts/minio/1.2.1/migrations/migrate_from_1.0.0 similarity index 90% rename from charts/minio/1.1.0/migrations/migrate rename to charts/minio/1.2.1/migrations/migrate_from_1.0.0 index f65d82b628..d9772faa1d 100755 --- a/charts/minio/1.1.0/migrations/migrate +++ b/charts/minio/1.2.1/migrations/migrate_from_1.0.0 @@ -5,6 +5,9 @@ import sys def migrate(values): + if values.get('appVolumeMounts'): + return values + values.update({ 'appVolumeMounts': { 'export': { diff --git a/charts/minio/1.1.0/questions.yaml b/charts/minio/1.2.1/questions.yaml similarity index 77% rename from charts/minio/1.1.0/questions.yaml rename to charts/minio/1.2.1/questions.yaml index e4753328ae..19fd540b8d 100644 --- a/charts/minio/1.1.0/questions.yaml +++ b/charts/minio/1.2.1/questions.yaml @@ -11,49 +11,13 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_minio-config_protocol" 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" @@ -138,6 +102,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" diff --git a/charts/minio/1.1.0/requirements.lock b/charts/minio/1.2.1/requirements.lock similarity index 100% rename from charts/minio/1.1.0/requirements.lock rename to charts/minio/1.2.1/requirements.lock diff --git a/charts/minio/1.1.0/templates/NOTES.txt b/charts/minio/1.2.1/templates/NOTES.txt similarity index 100% rename from charts/minio/1.1.0/templates/NOTES.txt rename to charts/minio/1.2.1/templates/NOTES.txt diff --git a/charts/minio/1.2.1/templates/_cert.tpl b/charts/minio/1.2.1/templates/_cert.tpl new file mode 100644 index 0000000000..f34777f65a --- /dev/null +++ b/charts/minio/1.2.1/templates/_cert.tpl @@ -0,0 +1,33 @@ +{{/* +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" +- name: trusted-cert-secret-volume + mountPath: "/etc/minio/certs/CAs" +{{- 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 +- name: trusted-cert-secret-volume + secret: + secretName: {{ include "minio.secretName" . }} + items: + - key: certPublicKey + path: public.crt +{{- end }} +{{- end -}} diff --git a/charts/minio/1.2.1/templates/_helpers.tpl b/charts/minio/1.2.1/templates/_helpers.tpl new file mode 100644 index 0000000000..f4d59c96f8 --- /dev/null +++ b/charts/minio/1.2.1/templates/_helpers.tpl @@ -0,0 +1,40 @@ +{{/* +Determine secret name. +*/}} +{{- define "minio.secretName" -}} +{{- include "common.names.fullname" . -}} +{{- end -}} + + +{{/* +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 -}} + + +{{/* +Retrieve public key of minio certificate +*/}} +{{- define "minio.cert.publicKey" -}} +{{- $values := (. | mustDeepCopy) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.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.Values.certificate) -}} +{{ include "common.resources.cert" $values }} +{{- end -}} diff --git a/charts/minio/1.2.1/templates/configmap.yaml b/charts/minio/1.2.1/templates/configmap.yaml new file mode 100644 index 0000000000..0c9aeea644 --- /dev/null +++ b/charts/minio/1.2.1/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 }} diff --git a/charts/minio/1.1.0/templates/deployment.yaml b/charts/minio/1.2.1/templates/deployment.yaml similarity index 82% rename from charts/minio/1.1.0/templates/deployment.yaml rename to charts/minio/1.2.1/templates/deployment.yaml index aed4ad032b..f6eb4c5c90 100644 --- a/charts/minio/1.1.0/templates/deployment.yaml +++ b/charts/minio/1.2.1/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 " " }}" + - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs 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/charts/minio/1.1.0/templates/secrets.yaml b/charts/minio/1.2.1/templates/secrets.yaml similarity index 65% rename from charts/minio/1.1.0/templates/secrets.yaml rename to charts/minio/1.2.1/templates/secrets.yaml index f44495e5e1..4085fd585b 100644 --- a/charts/minio/1.1.0/templates/secrets.yaml +++ b/charts/minio/1.2.1/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: {{ (include "minio.cert.publicKey" .) | toString | b64enc | quote }} + certPrivateKey: {{ (include "minio.cert.privateKey" .) | toString | b64enc | quote }} + {{ end }} diff --git a/charts/minio/1.1.0/templates/service.yaml b/charts/minio/1.2.1/templates/service.yaml similarity index 100% rename from charts/minio/1.1.0/templates/service.yaml rename to charts/minio/1.2.1/templates/service.yaml diff --git a/charts/minio/1.1.0/templates/serviceaccount.yaml b/charts/minio/1.2.1/templates/serviceaccount.yaml similarity index 100% rename from charts/minio/1.1.0/templates/serviceaccount.yaml rename to charts/minio/1.2.1/templates/serviceaccount.yaml diff --git a/charts/minio/1.1.0/test_values.yaml b/charts/minio/1.2.1/test_values.yaml similarity index 89% rename from charts/minio/1.1.0/test_values.yaml rename to charts/minio/1.2.1/test_values.yaml index 383d0bbdd5..ce8e11fdac 100644 --- a/charts/minio/1.1.0/test_values.yaml +++ b/charts/minio/1.2.1/test_values.yaml @@ -2,7 +2,7 @@ ## image: repository: minio/minio - tag: RELEASE.2020-11-19T23-48-16Z + tag: RELEASE.2021-02-19T04-38-02Z pullPolicy: IfNotPresent ## Additional arguments to pass to minio binary @@ -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 diff --git a/charts/minio/1.1.0/values.yaml b/charts/minio/1.2.1/values.yaml similarity index 100% rename from charts/minio/1.1.0/values.yaml rename to charts/minio/1.2.1/values.yaml