Skip to content

Commit 00836f8

Browse files
committed
Upgrade Operator to 3.0.0
1 parent 4a5be81 commit 00836f8

File tree

17 files changed

+630
-529
lines changed

17 files changed

+630
-529
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ require (
1818
github.com/json-iterator/go v1.1.10
1919
github.com/minio/cli v1.22.0
2020
github.com/minio/mc v0.0.0-20200719194630-c8a3b7bff08c
21-
github.com/minio/minio v0.0.0-20200714163805-778e9c864f67
21+
github.com/minio/minio v0.0.0-20200723003940-b9be841fd222
2222
github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec
2323
github.com/minio/minio-go/v7 v7.0.2-0.20200718235721-f0e2f3ae3678
24-
github.com/minio/minio-operator v0.0.0-20200713191021-de7c5283f7e5
24+
github.com/minio/minio-operator v0.0.0-20200723204759-26762d65da84
2525
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
2626
github.com/satori/go.uuid v1.2.0
2727
github.com/stretchr/testify v1.6.1

go.sum

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ER
156156
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
157157
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
158158
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
159+
github.com/go-ini/ini v1.57.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
159160
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
160161
github.com/go-ldap/ldap v3.0.2+incompatible h1:kD5HQcAzlQ7yrhfn+h+MSABeAy/jAJhvIJ/QDllP44g=
161162
github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
@@ -512,16 +513,19 @@ github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77Z
512513
github.com/minio/minio v0.0.0-20200501124117-09571d03a531/go.mod h1:Vhlqz7Se0EgpgFiVxpvzF4Zz/h2LMx+EPKH96Aera5U=
513514
github.com/minio/minio v0.0.0-20200714163805-778e9c864f67 h1:xMg87xvLhrw2jeE6xGx/uuFr2iIksfszITGdHhWURnA=
514515
github.com/minio/minio v0.0.0-20200714163805-778e9c864f67/go.mod h1:0WThPBMICOt5eEGT3XyaUy0cxYmoGhmJEvvRbiVqbYU=
516+
github.com/minio/minio v0.0.0-20200723003940-b9be841fd222 h1:+XFGpEsqmA033nDX8LtjyPZy01Shivf6E2OL67WoGiE=
517+
github.com/minio/minio v0.0.0-20200723003940-b9be841fd222/go.mod h1:Eu2KC2p+vW03rnYY/6R/D+QduPB7/j4kBaVA/EDLjWM=
515518
github.com/minio/minio-go/v6 v6.0.53 h1:8jzpwiOzZ5Iz7/goFWqNZRICbyWYShbb5rARjrnSCNI=
516519
github.com/minio/minio-go/v6 v6.0.53/go.mod h1:DIvC/IApeHX8q1BAMVCXSXwpmrmM+I+iBvhvztQorfI=
517520
github.com/minio/minio-go/v6 v6.0.55-0.20200424204115-7506d2996b22/go.mod h1:KQMM+/44DSlSGSQWSfRrAZ12FVMmpWNuX37i2AX0jfI=
518521
github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec h1:my1ShPzUyV5BSteRVdm/YoEhd4ycLImlN4xDX17pd8A=
519522
github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec/go.mod h1:5+R/nM9Pwrh0vqF+HbYYDQ84wdUFPyXHkrdT4AIkifM=
520523
github.com/minio/minio-go/v7 v7.0.0-20200714085548-47e386e2cde8/go.mod h1:QTstSRgetEDVpqiEpFniLoCslH4d9cNAa4BtjuRQrwE=
524+
github.com/minio/minio-go/v7 v7.0.1/go.mod h1:dJ80Mv2HeGkYLH1sqS/ksz07ON6csH3S6JUMSQ2zAns=
521525
github.com/minio/minio-go/v7 v7.0.2-0.20200718235721-f0e2f3ae3678 h1:vV6dhx+KI1YfQTqlYYUa2dh8MUhecITo1XXhFDTl6fU=
522526
github.com/minio/minio-go/v7 v7.0.2-0.20200718235721-f0e2f3ae3678/go.mod h1:dJ80Mv2HeGkYLH1sqS/ksz07ON6csH3S6JUMSQ2zAns=
523-
github.com/minio/minio-operator v0.0.0-20200713191021-de7c5283f7e5 h1:ycH+JjgYkiaO02XDk1UPXjyauXw1N4nKojod6Cw2tcw=
524-
github.com/minio/minio-operator v0.0.0-20200713191021-de7c5283f7e5/go.mod h1:hNvWo/RuktTqhjKVnKmmZA8chdAxcPdi8jFJXZmioLI=
527+
github.com/minio/minio-operator v0.0.0-20200723204759-26762d65da84 h1:chr56VwbyGM6rqbKtVJiQ+pgrxh1rbus9HEmAx5Tcys=
528+
github.com/minio/minio-operator v0.0.0-20200723204759-26762d65da84/go.mod h1:auKSx2m2jfN8DqHwDZWZm4eW6bHYXW1haUBIerVvA6w=
525529
github.com/minio/parquet-go v0.0.0-20200414234858-838cfa8aae61 h1:pUSI/WKPdd77gcuoJkSzhJ4wdS8OMDOsOu99MtpXEQA=
526530
github.com/minio/parquet-go v0.0.0-20200414234858-838cfa8aae61/go.mod h1:4trzEJ7N1nBTd5Tt7OCZT5SEin+WiAXpdJ/WgPkESA8=
527531
github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
@@ -1032,6 +1036,8 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
10321036
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
10331037
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM=
10341038
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
1039+
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY=
1040+
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
10351041
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
10361042
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
10371043
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

k8s/console/base/minio-operator.yaml

Lines changed: 116 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: minio-operator
5+
---
16
apiVersion: apiextensions.k8s.io/v1
27
kind: CustomResourceDefinition
38
metadata:
4-
name: minioinstances.operator.min.io
9+
name: tenants.minio.min.io
510
spec:
6-
group: operator.min.io
11+
group: minio.min.io
712
scope: Namespaced
813
names:
9-
kind: MinIOInstance
10-
singular: minioinstance
11-
plural: minioinstances
14+
kind: Tenant
15+
singular: tenant
16+
plural: tenants
1217
versions:
1318
- name: v1
1419
served: true
@@ -24,49 +29,109 @@ spec:
2429
type: object
2530
x-kubernetes-preserve-unknown-fields: true
2631
properties:
27-
replicas:
28-
type: integer
29-
minimum: 1
30-
maximum: 32
32+
metadata:
33+
type: object
34+
x-kubernetes-preserve-unknown-fields: true
3135
image:
3236
type: string
3337
serviceName:
3438
type: string
35-
volumesPerServer:
36-
type: integer
39+
serviceAccountName:
40+
type: string
41+
zones:
42+
type: array
43+
items:
44+
type: object
45+
x-kubernetes-preserve-unknown-fields: true
46+
properties:
47+
name:
48+
type: string
49+
servers:
50+
type: integer
51+
volumesPerServer:
52+
type: integer
53+
volumeClaimTemplate:
54+
type: object
55+
x-kubernetes-preserve-unknown-fields: true
56+
resources:
57+
type: object
58+
x-kubernetes-preserve-unknown-fields: true
59+
nodeSelector:
60+
type: object
61+
x-kubernetes-preserve-unknown-fields: true
62+
affinity:
63+
type: object
64+
x-kubernetes-preserve-unknown-fields: true
65+
tolerations:
66+
type: object
67+
x-kubernetes-preserve-unknown-fields: true
3768
mountPath:
3869
type: string
3970
podManagementPolicy:
4071
type: string
41-
enum: [Parallel, OrderedReady]
72+
enum: [Parallel,OrderedReady]
4273
default: Parallel
4374
requestAutoCert:
4475
type: boolean
4576
default: false
77+
certConfig:
78+
type: object
79+
properties:
80+
commonName:
81+
type: string
82+
organizationName:
83+
type: array
84+
items:
85+
type: string
86+
dnsNames:
87+
type: array
88+
items:
89+
type: string
4690
version:
4791
type: string
4892
mountpath:
4993
type: string
5094
subpath:
5195
type: string
52-
mcs:
96+
nodeSelector:
97+
type: object
98+
x-kubernetes-preserve-unknown-fields: true
99+
credsSecret:
100+
type: object
101+
x-kubernetes-preserve-unknown-fields: true
102+
env:
103+
type: object
104+
x-kubernetes-preserve-unknown-fields: true
105+
console:
53106
type: object
54107
x-kubernetes-preserve-unknown-fields: true
55108
properties:
109+
metadata:
110+
type: object
111+
x-kubernetes-preserve-unknown-fields: true
56112
image:
57113
type: string
58114
replicas:
59115
type: integer
60116
default: 2
61-
mcsSecret:
117+
consoleSecret:
62118
type: object
63119
properties:
64120
name:
65121
type: string
122+
resources:
123+
type: object
124+
x-kubernetes-preserve-unknown-fields: true
125+
env:
126+
type: object
127+
x-kubernetes-preserve-unknown-fields: true
66128
kes:
67129
type: object
68130
x-kubernetes-preserve-unknown-fields: true
69131
properties:
132+
metadata:
133+
type: object
134+
x-kubernetes-preserve-unknown-fields: true
70135
image:
71136
type: string
72137
replicas:
@@ -77,6 +142,15 @@ spec:
77142
properties:
78143
name:
79144
type: string
145+
liveness:
146+
type: object
147+
properties:
148+
initialDelaySeconds:
149+
type: integer
150+
periodSeconds:
151+
type: integer
152+
timeoutSeconds:
153+
type: integer
80154
status:
81155
type: object
82156
properties:
@@ -90,6 +164,12 @@ spec:
90164
type: string
91165
jsonPath: ".status.currentState"
92166
---
167+
apiVersion: v1
168+
kind: ServiceAccount
169+
metadata:
170+
name: minio-operator
171+
namespace: default
172+
---
93173
apiVersion: rbac.authorization.k8s.io/v1beta1
94174
kind: ClusterRole
95175
metadata:
@@ -135,37 +215,40 @@ rules:
135215
- update
136216
- delete
137217
- apiGroups:
138-
- "certificates.k8s.io"
218+
- certificates.k8s.io
139219
resources:
140-
- "certificatesigningrequests"
141-
- "certificatesigningrequests/approval"
142-
- "certificatesigningrequests/status"
220+
- certificatesigningrequests
221+
- certificatesigningrequests/approval
222+
- certificatesigningrequests/status
143223
verbs:
144224
- update
145225
- create
146226
- get
147227
- delete
148228
- apiGroups:
149-
- operator.min.io
229+
- certificates.k8s.io
230+
resourceNames:
231+
- kubernetes.io/legacy-unknown
232+
resources:
233+
- signers
234+
verbs:
235+
- approve
236+
- sign
237+
- apiGroups:
238+
- minio.min.io
150239
resources:
151-
- "*"
240+
- '*'
152241
verbs:
153-
- "*"
242+
- '*'
154243
- apiGroups:
155244
- min.io
156245
resources:
157-
- "*"
246+
- '*'
158247
verbs:
159-
- "*"
248+
- '*'
160249
---
161-
apiVersion: v1
162-
kind: ServiceAccount
163-
metadata:
164-
name: minio-operator
165-
namespace: default
166-
---
167-
kind: ClusterRoleBinding
168250
apiVersion: rbac.authorization.k8s.io/v1beta1
251+
kind: ClusterRoleBinding
169252
metadata:
170253
name: minio-operator-binding
171254
roleRef:
@@ -192,12 +275,8 @@ spec:
192275
labels:
193276
name: minio-operator
194277
spec:
195-
serviceAccountName: minio-operator
196278
containers:
197-
- name: minio-operator
198-
image: minio/k8s-operator:2.0.9
279+
- image: minio/k8s-operator:3.0.0
199280
imagePullPolicy: IfNotPresent
200-
# To specify cluster domain, un comment the following:
201-
# env:
202-
# - name: CLUSTER_DOMAIN
203-
# value: mycluster.mydomain
281+
name: minio-operator
282+
serviceAccountName: minio-operator

0 commit comments

Comments
 (0)