Update default images and remove reference to mcs (#261)

minio · Aug 20, 2020 · 7dfdaf5 · 7dfdaf5
1 parent ea73bb4
commit 7dfdaf5
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 27 deletions.
diff --git a/examples/tenant-console.yaml b/examples/tenant-console.yaml
@@ -37,7 +37,7 @@ spec:
       prometheus.io/port: "9000"
       prometheus.io/scrape: "true"
   ## Registry location and Tag to download MinIO Server image
-  image: minio/minio:RELEASE.2020-08-16T18-39-38Z
+  image: minio/minio:RELEASE.2020-08-18T19-41-00Z
   imagePullPolicy: IfNotPresent
   ## Secret with credentials to be used by MinIO instance.
   credsSecret:
@@ -67,7 +67,7 @@ spec:
 
   ## Define configuration for Console (Graphical user interface for MinIO)
   console:
-    image: minio/console:v0.3.0
+    image: minio/console:v0.3.14
     imagePullPolicy: IfNotPresent
     replicas: 2
     consoleSecret:

diff --git a/examples/tenant-kes.yaml b/examples/tenant-kes.yaml
@@ -37,7 +37,7 @@ spec:
       prometheus.io/port: "9000"
       prometheus.io/scrape: "true"
   ## Registry location and Tag to download MinIO Server image
-  image: minio/minio:RELEASE.2020-08-16T18-39-38Z
+  image: minio/minio:RELEASE.2020-08-18T19-41-00Z
   imagePullPolicy: IfNotPresent
   ## Secret with credentials to be used by MinIO instance.
   credsSecret:
@@ -68,7 +68,7 @@ spec:
 
   ## Define configuration for Console (Graphical user interface for MinIO)
   console:
-    image: minio/console:v0.3.0
+    image: minio/console:v0.3.14
     imagePullPolicy: IfNotPresent
     replicas: 2
     consoleSecret:

diff --git a/examples/tenant-pod-security-policy.yaml b/examples/tenant-pod-security-policy.yaml
@@ -78,7 +78,7 @@ spec:
       prometheus.io/port: "9000"
       prometheus.io/scrape: "true"
   ## Registry location and Tag to download MinIO Server image
-  image: minio/minio:RELEASE.2020-08-16T18-39-38Z
+  image: minio/minio:RELEASE.2020-08-18T19-41-00Z
   ## Service account to be used for all the MinIO Pods
   serviceAccountName: minio-pods
   zones:

diff --git a/examples/tenant.yaml b/examples/tenant.yaml
@@ -27,7 +27,7 @@ spec:
       prometheus.io/scrape: "true"
 
   ## Registry location and Tag to download MinIO Server image
-  image: minio/minio:RELEASE.2020-08-16T18-39-38Z
+  image: minio/minio:RELEASE.2020-08-18T19-41-00Z
   imagePullPolicy: IfNotPresent
   zones:
     - servers: 4

diff --git a/kubectl-minio/README.md b/kubectl-minio/README.md
@@ -41,7 +41,7 @@ example: `kubectl minio tenant create --name tenant1 --secret cred-secret --serv
 Options:
 
 - `--namespace=minio`
-- `--image=minio/minio:RELEASE.2020-07-31T03-39-05Z`
+- `--image=minio/minio:RELEASE.2020-08-18T19-41-00Z`
 - `--storageClass=local`
 - `--kms-secret=secret-name`
 - `--console-secret=secret-name`

diff --git a/kubectl-minio/cmd/cmd-tenant-upgrade.go b/kubectl-minio/cmd/cmd-tenant-upgrade.go
@@ -38,7 +38,7 @@ import (
 const (
 	upgradeDesc = `
 'upgrade' command upgrades a MinIO tenant to the specified MinIO version`
-	upgradeExample = `  kubectl minio tenant upgrade --name tenant1 --image minio/minio:RELEASE.2020-08-08T04-50-06Z --namespace tenant1-ns`
+	upgradeExample = `  kubectl minio tenant upgrade --name tenant1 --image minio/minio:RELEASE.2020-08-18T19-41-00Z --namespace tenant1-ns`
 )
 
 type upgradeCmd struct {

diff --git a/kubectl-minio/cmd/helpers/constants.go b/kubectl-minio/cmd/helpers/constants.go
@@ -72,16 +72,16 @@ const (
 	DefaultImagePullPolicy = corev1.PullIfNotPresent
 
 	// DefaultOperatorImage is the default operator image to be used
-	DefaultOperatorImage = "minio/k8s-operator:v3.0.5"
+	DefaultOperatorImage = "minio/k8s-operator:v3.0.13"
 
 	// DefaultTenantImage is the default MinIO image used while creating tenant
-	DefaultTenantImage = "minio/minio:RELEASE.2020-07-31T03-39-05Z"
+	DefaultTenantImage = "minio/minio:RELEASE.2020-08-18T19-41-00Z"
 
 	// DefaultKESImage is the default KES image used while creating tenant
-	DefaultKESImage = "minio/kes:v0.10.1"
+	DefaultKESImage = "minio/kes:v0.11.0"
 
-	// DefaultMCSImage is the default MCS image used while creating tenant
-	DefaultMCSImage = "minio/mcs:v0.3.4"
+	// DefaultConsoleImage is the default console image used while creating tenant
+	DefaultConsoleImage = "minio/console:v0.3.14"
 )
 
 // DefaultLivenessCheck for MinIO tenants
@@ -97,5 +97,5 @@ var DeploymentReplicas int32 = 1
 // KESReplicas is the number of replicas for MinIO KES
 var KESReplicas int32 = 2
 
-// MCSReplicas is the number of replicas for MinIO MCS
-var MCSReplicas int32 = 2
+// ConsoleReplicas is the number of replicas for MinIO Console
+var ConsoleReplicas int32 = 2
diff --git a/kubectl-minio/cmd/resources/tenant.go b/kubectl-minio/cmd/resources/tenant.go
@@ -90,9 +90,9 @@ func tenantKESLabels(name string) map[string]string {
 	return m
 }
 
-func tenantMCSLabels(name string) map[string]string {
+func tenantConsoleLabels(name string) map[string]string {
 	m := make(map[string]string, 1)
-	m["app"] = name + "-mcs"
+	m["app"] = name + "-console"
 	return m
 }
 
@@ -120,16 +120,16 @@ func tenantKESConfig(tenant, secret string) *miniov1.KESConfig {
 	return nil
 }
 
-func tenantMCSConfig(tenant, secret string) *miniov1.ConsoleConfiguration {
+func tenantConsoleConfig(tenant, secret string) *miniov1.ConsoleConfiguration {
 	if secret != "" {
 		return &miniov1.ConsoleConfiguration{
-			Replicas: helpers.MCSReplicas,
-			Image:    helpers.DefaultMCSImage,
+			Replicas: helpers.ConsoleReplicas,
+			Image:    helpers.DefaultConsoleImage,
 			ConsoleSecret: &v1.LocalObjectReference{
 				Name: secret,
 			},
 			Metadata: &metav1.ObjectMeta{
-				Labels: tenantMCSLabels(tenant),
+				Labels: tenantConsoleLabels(tenant),
 			},
 		}
 	}
@@ -182,7 +182,7 @@ func NewTenant(opts *TenantOptions) (*miniov1.Tenant, error) {
 			Mountpath:          helpers.MinIOMountPath,
 			Liveness:           helpers.DefaultLivenessCheck,
 			KES:                tenantKESConfig(opts.Name, opts.KmsSecret),
-			Console:            tenantMCSConfig(opts.Name, opts.ConsoleSecret),
+			Console:            tenantConsoleConfig(opts.Name, opts.ConsoleSecret),
 			ExternalCertSecret: externalCertSecret(opts.CertSecret),
 			ImagePullSecret:    v1.LocalObjectReference{Name: opts.ImagePullSecret},
 		},

diff --git a/pkg/apis/minio.min.io/v1/constants.go b/pkg/apis/minio.min.io/v1/constants.go
@@ -74,7 +74,7 @@ const MinIOVolumeMountPath = "/export"
 const MinIOVolumeSubPath = ""
 
 // DefaultMinIOImage specifies the default MinIO Docker hub image
-const DefaultMinIOImage = "minio/minio:RELEASE.2020-08-16T18-39-38Z"
+const DefaultMinIOImage = "minio/minio:RELEASE.2020-08-18T19-41-00Z"
 
 // DefaultMinIOUpdateURL specifies the default MinIO URL where binaries are
 // pulled from during MinIO upgrades
@@ -111,7 +111,7 @@ const LivenessFailureThreshold = 1
 // Console Related Constants
 
 // DefaultConsoleImage specifies the latest Console Docker hub image
-const DefaultConsoleImage = "minio/console:v0.3.0"
+const DefaultConsoleImage = "minio/console:v0.3.14"
 
 // ConsoleTenantLabel is applied to the Console pods of a Tenant cluster
 const ConsoleTenantLabel = "v1.min.io/console"

diff --git a/testing/patching/upgrade-one-zone-step-1.yaml b/testing/patching/upgrade-one-zone-step-1.yaml
@@ -12,7 +12,7 @@ kind: Tenant
 metadata:
   name: upgrade-one-zone
 spec:
-  image: minio/minio:RELEASE.2020-08-13T02-39-50Z
+  image: minio/minio:RELEASE.2020-08-18T19-41-00Z
   zones:
     - servers: 1
       volumesPerServer: 4

diff --git a/testing/patching/upgrade-one-zone-step-2.yaml b/testing/patching/upgrade-one-zone-step-2.yaml
@@ -12,7 +12,7 @@ kind: Tenant
 metadata:
   name: upgrade-one-zone
 spec:
-  image: minio/minio:RELEASE.2020-08-16T18-39-38Z
+  image: minio/minio:RELEASE.2020-08-18T19-41-00Z
   zones:
     - servers: 1
       volumesPerServer: 4

diff --git a/testing/patching/upgrade-two-zones-step-2.yaml b/testing/patching/upgrade-two-zones-step-2.yaml
@@ -12,7 +12,7 @@ kind: Tenant
 metadata:
   name: upgrade-two-zones
 spec:
-  image: minio/minio:RELEASE.2020-08-16T18-39-38Z
+  image: minio/minio:RELEASE.2020-08-18T19-41-00Z
   zones:
     - servers: 4
       volumesPerServer: 4