fix(k8s): EE-1511 validate secret type is not nil

Bump to 2.6.3
2021-08-30 13:57:11 +12:00 · 2021-08-30 12:47:42 +12:00
4 changed files with 4 additions and 4 deletions
--- a/api/http/handler/handler.go
+++ b/api/http/handler/handler.go
@@ -69,7 +69,7 @@ type Handler struct {
 }

 // @title PortainerCE API
-// @version 2.1.1
+// @version 2.6.3
 // @description.markdown api-description.md
 // @termsOfService

--- a/api/http/proxy/factory/kubernetes/secrets.go
+++ b/api/http/proxy/factory/kubernetes/secrets.go
@@ -158,7 +158,7 @@ func (transport *baseTransport) proxySecretDeleteOperation(request *http.Request
 }

 func isSecretRepresentPrivateRegistry(secret map[string]interface{}) bool {
-	if secret["type"].(string) != string(v1.SecretTypeDockerConfigJson) {
+	if secret["type"] == nil || secret["type"].(string) != string(v1.SecretTypeDockerConfigJson) {
 		return false
 	}

--- a/api/portainer.go
+++ b/api/portainer.go
@@ -1410,7 +1410,7 @@ type (

 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.6.2"
+	APIVersion = "2.6.3"
 	// DBVersion is the version number of the Portainer database
 	DBVersion = 32
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "author": "Portainer.io",
  "name": "portainer",
  "homepage": "http://portainer.io",
-  "version": "2.6.0",
+  "version": "2.6.3",
  "repository": {
    "type": "git",
    "url": "git@github.com:portainer/portainer.git"
Author	SHA1	Message	Date
Simon Meng	5119987fce	fix(k8s): EE-1511 validate secret type is not nil	2021-08-30 13:57:11 +12:00
Stéphane Busso	6ccabb2b88	Bump to 2.6.3	2021-08-30 12:47:42 +12:00