From 4cb5644b4eeaae8ba90ce291fdbd61aa4c9c39c7 Mon Sep 17 00:00:00 2001 From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> Date: Tue, 19 Dec 2023 10:12:14 -0600 Subject: [PATCH] Upgrade controller-gen and madmin-go (#1919) Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- helm/operator/templates/minio.min.io_tenants.yaml | 3 +-- helm/operator/templates/sts.min.io_policybindings.yaml | 3 +-- kubectl-minio/go.mod | 2 +- kubectl-minio/go.sum | 4 ++-- resources/base/crds/minio.min.io_tenants.yaml | 3 +-- resources/base/crds/sts.min.io_policybindings.yaml | 3 +-- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 8292908dcd0..328064d0b0b 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ clean: @rm -rf dist/ regen-crd: - @go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.1 + @go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 @${GOPATH}/bin/controller-gen crd:maxDescLen=0,generateEmbeddedObjectMeta=true paths="./..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS) @sed 's#namespace: minio-operator#namespace: {{ .Release.Namespace }}#g' resources/base/crds/minio.min.io_tenants.yaml > $(HELM_TEMPLATES)/minio.min.io_tenants.yaml @sed 's#namespace: minio-operator#namespace: {{ .Release.Namespace }}#g' resources/base/crds/sts.min.io_policybindings.yaml > $(HELM_TEMPLATES)/sts.min.io_policybindings.yaml diff --git a/go.mod b/go.mod index 67555923ca8..f2246fa0380 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/miekg/dns v1.1.57 github.com/minio/cli v1.24.2 github.com/minio/highwayhash v1.0.2 - github.com/minio/madmin-go/v3 v3.0.35 + github.com/minio/madmin-go/v3 v3.0.36 github.com/minio/mc v0.0.0-20231202112410-d920e2b34b22 github.com/minio/minio-go/v7 v7.0.65 github.com/minio/pkg v1.7.5 diff --git a/go.sum b/go.sum index 331897a8a75..83524f3ba99 100644 --- a/go.sum +++ b/go.sum @@ -254,8 +254,8 @@ github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/kes-go v0.2.1 h1:KnqS+p6xoSFJZbQhmJaz/PbxeA6nQyRqT/ywrn5lU2o= github.com/minio/kes-go v0.2.1/go.mod h1:76xf7l41Wrh+IifisABXK2S8uZWYgWV1IGBKC3GdOJk= -github.com/minio/madmin-go/v3 v3.0.35 h1:cCo5ZZpHA+rlBQbsAcwFwiuh/uHJmjVoDDx1G4+zaho= -github.com/minio/madmin-go/v3 v3.0.35/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8= +github.com/minio/madmin-go/v3 v3.0.36 h1:Ewu/Rt7WVSs9slWW+SZHRc5RPQdYAGIdNZnRr+gyN4k= +github.com/minio/madmin-go/v3 v3.0.36/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8= github.com/minio/mc v0.0.0-20231202112410-d920e2b34b22 h1:U3IKVR1Bi3MqnfLTZw2JUlrA2P1aQGSDESDyYUXqPtI= github.com/minio/mc v0.0.0-20231202112410-d920e2b34b22/go.mod h1:vF9a6M3hgtBXuqSn+LePUoEc9r2+3AsRABuPzGpNBGk= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= diff --git a/helm/operator/templates/minio.min.io_tenants.yaml b/helm/operator/templates/minio.min.io_tenants.yaml index 24331b5b942..2350fb2825d 100644 --- a/helm/operator/templates/minio.min.io_tenants.yaml +++ b/helm/operator/templates/minio.min.io_tenants.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: tenants.minio.min.io spec: group: minio.min.io diff --git a/helm/operator/templates/sts.min.io_policybindings.yaml b/helm/operator/templates/sts.min.io_policybindings.yaml index b01576f5bda..b329389ef3b 100644 --- a/helm/operator/templates/sts.min.io_policybindings.yaml +++ b/helm/operator/templates/sts.min.io_policybindings.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: policybindings.sts.min.io spec: group: sts.min.io diff --git a/kubectl-minio/go.mod b/kubectl-minio/go.mod index 5b45f452ac5..9d8edd6d10d 100644 --- a/kubectl-minio/go.mod +++ b/kubectl-minio/go.mod @@ -62,7 +62,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/dns v1.1.57 // indirect - github.com/minio/madmin-go/v3 v3.0.35 // indirect + github.com/minio/madmin-go/v3 v3.0.36 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/minio-go/v7 v7.0.65 // indirect github.com/minio/sha256-simd v1.0.1 // indirect diff --git a/kubectl-minio/go.sum b/kubectl-minio/go.sum index 9503bf19066..e0c55b7e9cb 100644 --- a/kubectl-minio/go.sum +++ b/kubectl-minio/go.sum @@ -143,8 +143,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM= github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk= -github.com/minio/madmin-go/v3 v3.0.35 h1:cCo5ZZpHA+rlBQbsAcwFwiuh/uHJmjVoDDx1G4+zaho= -github.com/minio/madmin-go/v3 v3.0.35/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8= +github.com/minio/madmin-go/v3 v3.0.36 h1:Ewu/Rt7WVSs9slWW+SZHRc5RPQdYAGIdNZnRr+gyN4k= +github.com/minio/madmin-go/v3 v3.0.36/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.65 h1:sOlB8T3nQK+TApTpuN3k4WD5KasvZIE3vVFzyyCa0go= diff --git a/resources/base/crds/minio.min.io_tenants.yaml b/resources/base/crds/minio.min.io_tenants.yaml index 24331b5b942..2350fb2825d 100644 --- a/resources/base/crds/minio.min.io_tenants.yaml +++ b/resources/base/crds/minio.min.io_tenants.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: tenants.minio.min.io spec: group: minio.min.io diff --git a/resources/base/crds/sts.min.io_policybindings.yaml b/resources/base/crds/sts.min.io_policybindings.yaml index b01576f5bda..b329389ef3b 100644 --- a/resources/base/crds/sts.min.io_policybindings.yaml +++ b/resources/base/crds/sts.min.io_policybindings.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: policybindings.sts.min.io spec: group: sts.min.io