From 20ed40725cbda30980b4ccf327a9164c66e7a2c2 Mon Sep 17 00:00:00 2001 From: still Date: Tue, 16 Feb 2021 16:19:11 -0700 Subject: [PATCH 01/23] Cleaning up files and repo --- CHANGELOG.md | 6 ++++++ CODEOWNERS.txt | 2 +- CONTRIBUTING.md | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52561e9..183681b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ #minio +2.0.9-bb.2 +Repository cleanup + +2.0.9-bb.1 +Refactor to deploy with helm chart in Big Bang Umbrella. + 0.1.1 (06//2020) Manifests for deploying minio 1.0.7 diff --git a/CODEOWNERS.txt b/CODEOWNERS.txt index 727de5d..853033f 100644 --- a/CODEOWNERS.txt +++ b/CODEOWNERS.txt @@ -1 +1 @@ -* @big-bang @LynnStill +* git status@LynnStill @kevin.wilder @branden.cobb diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0907891..1ff034f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -Thanks for contributing to this repository! +Thanks for contributing to this repository!helm dep up This repository follows the following conventions: -- GitLab From 0e9652c80f5feb47e923b99ce18b325e1815de3a Mon Sep 17 00:00:00 2001 From: still Date: Tue, 23 Feb 2021 10:58:23 -0700 Subject: [PATCH 02/23] Update to helm best practices --- chart/templates/_helpers.tpl | 62 ++++++++++++++++++++++++++++ chart/templates/minioinstance.yaml | 2 +- chart/templates/service-account.yaml | 14 ++++++- chart/values.yaml | 34 ++++++++++++++- 4 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 chart/templates/_helpers.tpl diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl new file mode 100644 index 0000000..f415bbf --- /dev/null +++ b/chart/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "minio.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "minio.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "minio.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "minio.labels" -}} +helm.sh/chart: {{ include "minio.chart" . }} +{{ include "minio.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "minio.selectorLabels" -}} +app.kubernetes.io/name: {{ include "minio.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "minio.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "minio.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/chart/templates/minioinstance.yaml b/chart/templates/minioinstance.yaml index c5637d7..0ed4a81 100644 --- a/chart/templates/minioinstance.yaml +++ b/chart/templates/minioinstance.yaml @@ -18,7 +18,7 @@ spec: prometheus.io/scrape: "true" ## Registry location and Tag to download MinIO Server image image: {{ .Values.image.name }}:{{ .Values.image.tag }} - serviceAccountName: {{ .Values.serviceAccountName }} + serviceAccountName: {{ include "minio.serviceAccountName" . }} ## A ClusterIP Service will be created with the given name serviceName: minio-internal-service zones: diff --git a/chart/templates/service-account.yaml b/chart/templates/service-account.yaml index cb910dc..39628f0 100644 --- a/chart/templates/service-account.yaml +++ b/chart/templates/service-account.yaml @@ -1,7 +1,19 @@ +#apiVersion: v1 +#kind: ServiceAccount +#metadata: +# name: .Values.serviceAccountName }} +# namespace: .Release.Namespace }} +#imagePullSecrets: +# toYaml .Values.imagePullSecrets | indent 2 }} + +{{- if .Values.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .Values.serviceAccountName }} + name: {{ include "minio.serviceAccountName" . }} namespace: {{ .Release.Namespace }} + labels: + {{- include "minio.labels" . | nindent 4 }} imagePullSecrets: {{ toYaml .Values.imagePullSecrets | indent 2 }} +{{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 2f2c57e..3c697cb 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -23,4 +23,36 @@ minioUICreds: default-minio-creds-secret imagePullSecrets: [ ] -serviceAccountName: minio-service-account \ No newline at end of file +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + + +# Default values for minio instance creation. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. +# Configure number of MinIO Operator Deployment Replicas +replicas: + count: 1 + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +# Configure repo and tag of MinIO Operator Image +image: + name: registry1.dso.mil/ironbank/opensource/minio/minio-operator + tag: 2.0.9 + imagePullPolicy: IfNotPresent + +## set kubernetes cluster domain where minio is running +## +clusterDomain: cluster.local +# watchedNamespace: set to blank to enable watching all namespaces +watchedNamespace: + -- GitLab From b0cedf2a8b9b6176079d744020ab2719c3c614bc Mon Sep 17 00:00:00 2001 From: still Date: Tue, 23 Feb 2021 11:25:50 -0700 Subject: [PATCH 03/23] update service to standards --- chart/templates/service-account.yaml | 18 +++++----- chart/templates/service.yaml | 33 ++++++++++++----- chart/values.yaml | 53 +++++++++++++++------------- 3 files changed, 64 insertions(+), 40 deletions(-) diff --git a/chart/templates/service-account.yaml b/chart/templates/service-account.yaml index 39628f0..472433d 100644 --- a/chart/templates/service-account.yaml +++ b/chart/templates/service-account.yaml @@ -1,11 +1,3 @@ -#apiVersion: v1 -#kind: ServiceAccount -#metadata: -# name: .Values.serviceAccountName }} -# namespace: .Release.Namespace }} -#imagePullSecrets: -# toYaml .Values.imagePullSecrets | indent 2 }} - {{- if .Values.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount @@ -17,3 +9,13 @@ metadata: imagePullSecrets: {{ toYaml .Values.imagePullSecrets | indent 2 }} {{- end }} + + +#apiVersion: v1 +#kind: ServiceAccount +#metadata: +# name: .Values.serviceAccountName }} +# namespace: .Release.Namespace }} +#imagePullSecrets: +# toYaml .Values.imagePullSecrets | indent 2 }} + diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml index e2cd82e..90b5f7c 100644 --- a/chart/templates/service.yaml +++ b/chart/templates/service.yaml @@ -1,15 +1,32 @@ +#apiVersion: v1 +#kind: Service +#metadata: +# name: minio-service +#spec: +# type: ClusterIP +# ports: +# - port: 9000 +# targetPort: 9000 +# protocol: TCP +# # Optional field +# # By default and for convenience, the Kubernetes control plane will allocate a port from a range (default: 30000-32767) +# # nodePort: 30007 +# selector: +# app: minio + + apiVersion: v1 kind: Service metadata: - name: minio-service + name: {{ include "minio.fullname" . }} + labels: + {{- include "minio.labels" . | nindent 4 }} spec: - type: ClusterIP + type: {{ .Values.service.type }} ports: - - port: 9000 - targetPort: 9000 + - port: {{ .Values.service.port }} + targetPort: http protocol: TCP - # Optional field - # By default and for convenience, the Kubernetes control plane will allocate a port from a range (default: 30000-32767) - # nodePort: 30007 + name: http selector: - app: minio + {{- include "minio.selectorLabels" . | nindent 4 }} diff --git a/chart/values.yaml b/chart/values.yaml index 3c697cb..0df41bf 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -32,27 +32,32 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: "" - -# Default values for minio instance creation. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. -# Configure number of MinIO Operator Deployment Replicas -replicas: - count: 1 - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -# Configure repo and tag of MinIO Operator Image -image: - name: registry1.dso.mil/ironbank/opensource/minio/minio-operator - tag: 2.0.9 - imagePullPolicy: IfNotPresent - -## set kubernetes cluster domain where minio is running -## -clusterDomain: cluster.local -# watchedNamespace: set to blank to enable watching all namespaces -watchedNamespace: - +service: + type: ClusterIP + port: 9000 + + +# +## Default values for minio instance creation. +## This is a YAML-formatted file. +## Declare variables to be passed into your templates. +## Configure number of MinIO Operator Deployment Replicas +#replicas: +# count: 1 +# +#imagePullSecrets: [] +#nameOverride: "" +#fullnameOverride: "" +# +## Configure repo and tag of MinIO Operator Image +#image: +# name: registry1.dso.mil/ironbank/opensource/minio/minio-operator +# tag: 2.0.9 +# imagePullPolicy: IfNotPresent +# +### set kubernetes cluster domain where minio is running +### +#clusterDomain: cluster.local +## watchedNamespace: set to blank to enable watching all namespaces +#watchedNamespace: +# -- GitLab From 0b470349321bd3cab0e4e47ed3c1944e98c72bf4 Mon Sep 17 00:00:00 2001 From: still Date: Tue, 23 Feb 2021 11:40:27 -0700 Subject: [PATCH 04/23] Update instance with standard practices --- chart/templates/minioinstance.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chart/templates/minioinstance.yaml b/chart/templates/minioinstance.yaml index 0ed4a81..a0616fc 100644 --- a/chart/templates/minioinstance.yaml +++ b/chart/templates/minioinstance.yaml @@ -1,7 +1,7 @@ apiVersion: operator.min.io/v1 kind: MinIOInstance metadata: - name: minio + name: {{ include "minio.fullname" . }} ## If specified, MinIOInstance pods will be dispatched by specified scheduler. ## If not specified, the pod will be dispatched by default scheduler. # scheduler: @@ -11,7 +11,9 @@ spec: metadata: ## Optionally pass labels to be applied to the statefulset pods labels: - app: minio + {{- include "minio.labels" . | nindent 6 }} +# labels: +# app: minio annotations: prometheus.io/path: /minio/prometheus/metrics prometheus.io/port: "9000" -- GitLab From dcd6c355aafb82b790382bbccedafbc6f86da6a2 Mon Sep 17 00:00:00 2001 From: still Date: Tue, 23 Feb 2021 11:49:20 -0700 Subject: [PATCH 05/23] adding annotations --- chart/templates/minioinstance.yaml | 4 ++++ chart/templates/service-account.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/chart/templates/minioinstance.yaml b/chart/templates/minioinstance.yaml index a0616fc..d338a60 100644 --- a/chart/templates/minioinstance.yaml +++ b/chart/templates/minioinstance.yaml @@ -14,10 +14,14 @@ spec: {{- include "minio.labels" . | nindent 6 }} # labels: # app: minio + {{- with .Values.serviceAccount.annotations }} annotations: prometheus.io/path: /minio/prometheus/metrics prometheus.io/port: "9000" prometheus.io/scrape: "true" + {{- toYaml . | nindent 6 }} + {{- end }} + ## Registry location and Tag to download MinIO Server image image: {{ .Values.image.name }}:{{ .Values.image.tag }} serviceAccountName: {{ include "minio.serviceAccountName" . }} diff --git a/chart/templates/service-account.yaml b/chart/templates/service-account.yaml index 472433d..b718b1e 100644 --- a/chart/templates/service-account.yaml +++ b/chart/templates/service-account.yaml @@ -6,6 +6,10 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "minio.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} imagePullSecrets: {{ toYaml .Values.imagePullSecrets | indent 2 }} {{- end }} -- GitLab From a081792ce0bbd837eaf4fcc6023a05ea7c99d352 Mon Sep 17 00:00:00 2001 From: still Date: Tue, 23 Feb 2021 12:00:29 -0700 Subject: [PATCH 06/23] update annotations --- chart/templates/minioinstance.yaml | 2 +- chart/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/chart/templates/minioinstance.yaml b/chart/templates/minioinstance.yaml index d338a60..6937d8a 100644 --- a/chart/templates/minioinstance.yaml +++ b/chart/templates/minioinstance.yaml @@ -14,7 +14,7 @@ spec: {{- include "minio.labels" . | nindent 6 }} # labels: # app: minio - {{- with .Values.serviceAccount.annotations }} + {{- with .Values.podAnnotations }} annotations: prometheus.io/path: /minio/prometheus/metrics prometheus.io/port: "9000" diff --git a/chart/values.yaml b/chart/values.yaml index 0df41bf..524978a 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -36,6 +36,7 @@ service: type: ClusterIP port: 9000 +podAnnotations: {} # ## Default values for minio instance creation. -- GitLab From 6c9b083df4a191e5015fdb1f23437d14f8a5d950 Mon Sep 17 00:00:00 2001 From: still Date: Wed, 24 Feb 2021 14:51:18 -0700 Subject: [PATCH 07/23] Adding name passthru --- chart/templates/minioinstance.yaml | 2 -- chart/values.yaml | 34 +++++++----------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/chart/templates/minioinstance.yaml b/chart/templates/minioinstance.yaml index 6937d8a..40306e6 100644 --- a/chart/templates/minioinstance.yaml +++ b/chart/templates/minioinstance.yaml @@ -12,8 +12,6 @@ spec: ## Optionally pass labels to be applied to the statefulset pods labels: {{- include "minio.labels" . | nindent 6 }} -# labels: -# app: minio {{- with .Values.podAnnotations }} annotations: prometheus.io/path: /minio/prometheus/metrics diff --git a/chart/values.yaml b/chart/values.yaml index 524978a..f7c4fe8 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,7 +1,14 @@ -# Configure number of MinIO Operator Deployment Replicas +# +## Default values for minio instance creation. +## This is a YAML-formatted file. +## Declare variables to be passed into your templates. +## Configure number of MinIO Operator Deployment Replicas replicas: count: 1 +nameOverride: "" +fullnameOverride: "" + # Configure repo and tag of MinIO Operator Image image: name: registry1.dso.mil/ironbank/opensource/minio/minio @@ -37,28 +44,3 @@ service: port: 9000 podAnnotations: {} - -# -## Default values for minio instance creation. -## This is a YAML-formatted file. -## Declare variables to be passed into your templates. -## Configure number of MinIO Operator Deployment Replicas -#replicas: -# count: 1 -# -#imagePullSecrets: [] -#nameOverride: "" -#fullnameOverride: "" -# -## Configure repo and tag of MinIO Operator Image -#image: -# name: registry1.dso.mil/ironbank/opensource/minio/minio-operator -# tag: 2.0.9 -# imagePullPolicy: IfNotPresent -# -### set kubernetes cluster domain where minio is running -### -#clusterDomain: cluster.local -## watchedNamespace: set to blank to enable watching all namespaces -#watchedNamespace: -# -- GitLab From dcf68acbb761da71e7fe3b32e404bf8e47d64f57 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 14:38:12 -0700 Subject: [PATCH 08/23] adding vs --- chart/templates/minio-vs.yaml | 63 ++++++++++++++++++++++++++++ chart/templates/service-account.yaml | 10 ----- chart/templates/service.yaml | 17 -------- 3 files changed, 63 insertions(+), 27 deletions(-) create mode 100644 chart/templates/minio-vs.yaml diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml new file mode 100644 index 0000000..18e751e --- /dev/null +++ b/chart/templates/minio-vs.yaml @@ -0,0 +1,63 @@ +{{- if and .Values.addons.minioinstance.enabled .Values.istio.enabled -}} +apiVersion: networking.istio.io/v1beta1 +kind: VirtualService +metadata: + name: {{ template "minioinstance.fullname" . }} + namespace: {{ .Release.Namespace }} +spec: + gateways: + - istio-system/main + hosts: + - {{ include "minioinstance.name" . }}.{{ .Values.hostname }}" + http: + - route: + - destination: + host: {{ include "minio.fullname" . }} + port: + number: {{ .Values.service.port }} +{{- end }} + +#{- if and .Values.addons.minioinstance.enabled .Values.istio.enabled -}} +# {- $serviceName := printf "%s-%s" (include "minioinstance.fullname" .) "minioInstance" }} +# {- $servicePort := .Values.minioinstance.service.port -}} +#apiVersion: networking.istio.io/v1beta1 +#kind: VirtualService +#metadata: +# name: {{ template "minioinstance.fullname" . }} +# namespace: {{ .Release.Namespace }} +# labels: +# app: {{ template "kube-prometheus-stack.name" . }}-prometheus +# { include "kube-prometheus-stack.labels" . | indent 4 }} +#spec: +# gateways: +# - main.istio-system.svc.cluster.local +# hosts: +# - "miniointance.{{ .Values.hostname }}" +# http: +# - route: +# - destination: +# port: +# number: {{ .Values.ingress.minioinstance.port | default $servicePort }} +# host: {{ .Values.ingress.minioinstance.service | default $serviceName }}.{{ .Values.ingress.minioinstance.namespace | default .Release.Namespace }}.svc.cluster.local +# {{- end }} +# +# {- if .Values.istio.enabled -}} +#apiVersion: networking.istio.io/v1beta1 +#kind: VirtualService +#metadata: +# name: {{ include "minio.fullname" . }}-vs +# namespace: {{ .Release.Namespace }} +#spec: +# gateways: +# - istio-system/main +# hosts: +# - {{ include "minio.name" . }}.{{ .Values.hostname }} +# http: +# - route: +# - destination: +# port: +# number: 9000 +# host: {{ include "minio.fullname" . }} +# {- end }} +# +# diff --git a/chart/templates/service-account.yaml b/chart/templates/service-account.yaml index b718b1e..7d2de01 100644 --- a/chart/templates/service-account.yaml +++ b/chart/templates/service-account.yaml @@ -13,13 +13,3 @@ metadata: imagePullSecrets: {{ toYaml .Values.imagePullSecrets | indent 2 }} {{- end }} - - -#apiVersion: v1 -#kind: ServiceAccount -#metadata: -# name: .Values.serviceAccountName }} -# namespace: .Release.Namespace }} -#imagePullSecrets: -# toYaml .Values.imagePullSecrets | indent 2 }} - diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml index 90b5f7c..20f154b 100644 --- a/chart/templates/service.yaml +++ b/chart/templates/service.yaml @@ -1,20 +1,3 @@ -#apiVersion: v1 -#kind: Service -#metadata: -# name: minio-service -#spec: -# type: ClusterIP -# ports: -# - port: 9000 -# targetPort: 9000 -# protocol: TCP -# # Optional field -# # By default and for convenience, the Kubernetes control plane will allocate a port from a range (default: 30000-32767) -# # nodePort: 30007 -# selector: -# app: minio - - apiVersion: v1 kind: Service metadata: -- GitLab From e238d8f34e0668ae9c3157e881e34bc60c694442 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 15:18:29 -0700 Subject: [PATCH 09/23] remove comments --- chart/templates/minio-vs.yaml | 44 ----------------------------------- 1 file changed, 44 deletions(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 18e751e..9040c49 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -17,47 +17,3 @@ spec: number: {{ .Values.service.port }} {{- end }} -#{- if and .Values.addons.minioinstance.enabled .Values.istio.enabled -}} -# {- $serviceName := printf "%s-%s" (include "minioinstance.fullname" .) "minioInstance" }} -# {- $servicePort := .Values.minioinstance.service.port -}} -#apiVersion: networking.istio.io/v1beta1 -#kind: VirtualService -#metadata: -# name: {{ template "minioinstance.fullname" . }} -# namespace: {{ .Release.Namespace }} -# labels: -# app: {{ template "kube-prometheus-stack.name" . }}-prometheus -# { include "kube-prometheus-stack.labels" . | indent 4 }} -#spec: -# gateways: -# - main.istio-system.svc.cluster.local -# hosts: -# - "miniointance.{{ .Values.hostname }}" -# http: -# - route: -# - destination: -# port: -# number: {{ .Values.ingress.minioinstance.port | default $servicePort }} -# host: {{ .Values.ingress.minioinstance.service | default $serviceName }}.{{ .Values.ingress.minioinstance.namespace | default .Release.Namespace }}.svc.cluster.local -# {{- end }} -# -# {- if .Values.istio.enabled -}} -#apiVersion: networking.istio.io/v1beta1 -#kind: VirtualService -#metadata: -# name: {{ include "minio.fullname" . }}-vs -# namespace: {{ .Release.Namespace }} -#spec: -# gateways: -# - istio-system/main -# hosts: -# - {{ include "minio.name" . }}.{{ .Values.hostname }} -# http: -# - route: -# - destination: -# port: -# number: 9000 -# host: {{ include "minio.fullname" . }} -# {- end }} -# -# -- GitLab From 5273d54ad2fb0be639542fe6bff3e03db346d466 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 15:31:42 -0700 Subject: [PATCH 10/23] values --- chart/templates/minio-vs.yaml | 2 +- chart/values.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 9040c49..d28a1bc 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.addons.minioinstance.enabled .Values.istio.enabled -}} +{{- if and .Values.virtualService.enabled .Values.istio.enabled -}} apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: diff --git a/chart/values.yaml b/chart/values.yaml index f7c4fe8..5612972 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -44,3 +44,7 @@ service: port: 9000 podAnnotations: {} + +veritualService: + enabled: true + -- GitLab From bac9fd7a241f98b272731bfaad59e764de8ac21d Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 15:34:09 -0700 Subject: [PATCH 11/23] values --- chart/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/values.yaml b/chart/values.yaml index 5612972..89393a6 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -45,6 +45,6 @@ service: podAnnotations: {} -veritualService: +virtualService: enabled: true -- GitLab From 46b431f3d3c495c00de3a93225bba8aeed15caf1 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 15:43:47 -0700 Subject: [PATCH 12/23] values update --- chart/templates/minio-vs.yaml | 2 +- chart/values.yaml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index d28a1bc..c36222e 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.virtualService.enabled .Values.istio.enabled -}} +{{- if and .Values.istio.enabled .Values.istio.virtualService.enabled -}} apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: diff --git a/chart/values.yaml b/chart/values.yaml index 89393a6..716a5a2 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -45,6 +45,9 @@ service: podAnnotations: {} -virtualService: - enabled: true +istio: + enabled: false + virtualService: + enabled: true + -- GitLab From 0dd37faaadfd7bed8a5a1b0bdbac8b22f1491175 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 15:50:48 -0700 Subject: [PATCH 13/23] fixing template reference --- chart/templates/minio-vs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index c36222e..90891ab 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -2,13 +2,13 @@ apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: - name: {{ template "minioinstance.fullname" . }} + name: {{ template "minio.fullname" . }} namespace: {{ .Release.Namespace }} spec: gateways: - istio-system/main hosts: - - {{ include "minioinstance.name" . }}.{{ .Values.hostname }}" + - {{ include "minio.name" . }}.{{ .Values.hostname }}" http: - route: - destination: -- GitLab From 4a52970e78d5ad5eeaa3f58dfd1cea698a477df6 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 16:01:33 -0700 Subject: [PATCH 14/23] update vs --- chart/Chart.yaml | 2 +- chart/templates/minio-vs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 1faeae4..2c94423 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -9,7 +9,7 @@ description: |- type: application -version: 1.0.0 +version: 2.0.9-bb.2 appVersion: 2.0.9 diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 90891ab..9751596 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -8,7 +8,7 @@ spec: gateways: - istio-system/main hosts: - - {{ include "minio.name" . }}.{{ .Values.hostname }}" + - "{{ include ""minio.name"" . }}.{{ .Values.hostname }}" http: - route: - destination: -- GitLab From 6967a0106cf9c72d79ad8df5d68a64ec2791ea94 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 16:13:28 -0700 Subject: [PATCH 15/23] update vs --- chart/templates/minio-vs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 9751596..153a2b4 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -8,7 +8,7 @@ spec: gateways: - istio-system/main hosts: - - "{{ include ""minio.name"" . }}.{{ .Values.hostname }}" + - "{{ include \"minio.name\" . }}.{{ .Values.hostname }}" http: - route: - destination: -- GitLab From 5d12c55c8dd2a6f45e9fb8a38e67e65e0b3837d8 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 16:23:03 -0700 Subject: [PATCH 16/23] update --- chart/templates/minio-vs.yaml | 2 +- chart/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 153a2b4..ee58f70 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -8,7 +8,7 @@ spec: gateways: - istio-system/main hosts: - - "{{ include \"minio.name\" . }}.{{ .Values.hostname }}" + - minio.{{ .Values.hostname }} http: - route: - destination: diff --git a/chart/values.yaml b/chart/values.yaml index 716a5a2..cc58b9b 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -46,7 +46,7 @@ service: podAnnotations: {} istio: - enabled: false + enabled: true virtualService: enabled: true -- GitLab From 256e2eee00cc58c5de6f6b427ec2bdde791481b8 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 16:48:49 -0700 Subject: [PATCH 17/23] updating service --- chart/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml index 20f154b..7a6bd85 100644 --- a/chart/templates/service.yaml +++ b/chart/templates/service.yaml @@ -8,7 +8,7 @@ spec: type: {{ .Values.service.type }} ports: - port: {{ .Values.service.port }} - targetPort: http + targetPort: {{ .Values.service.port }} protocol: TCP name: http selector: -- GitLab From 642d177f555ee65b1dcff84cdfa85856472d7814 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 16:58:08 -0700 Subject: [PATCH 18/23] update --- chart/templates/minio-vs.yaml | 2 +- chart/templates/service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index ee58f70..0762cc6 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -8,7 +8,7 @@ spec: gateways: - istio-system/main hosts: - - minio.{{ .Values.hostname }} + - {{ include "minio.fullname" . }}.{{ .Values.hostname }} http: - route: - destination: diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml index 7a6bd85..7be34e0 100644 --- a/chart/templates/service.yaml +++ b/chart/templates/service.yaml @@ -8,7 +8,7 @@ spec: type: {{ .Values.service.type }} ports: - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.port }} + targetPort: 9000 protocol: TCP name: http selector: -- GitLab From 1e04a9192dce3c93f4fa154e0d101055a1a6c2ea Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 17:08:47 -0700 Subject: [PATCH 19/23] name change --- chart/templates/minio-vs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 0762cc6..0d9da4f 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -8,7 +8,7 @@ spec: gateways: - istio-system/main hosts: - - {{ include "minio.fullname" . }}.{{ .Values.hostname }} + - {{ include "minio.name" . }}.{{ .Values.hostname }} http: - route: - destination: -- GitLab From c7406e5dac248ff06b75fb0de966292f840d2949 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 17:21:04 -0700 Subject: [PATCH 20/23] adding name values --- chart/templates/minio-vs.yaml | 2 +- chart/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 0d9da4f..3fff599 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -8,7 +8,7 @@ spec: gateways: - istio-system/main hosts: - - {{ include "minio.name" . }}.{{ .Values.hostname }} + - {{ .Values.istio.virtualServce.name }}.{{ .Values.hostname }} http: - route: - destination: diff --git a/chart/values.yaml b/chart/values.yaml index cc58b9b..c6da129 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -49,5 +49,6 @@ istio: enabled: true virtualService: enabled: true + name: minio -- GitLab From d46ef5ab9805ac14f5d8d9eb046a76d0f533f496 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 17:32:29 -0700 Subject: [PATCH 21/23] update --- chart/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/values.yaml b/chart/values.yaml index c6da129..1e6dff8 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -48,7 +48,7 @@ podAnnotations: {} istio: enabled: true virtualService: - enabled: true - name: minio + enabled: true + name: minio -- GitLab From 8e53360411c3830d492f15c0610342db79464df9 Mon Sep 17 00:00:00 2001 From: still Date: Thu, 25 Feb 2021 17:43:25 -0700 Subject: [PATCH 22/23] update --- chart/templates/minio-vs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml index 3fff599..156e3d4 100644 --- a/chart/templates/minio-vs.yaml +++ b/chart/templates/minio-vs.yaml @@ -8,7 +8,7 @@ spec: gateways: - istio-system/main hosts: - - {{ .Values.istio.virtualServce.name }}.{{ .Values.hostname }} + - {{ .Values.istio.virtualService.name }}.{{ .Values.hostname }} http: - route: - destination: -- GitLab From fef6a43537ea8ffc120fc4e94b732b94487b870f Mon Sep 17 00:00:00 2001 From: still Date: Fri, 26 Feb 2021 09:52:23 -0700 Subject: [PATCH 23/23] fixing typos --- CODEOWNERS.txt | 2 +- CONTRIBUTING.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS.txt b/CODEOWNERS.txt index 853033f..464fe09 100644 --- a/CODEOWNERS.txt +++ b/CODEOWNERS.txt @@ -1 +1 @@ -* git status@LynnStill @kevin.wilder @branden.cobb +* @LynnStill @kevin.wilder @branden.cobb diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1ff034f..78db296 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -Thanks for contributing to this repository!helm dep up +Thanks for contributing to this repository This repository follows the following conventions: -- GitLab