update to v0.3.22

Co-authored-by: Daniel Valdivia <hola@danielvaldivia.com>

k8s/console/base/console-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: console-sa
       containers:
         - name: console
-          image: minio/console:v0.3.21
+          image: minio/console:v0.3.22
           imagePullPolicy: "IfNotPresent"
           args:
             - server

k8s/operator-console/base/console-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: console-sa
       containers:
         - name: console
-          image: minio/console:v0.3.21
+          image: minio/console:v0.3.22
           imagePullPolicy: "IfNotPresent"
           env:
             - name: CONSOLE_OPERATOR_MODE

restapi/admin_tenants.go

@@ -657,7 +657,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
 			return nil, prepareError(errorGeneric)
 		}
 
-		const consoleVersion = "minio/console:v0.3.21"
+		const consoleVersion = "minio/console:v0.3.22"
 		minInst.Spec.Console = &operator.ConsoleConfiguration{
 			Replicas:      1,
 			Image:         consoleVersion,
@@ -792,24 +792,23 @@ func setImageRegistry(ctx context.Context, tenantName string, req *models.ImageR
 	}
 
 	pullSecretName := fmt.Sprintf("%s-regcred", tenantName)
-
-	instanceSecret := corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: pullSecretName,
-			Labels: map[string]string{
-				operator.TenantLabel: tenantName,
-			},
-		},
-		Data: map[string][]byte{
-			corev1.DockerConfigJsonKey: []byte(string(imRegistryJSON)),
-		},
-		Type: corev1.SecretTypeDockerConfigJson,
+	secretCredentials := map[string][]byte{
+		corev1.DockerConfigJsonKey: []byte(string(imRegistryJSON)),
 	}
-
 	// Get or Create secret if it doesn't exist
-	_, err = clientset.Secrets(namespace).Get(ctx, pullSecretName, metav1.GetOptions{})
+	currentSecret, err := clientset.Secrets(namespace).Get(ctx, pullSecretName, metav1.GetOptions{})
 	if err != nil {
 		if k8sErrors.IsNotFound(err) {
+			instanceSecret := corev1.Secret{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: pullSecretName,
+					Labels: map[string]string{
+						operator.TenantLabel: tenantName,
+					},
+				},
+				Data: secretCredentials,
+				Type: corev1.SecretTypeDockerConfigJson,
+			}
 			_, err = clientset.Secrets(namespace).Create(ctx, &instanceSecret, metav1.CreateOptions{})
 			if err != nil {
 				return "", err
@@ -818,7 +817,8 @@ func setImageRegistry(ctx context.Context, tenantName string, req *models.ImageR
 		}
 		return "", err
 	}
-	_, err = clientset.Secrets(namespace).Update(ctx, &instanceSecret, metav1.UpdateOptions{})
+	currentSecret.Data = secretCredentials
+	_, err = clientset.Secrets(namespace).Update(ctx, currentSecret, metav1.UpdateOptions{})
 	if err != nil {
 		return "", err
 	}

restapi/admin_tenants_test.go

@@ -871,7 +871,7 @@ func Test_UpdateTenantAction(t *testing.T) {
 				},
 				params: admin_api.UpdateTenantParams{
 					Body: &models.UpdateTenantRequest{
-						ConsoleImage: "minio/console:v0.3.21",
+						ConsoleImage: "minio/console:v0.3.22",
 					},
 				},
 			},

restapi/error.go

@@ -87,12 +87,12 @@ func prepareError(err ...error) *models.Error {
 			errorMessage = errorGenericInvalidSession.Error()
 		}
 		// if we received a second error take that as friendly message but dont override the code
-		if len(err) > 1 {
+		if len(err) > 1 && err[1] != nil {
 			log.Print("friendly error: ", err[1].Error())
 			errorMessage = err[1].Error()
 		}
 		// if we receive third error we just print that as debugging
-		if len(err) > 2 {
+		if len(err) > 2 && err[2] != nil {
 			log.Print("debugging error: ", err[2].Error())
 		}
 	}