Compare commits

...

2 Commits

Author SHA1 Message Date
James Player c4ca049ab8 Bump version to v2.28.1 (#545) 2025-03-20 14:12:55 +13:00
Oscar Zhou 80cc44a17b fix(k8s/config): force insecure-skip-tls-verify option for internal use [BE-11706] (#538) 2025-03-20 08:49:35 +13:00
6 changed files with 16 additions and 5 deletions
@@ -610,7 +610,7 @@
"RequiredPasswordLength": 12 "RequiredPasswordLength": 12
}, },
"KubeconfigExpiry": "0", "KubeconfigExpiry": "0",
"KubectlShellImage": "portainer/kubectl-shell:2.28.0", "KubectlShellImage": "portainer/kubectl-shell:2.28.1",
"LDAPSettings": { "LDAPSettings": {
"AnonymousMode": true, "AnonymousMode": true,
"AutoCreateUsers": true, "AutoCreateUsers": true,
@@ -943,7 +943,7 @@
} }
], ],
"version": { "version": {
"VERSION": "{\"SchemaVersion\":\"2.28.0\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}" "VERSION": "{\"SchemaVersion\":\"2.28.1\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
}, },
"webhooks": null "webhooks": null
} }
+1 -1
View File
@@ -81,7 +81,7 @@ type Handler struct {
} }
// @title PortainerCE API // @title PortainerCE API
// @version 2.28.0 // @version 2.28.1
// @description.markdown api-description.md // @description.markdown api-description.md
// @termsOfService // @termsOfService
+10
View File
@@ -167,6 +167,16 @@ func (handler *Handler) buildConfig(r *http.Request, tokenData *portainer.TokenD
func (handler *Handler) buildCluster(r *http.Request, endpoint portainer.Endpoint, isInternal bool) clientV1.NamedCluster { func (handler *Handler) buildCluster(r *http.Request, endpoint portainer.Endpoint, isInternal bool) clientV1.NamedCluster {
kubeConfigInternal := handler.kubeClusterAccessService.GetClusterDetails(r.Host, endpoint.ID, isInternal) kubeConfigInternal := handler.kubeClusterAccessService.GetClusterDetails(r.Host, endpoint.ID, isInternal)
if isInternal {
return clientV1.NamedCluster{
Name: buildClusterName(endpoint.Name),
Cluster: clientV1.Cluster{
Server: kubeConfigInternal.ClusterServerURL,
InsecureSkipTLSVerify: true,
},
}
}
selfSignedCert := false selfSignedCert := false
serverUrl, err := url.Parse(kubeConfigInternal.ClusterServerURL) serverUrl, err := url.Parse(kubeConfigInternal.ClusterServerURL)
if err != nil { if err != nil {
@@ -109,6 +109,7 @@ func (service *kubeClusterAccessService) GetClusterDetails(hostURL string, endpo
Str("host_URL", hostURL). Str("host_URL", hostURL).
Str("HTTPS_bind_address", service.httpsBindAddr). Str("HTTPS_bind_address", service.httpsBindAddr).
Str("base_URL", baseURL). Str("base_URL", baseURL).
Bool("is_internal", isInternal).
Msg("kubeconfig") Msg("kubeconfig")
clusterServerURL, err := url.JoinPath("https://", hostURL, baseURL, "/api/endpoints/", strconv.Itoa(int(endpointID)), "/kubernetes") clusterServerURL, err := url.JoinPath("https://", hostURL, baseURL, "/api/endpoints/", strconv.Itoa(int(endpointID)), "/kubernetes")
+1 -1
View File
@@ -1637,7 +1637,7 @@ type (
const ( const (
// APIVersion is the version number of the Portainer API // APIVersion is the version number of the Portainer API
APIVersion = "2.28.0" APIVersion = "2.28.1"
// Support annotation for the API version ("STS" for Short-Term Support or "LTS" for Long-Term Support) // Support annotation for the API version ("STS" for Short-Term Support or "LTS" for Long-Term Support)
APIVersionSupport = "STS" APIVersionSupport = "STS"
// Edition is what this edition of Portainer is called // Edition is what this edition of Portainer is called
+1 -1
View File
@@ -2,7 +2,7 @@
"author": "Portainer.io", "author": "Portainer.io",
"name": "portainer", "name": "portainer",
"homepage": "http://portainer.io", "homepage": "http://portainer.io",
"version": "2.28.0", "version": "2.28.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:portainer/portainer.git" "url": "git@github.com:portainer/portainer.git"