Skip to content

Commit b87e314

Browse files
author
Carlos Tadeu Panato Junior
authored
Update minio to 1.0.7 (#134)
* update minio operator dependencies * update minio manifests to use 1.0.7
1 parent 0b24247 commit b87e314

File tree

6 files changed

+40
-10
lines changed

6 files changed

+40
-10
lines changed

docs/minio-operator/minio-operator.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ spec:
1010
kind: MinIOInstance
1111
singular: minioinstance
1212
plural: minioinstances
13+
preserveUnknownFields: true
1314
validation:
1415
# openAPIV3Schema is the schema for validating custom objects.
1516
# Refer https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#specifying-a-structural-schema
@@ -30,6 +31,10 @@ spec:
3031
type: string
3132
subpath:
3233
type: string
34+
additionalPrinterColumns:
35+
- name: Replicas
36+
type: integer
37+
JSONPath: ".spec.replicas"
3338
---
3439
apiVersion: rbac.authorization.k8s.io/v1beta1
3540
kind: ClusterRole
@@ -60,6 +65,7 @@ rules:
6065
- list
6166
- patch
6267
- watch
68+
- update
6369
- apiGroups:
6470
- "certificates.k8s.io"
6571
resources:
@@ -121,5 +127,5 @@ spec:
121127
serviceAccountName: minio-operator-sa
122128
containers:
123129
- name: minio-operator
124-
image: minio/k8s-operator:1.0.4
130+
image: minio/k8s-operator:1.0.7
125131
imagePullPolicy: IfNotPresent

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/hashicorp/golang-lru v0.5.4 // indirect
1515
github.com/json-iterator/go v1.1.9 // indirect
1616
github.com/mattermost/blubr v0.0.0-20200113232543-f0ce67760aeb
17-
github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb
17+
github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19
1818
github.com/operator-framework/operator-sdk v0.16.0
1919
github.com/pborman/uuid v1.2.0
2020
github.com/pkg/errors v0.9.1

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWB
551551
github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
552552
github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
553553
github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
554-
github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb h1:CHutg1z2Ktpz+f20poioJq1PRPCDoHW072LLdgwMby4=
555-
github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb/go.mod h1:pGokMmbfgUzaDjoohGaz8AEthLb1EQCPPftynyiKKzY=
554+
github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19 h1:8UtY1V5Tz7hMB98pE2Bvs9+VUvO4cYj60wxMD63LvQc=
555+
github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19/go.mod h1:pGokMmbfgUzaDjoohGaz8AEthLb1EQCPPftynyiKKzY=
556556
github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
557557
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
558558
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -1004,8 +1004,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
10041004
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
10051005
golang.org/x/tools v0.0.0-20200117161641-43d50277825c h1:2EA2K0k9bcvvEDlqD8xdlOhCOqq+O/p9Voqi4x9W1YU=
10061006
golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
1007-
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 h1:0sfSpGSa544Fwnbot3Oxq/U6SXqjty6Jy/3wRhVS7ig=
1008-
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
10091007
golang.org/x/tools v0.0.0-20200327172716-42235f63843a h1:nZPvz874FG8d8iARpJWCyVtmJAV8Nnr6xqKDvQRhXFA=
10101008
golang.org/x/tools v0.0.0-20200327172716-42235f63843a/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
10111009
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=

test/crds/minio_crd.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,33 @@ metadata:
55
spec:
66
group: miniocontroller.min.io
77
version: v1beta1
8+
scope: Namespaced
89
names:
910
kind: MinIOInstance
11+
singular: minioinstance
1012
plural: minioinstances
11-
scope: Namespaced
13+
preserveUnknownFields: true
14+
validation:
15+
# openAPIV3Schema is the schema for validating custom objects.
16+
# Refer https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#specifying-a-structural-schema
17+
# for more details
18+
openAPIV3Schema:
19+
type: object
20+
properties:
21+
spec:
22+
type: object
23+
properties:
24+
replicas:
25+
type: integer
26+
minimum: 1
27+
maximum: 32
28+
version:
29+
type: string
30+
mountpath:
31+
type: string
32+
subpath:
33+
type: string
34+
additionalPrinterColumns:
35+
- name: Replicas
36+
type: integer
37+
JSONPath: ".spec.replicas"

test/e2e.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ main() {
8282
docker pull quay.io/presslabs/mysql-operator:0.3.3
8383
docker pull quay.io/presslabs/mysql-operator-sidecar:0.3.3
8484
docker pull quay.io/presslabs/mysql-operator-orchestrator:0.3.3
85-
docker pull minio/k8s-operator:1.0.4
85+
docker pull minio/k8s-operator:1.0.7
8686

8787
kind load docker-image quay.io/presslabs/mysql-operator:0.3.3
8888
kind load docker-image quay.io/presslabs/mysql-operator-sidecar:0.3.3
8989
kind load docker-image quay.io/presslabs/mysql-operator-orchestrator:0.3.3
90-
kind load docker-image minio/k8s-operator:1.0.4
90+
kind load docker-image minio/k8s-operator:1.0.7
9191
sleep 10
9292

9393
# Create a namespace for testing operator.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ github.com/markbates/inflect
111111
github.com/mattermost/blubr
112112
# github.com/matttproud/golang_protobuf_extensions v1.0.1
113113
github.com/matttproud/golang_protobuf_extensions/pbutil
114-
# github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb
114+
# github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19
115115
github.com/minio/minio-operator/pkg/apis/miniocontroller
116116
github.com/minio/minio-operator/pkg/apis/miniocontroller/v1beta1
117117
github.com/minio/minio-operator/pkg/constants

0 commit comments

Comments
 (0)