Skip to content

Commit

Permalink
Update minio to 1.0.7 (#134)
Browse files Browse the repository at this point in the history
* update minio operator dependencies

* update minio manifests to use 1.0.7
  • Loading branch information
Carlos Tadeu Panato Junior committed Mar 30, 2020
1 parent 0b24247 commit b87e314
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 10 deletions.
8 changes: 7 additions & 1 deletion docs/minio-operator/minio-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ spec:
kind: MinIOInstance
singular: minioinstance
plural: minioinstances
preserveUnknownFields: true
validation:
# openAPIV3Schema is the schema for validating custom objects.
# Refer https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#specifying-a-structural-schema
Expand All @@ -30,6 +31,10 @@ spec:
type: string
subpath:
type: string
additionalPrinterColumns:
- name: Replicas
type: integer
JSONPath: ".spec.replicas"
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
Expand Down Expand Up @@ -60,6 +65,7 @@ rules:
- list
- patch
- watch
- update
- apiGroups:
- "certificates.k8s.io"
resources:
Expand Down Expand Up @@ -121,5 +127,5 @@ spec:
serviceAccountName: minio-operator-sa
containers:
- name: minio-operator
image: minio/k8s-operator:1.0.4
image: minio/k8s-operator:1.0.7
imagePullPolicy: IfNotPresent
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/json-iterator/go v1.1.9 // indirect
github.com/mattermost/blubr v0.0.0-20200113232543-f0ce67760aeb
github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb
github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19
github.com/operator-framework/operator-sdk v0.16.0
github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.9.1
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@ github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWB
github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb h1:CHutg1z2Ktpz+f20poioJq1PRPCDoHW072LLdgwMby4=
github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb/go.mod h1:pGokMmbfgUzaDjoohGaz8AEthLb1EQCPPftynyiKKzY=
github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19 h1:8UtY1V5Tz7hMB98pE2Bvs9+VUvO4cYj60wxMD63LvQc=
github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19/go.mod h1:pGokMmbfgUzaDjoohGaz8AEthLb1EQCPPftynyiKKzY=
github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
Expand Down Expand Up @@ -1004,8 +1004,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200117161641-43d50277825c h1:2EA2K0k9bcvvEDlqD8xdlOhCOqq+O/p9Voqi4x9W1YU=
golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 h1:0sfSpGSa544Fwnbot3Oxq/U6SXqjty6Jy/3wRhVS7ig=
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200327172716-42235f63843a h1:nZPvz874FG8d8iARpJWCyVtmJAV8Nnr6xqKDvQRhXFA=
golang.org/x/tools v0.0.0-20200327172716-42235f63843a/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
Expand Down
28 changes: 27 additions & 1 deletion test/crds/minio_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,33 @@ metadata:
spec:
group: miniocontroller.min.io
version: v1beta1
scope: Namespaced
names:
kind: MinIOInstance
singular: minioinstance
plural: minioinstances
scope: Namespaced
preserveUnknownFields: true
validation:
# openAPIV3Schema is the schema for validating custom objects.
# Refer https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#specifying-a-structural-schema
# for more details
openAPIV3Schema:
type: object
properties:
spec:
type: object
properties:
replicas:
type: integer
minimum: 1
maximum: 32
version:
type: string
mountpath:
type: string
subpath:
type: string
additionalPrinterColumns:
- name: Replicas
type: integer
JSONPath: ".spec.replicas"
4 changes: 2 additions & 2 deletions test/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ main() {
docker pull quay.io/presslabs/mysql-operator:0.3.3
docker pull quay.io/presslabs/mysql-operator-sidecar:0.3.3
docker pull quay.io/presslabs/mysql-operator-orchestrator:0.3.3
docker pull minio/k8s-operator:1.0.4
docker pull minio/k8s-operator:1.0.7

kind load docker-image quay.io/presslabs/mysql-operator:0.3.3
kind load docker-image quay.io/presslabs/mysql-operator-sidecar:0.3.3
kind load docker-image quay.io/presslabs/mysql-operator-orchestrator:0.3.3
kind load docker-image minio/k8s-operator:1.0.4
kind load docker-image minio/k8s-operator:1.0.7
sleep 10

# Create a namespace for testing operator.
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ github.com/markbates/inflect
github.com/mattermost/blubr
# github.com/matttproud/golang_protobuf_extensions v1.0.1
github.com/matttproud/golang_protobuf_extensions/pbutil
# github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb
# github.com/minio/minio-operator v0.0.0-20200214142425-158e343f1f19
github.com/minio/minio-operator/pkg/apis/miniocontroller
github.com/minio/minio-operator/pkg/apis/miniocontroller/v1beta1
github.com/minio/minio-operator/pkg/constants
Expand Down

0 comments on commit b87e314

Please sign in to comment.