minio · dvaldivia · Jan 10, 2021 · Jan 20, 2021 · Jan 20, 2021 · Jan 20, 2021
diff --git a/Makefile b/Makefile
@@ -6,13 +6,13 @@ VERSION ?= $(shell git describe --tags)
 endif
 TAG ?= "minio/operator:$(VERSION)"
 LDFLAGS ?= "-s -w -X main.Version=$(VERSION)"
-
+TMPFILE := $(shell mktemp)
 GOPATH := $(shell go env GOPATH)
 GOARCH := $(shell go env GOARCH)
 GOOS := $(shell go env GOOS)
 
 KUSTOMIZE_HOME=operator-kustomize
-KUSTOMIZE_CRDS=$(KUSTOMIZE_HOME)/crds/
+KUSTOMIZE_CRDS=$(KUSTOMIZE_HOME)/base/crds/
 
 PLUGIN_HOME=kubectl-minio
 
@@ -54,8 +54,12 @@ clean:
 	@rm -rf dist/
 
 regen-crd:
-	@which controller-gen 1>/dev/null || (echo "Installing controller-gen" && GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
-	@controller-gen crd:trivialVersions=true paths="./..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS)
+	@GO111MODULE=on go get github.com/minio/controller-tools/cmd/controller-gen@v0.4.6
+	@echo "WARNING: for the time being, you need to clone and build github.com/minio/controller-tools/cmd/controller-gen@v0.4.6"
+	@echo "Any other controller-gen will cause the generated CRD to lose the volumeClaimTemplate metadata to be lost"
+	@controller-gen crd:maxDescLen=0,generateEmbeddedObjectMeta=true paths="./..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS)
+	@kustomize build operator-kustomize/patch-crd > $(TMPFILE)
+	@mv -f $(TMPFILE) operator-kustomize/base/crds/minio.min.io_tenants.yaml
 
 regen-crd-docs:
 	@which crd-ref-docs 1>/dev/null || (echo "Installing crd-ref-docs" && GO111MODULE=on go get github.com/elastic/crd-ref-docs)

diff --git a/docs/crd.adoc b/docs/crd.adoc
diff --git a/examples/patch.yaml b/examples/patch.yaml
@@ -1,4 +1,4 @@
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio

diff --git a/examples/tenant-encryption.yaml b/examples/tenant-encryption.yaml
@@ -88,7 +88,7 @@ stringData:
       #       token: ""      # Your AWS session token (usually optional)
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio
@@ -224,15 +224,15 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     consoleSecret:
       name: console-secret
 
   ## Define configuration for KES (stateless and distributed key-management system)
   ## Refer https://github.com/minio/kes
   kes:
-    image: minio/kes:v0.12.1
+    image: minio/kes:v0.13.4
     replicas: 2
     kesSecret:
       name: kes-config

diff --git a/examples/tenant-log-search.yaml b/examples/tenant-log-search.yaml
@@ -11,7 +11,7 @@ data:
   secretkey: bWluaW8xMjM=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio

diff --git a/examples/tenant-pod-security-policy.yaml b/examples/tenant-pod-security-policy.yaml
@@ -59,7 +59,7 @@ subjects:
   name: minio-pods
   namespace: default
 ---
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio

diff --git a/examples/tenant-prometheus.yaml b/examples/tenant-prometheus.yaml
@@ -11,7 +11,7 @@ data:
   secretkey: bWluaW8xMjM=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio

diff --git a/examples/tenant-with-autocert-and-custom-certs-encryption-enabled.yaml b/examples/tenant-with-autocert-and-custom-certs-encryption-enabled.yaml
@@ -81,7 +81,7 @@ data:
   CONSOLE_SECRET_KEY: WU9VUkNPTlNPTEVTRUNSRVQ=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio-autocert-custom-cert-encryption-minio
@@ -174,7 +174,7 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     externalCertSecret:
       name: minio-autocert-custom-cert-encryption-localhost-cert
@@ -184,7 +184,7 @@ spec:
   ## Define configuration for KES (stateless and distributed key-management system)
   ## Refer https://github.com/minio/kes
   kes:
-    image: minio/kes:v0.12.1
+    image: minio/kes:v0.13.4
     replicas: 2
     kesSecret:
       name: minio-autocert-custom-cert-encryption-kes-config
diff --git a/examples/tenant-with-autocert-and-ldap.yaml b/examples/tenant-with-autocert-and-ldap.yaml
@@ -127,7 +127,7 @@ data:
   CONSOLE_SECRET_KEY: YmlsbHkxMjM=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio-autocert-ldap

diff --git a/examples/tenant-with-autocert-encryption-disabled.yaml b/examples/tenant-with-autocert-encryption-disabled.yaml
@@ -27,7 +27,7 @@ data:
   CONSOLE_SECRET_KEY: WU9VUkNPTlNPTEVTRUNSRVQ=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio-autocert-no-encryption
@@ -116,7 +116,7 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     consoleSecret:
       name: minio-autocert-no-encryption-console-secret
diff --git a/examples/tenant-with-autocert-encryption-enabled.yaml b/examples/tenant-with-autocert-encryption-enabled.yaml
@@ -70,7 +70,7 @@ stringData:
            ping: 10s   # Duration until the server checks Vault's status again.
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio-autocert-encryption
@@ -159,14 +159,14 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     consoleSecret:
       name: minio-autocert-encryption-console-secret
   ## Define configuration for KES (stateless and distributed key-management system)
   ## Refer https://github.com/minio/kes
   kes:
-    image: minio/kes:v0.12.1
+    image: minio/kes:v0.13.4
     replicas: 2
     kesSecret:
       name: minio-autocert-encryption-kes-config

diff --git a/examples/tenant-with-custom-ca-certs.yaml b/examples/tenant-with-custom-ca-certs.yaml
@@ -66,7 +66,7 @@ data:
   CONSOLE_SECRET_KEY: WU9VUkNPTlNPTEVTRUNSRVQ=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio-custom-cert-no-encryption-minio
@@ -170,7 +170,7 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     consoleSecret:
       name: minio-custom-cert-no-encryption-console-secret

diff --git a/examples/tenant-with-custom-cert-encryption-disabled.yaml b/examples/tenant-with-custom-cert-encryption-disabled.yaml
@@ -58,7 +58,7 @@ data:
   CONSOLE_SECRET_KEY: WU9VUkNPTlNPTEVTRUNSRVQ=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio-custom-cert-no-encryption-minio
@@ -156,7 +156,7 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     consoleSecret:
       name: minio-custom-cert-no-encryption-console-secret

diff --git a/examples/tenant-with-custom-cert-encryption-enabled.yaml b/examples/tenant-with-custom-cert-encryption-enabled.yaml
@@ -121,7 +121,7 @@ data:
   CONSOLE_SECRET_KEY: WU9VUkNPTlNPTEVTRUNSRVQ=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio-custom-cert-encryption-minio
@@ -223,7 +223,7 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     consoleSecret:
       name: minio-custom-cert-encryption-console-secret
@@ -233,7 +233,7 @@ spec:
   ## Define configuration for KES (stateless and distributed key-management system)
   ## Refer https://github.com/minio/kes
   kes:
-    image: minio/kes:v0.12.1
+    image: minio/kes:v0.13.4
     replicas: 2
     externalCertSecret:
       name: minio-custom-cert-encryption-cluster-cert

diff --git a/examples/tenant.yaml b/examples/tenant.yaml
@@ -27,7 +27,7 @@ data:
   CONSOLE_SECRET_KEY: WU9VUkNPTlNPTEVTRUNSRVQ=
 ---
 ## MinIO Tenant Definition
-apiVersion: minio.min.io/v1
+apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: minio
@@ -163,7 +163,7 @@ spec:
   ## Define configuration for Console (Graphical user interface for MinIO)
   ## Refer https://github.com/minio/console
   console:
-    image: minio/console:v0.4.6
+    image: minio/console:v0.5.2
     replicas: 2
     consoleSecret:
       name: console-secret
diff --git a/go.mod b/go.mod
@@ -1,21 +1,23 @@
 module github.com/minio/operator
 
-go 1.13
+go 1.15
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017
 	github.com/google/go-containerregistry v0.1.2
 	github.com/gorilla/mux v1.8.0
-	github.com/minio/minio v0.0.0-20201203193910-919441d9c4d2
-	github.com/minio/minio-go/v7 v7.0.6
+	github.com/minio/controller-tools v0.4.6 // indirect
+	github.com/minio/minio v0.0.0-20210128013121-e79829b5b368
+	github.com/minio/minio-go/v7 v7.0.8-0.20210127003153-c40722862654
 	github.com/secure-io/sio-go v0.3.1 // indirect
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
 	gopkg.in/yaml.v2 v2.3.0
-	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
-	k8s.io/api v0.18.6
-	k8s.io/apimachinery v0.18.8
-	k8s.io/client-go v0.18.6
+	k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver v0.20.2
+	k8s.io/apimachinery v0.20.2
+	k8s.io/client-go v0.20.2
 	k8s.io/klog/v2 v2.4.0
+	sigs.k8s.io/controller-runtime v0.8.0
 )