chore(version): bump version to 2.26.1 (#328)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -95,10 +95,6 @@ body:
       description: We only provide support for current versions of Portainer as per the lifecycle policy linked above. If you are on an older version of Portainer we recommend [upgrading first](https://docs.portainer.io/start/upgrade) in case your bug has already been fixed.
       multiple: false
       options:
-        - '2.27.1'
-        - '2.27.0'
-        - '2.26.1'
-        - '2.26.0'
         - '2.25.1'
         - '2.25.0'
         - '2.24.1'
@@ -121,6 +117,10 @@ body:
         - '2.19.2'
         - '2.19.1'
         - '2.19.0'
+        - '2.18.4'
+        - '2.18.3'
+        - '2.18.2'
+        - '2.18.1'
     validations:
       required: true
 

api/cmd/portainer/main.go

@@ -238,10 +238,10 @@ func updateSettingsFromFlags(dataStore dataservices.DataStore, flags *portainer.
 		return err
 	}
 
-	settings.SnapshotInterval = cmp.Or(*flags.SnapshotInterval, settings.SnapshotInterval)
-	settings.LogoURL = cmp.Or(*flags.Logo, settings.LogoURL)
-	settings.EnableEdgeComputeFeatures = cmp.Or(*flags.EnableEdgeComputeFeatures, settings.EnableEdgeComputeFeatures)
-	settings.TemplatesURL = cmp.Or(*flags.Templates, settings.TemplatesURL)
+	settings.SnapshotInterval = *cmp.Or(flags.SnapshotInterval, &settings.SnapshotInterval)
+	settings.LogoURL = *cmp.Or(flags.Logo, &settings.LogoURL)
+	settings.EnableEdgeComputeFeatures = *cmp.Or(flags.EnableEdgeComputeFeatures, &settings.EnableEdgeComputeFeatures)
+	settings.TemplatesURL = *cmp.Or(flags.Templates, &settings.TemplatesURL)
 
 	if *flags.Labels != nil {
 		settings.BlackListedLabels = *flags.Labels

api/database/boltdb/json_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	jsonobject = `{"LogoURL":"","BlackListedLabels":[],"AuthenticationMethod":1,"InternalAuthSettings": {"RequiredPasswordLength": 12}"LDAPSettings":{"AnonymousMode":true,"ReaderDN":"","URL":"","TLSConfig":{"TLS":false,"TLSSkipVerify":false},"StartTLS":false,"SearchSettings":[{"BaseDN":"","Filter":"","UserNameAttribute":""}],"GroupSearchSettings":[{"GroupBaseDN":"","GroupFilter":"","GroupAttribute":""}],"AutoCreateUsers":true},"OAuthSettings":{"ClientID":"","AccessTokenURI":"","AuthorizationURI":"","ResourceURI":"","RedirectURI":"","UserIdentifier":"","Scopes":"","OAuthAutoCreateUsers":false,"DefaultTeamID":0,"SSO":true,"LogoutURI":"","KubeSecretKey":"j0zLVtY/lAWBk62ByyF0uP80SOXaitsABP0TTJX8MhI="},"OpenAMTConfiguration":{"Enabled":false,"MPSServer":"","MPSUser":"","MPSPassword":"","MPSToken":"","CertFileContent":"","CertFileName":"","CertFilePassword":"","DomainName":""},"FeatureFlagSettings":{},"SnapshotInterval":"5m","TemplatesURL":"https://raw.githubusercontent.com/portainer/templates/master/templates-2.0.json","EdgeAgentCheckinInterval":5,"EnableEdgeComputeFeatures":false,"UserSessionTimeout":"8h","KubeconfigExpiry":"0","EnableTelemetry":true,"HelmRepositoryURL":"https://kubernetes.github.io/ingress-nginx","KubectlShellImage":"portainer/kubectl-shell","DisplayDonationHeader":false,"DisplayExternalContributors":false,"EnableHostManagementFeatures":false,"AllowVolumeBrowserForRegularUsers":false,"AllowBindMountsForRegularUsers":false,"AllowPrivilegedModeForRegularUsers":false,"AllowHostNamespaceForRegularUsers":false,"AllowStackManagementForRegularUsers":false,"AllowDeviceMappingForRegularUsers":false,"AllowContainerCapabilitiesForRegularUsers":false}`
+	jsonobject = `{"LogoURL":"","BlackListedLabels":[],"AuthenticationMethod":1,"InternalAuthSettings": {"RequiredPasswordLength": 12}"LDAPSettings":{"AnonymousMode":true,"ReaderDN":"","URL":"","TLSConfig":{"TLS":false,"TLSSkipVerify":false},"StartTLS":false,"SearchSettings":[{"BaseDN":"","Filter":"","UserNameAttribute":""}],"GroupSearchSettings":[{"GroupBaseDN":"","GroupFilter":"","GroupAttribute":""}],"AutoCreateUsers":true},"OAuthSettings":{"ClientID":"","AccessTokenURI":"","AuthorizationURI":"","ResourceURI":"","RedirectURI":"","UserIdentifier":"","Scopes":"","OAuthAutoCreateUsers":false,"DefaultTeamID":0,"SSO":true,"LogoutURI":"","KubeSecretKey":"j0zLVtY/lAWBk62ByyF0uP80SOXaitsABP0TTJX8MhI="},"OpenAMTConfiguration":{"Enabled":false,"MPSServer":"","MPSUser":"","MPSPassword":"","MPSToken":"","CertFileContent":"","CertFileName":"","CertFilePassword":"","DomainName":""},"FeatureFlagSettings":{},"SnapshotInterval":"5m","TemplatesURL":"https://raw.githubusercontent.com/portainer/templates/master/templates-2.0.json","EdgeAgentCheckinInterval":5,"EnableEdgeComputeFeatures":false,"UserSessionTimeout":"8h","KubeconfigExpiry":"0","EnableTelemetry":true,"HelmRepositoryURL":"https://charts.bitnami.com/bitnami","KubectlShellImage":"portainer/kubectl-shell","DisplayDonationHeader":false,"DisplayExternalContributors":false,"EnableHostManagementFeatures":false,"AllowVolumeBrowserForRegularUsers":false,"AllowBindMountsForRegularUsers":false,"AllowPrivilegedModeForRegularUsers":false,"AllowHostNamespaceForRegularUsers":false,"AllowStackManagementForRegularUsers":false,"AllowDeviceMappingForRegularUsers":false,"AllowContainerCapabilitiesForRegularUsers":false}`
 	passphrase = "my secret key"
 )
 

api/dataservices/endpointrelation/endpointrelation.go

@@ -22,8 +22,6 @@ type Service struct {
 	mu                     sync.Mutex
 }
 
-var _ dataservices.EndpointRelationService = &Service{}
-
 func (service *Service) BucketName() string {
 	return BucketName
 }
@@ -111,18 +109,6 @@ func (service *Service) UpdateEndpointRelation(endpointID portainer.EndpointID,
 	return nil
 }
 
-func (service *Service) AddEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error {
-	return service.connection.ViewTx(func(tx portainer.Transaction) error {
-		return service.Tx(tx).AddEndpointRelationsForEdgeStack(endpointIDs, edgeStackID)
-	})
-}
-
-func (service *Service) RemoveEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error {
-	return service.connection.ViewTx(func(tx portainer.Transaction) error {
-		return service.Tx(tx).RemoveEndpointRelationsForEdgeStack(endpointIDs, edgeStackID)
-	})
-}
-
 // DeleteEndpointRelation deletes an Environment(Endpoint) relation object
 func (service *Service) DeleteEndpointRelation(endpointID portainer.EndpointID) error {
 	deletedRelation, _ := service.EndpointRelation(endpointID)

api/dataservices/endpointrelation/tx.go

@@ -13,8 +13,6 @@ type ServiceTx struct {
 	tx      portainer.Transaction
 }
 
-var _ dataservices.EndpointRelationService = &ServiceTx{}
-
 func (service ServiceTx) BucketName() string {
 	return BucketName
 }
@@ -76,58 +74,6 @@ func (service ServiceTx) UpdateEndpointRelation(endpointID portainer.EndpointID,
 	return nil
 }
 
-func (service ServiceTx) AddEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error {
-	for _, endpointID := range endpointIDs {
-		rel, err := service.EndpointRelation(endpointID)
-		if err != nil {
-			return err
-		}
-
-		rel.EdgeStacks[edgeStackID] = true
-
-		identifier := service.service.connection.ConvertToKey(int(endpointID))
-		err = service.tx.UpdateObject(BucketName, identifier, rel)
-		cache.Del(endpointID)
-		if err != nil {
-			return err
-		}
-	}
-
-	if err := service.service.updateStackFnTx(service.tx, edgeStackID, func(edgeStack *portainer.EdgeStack) {
-		edgeStack.NumDeployments += len(endpointIDs)
-	}); err != nil {
-		log.Error().Err(err).Msg("could not update the number of deployments")
-	}
-
-	return nil
-}
-
-func (service ServiceTx) RemoveEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error {
-	for _, endpointID := range endpointIDs {
-		rel, err := service.EndpointRelation(endpointID)
-		if err != nil {
-			return err
-		}
-
-		delete(rel.EdgeStacks, edgeStackID)
-
-		identifier := service.service.connection.ConvertToKey(int(endpointID))
-		err = service.tx.UpdateObject(BucketName, identifier, rel)
-		cache.Del(endpointID)
-		if err != nil {
-			return err
-		}
-	}
-
-	if err := service.service.updateStackFnTx(service.tx, edgeStackID, func(edgeStack *portainer.EdgeStack) {
-		edgeStack.NumDeployments -= len(endpointIDs)
-	}); err != nil {
-		log.Error().Err(err).Msg("could not update the number of deployments")
-	}
-
-	return nil
-}
-
 // DeleteEndpointRelation deletes an Environment(Endpoint) relation object
 func (service ServiceTx) DeleteEndpointRelation(endpointID portainer.EndpointID) error {
 	deletedRelation, _ := service.EndpointRelation(endpointID)

api/dataservices/interface.go

@@ -115,8 +115,6 @@ type (
 		EndpointRelation(EndpointID portainer.EndpointID) (*portainer.EndpointRelation, error)
 		Create(endpointRelation *portainer.EndpointRelation) error
 		UpdateEndpointRelation(EndpointID portainer.EndpointID, endpointRelation *portainer.EndpointRelation) error
-		AddEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error
-		RemoveEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error
 		DeleteEndpointRelation(EndpointID portainer.EndpointID) error
 		BucketName() string
 	}

api/datastore/test_data/output_24_to_latest.json

@@ -605,12 +605,12 @@
     "GlobalDeploymentOptions": {
       "hideStacksFunctionality": false
     },
-    "HelmRepositoryURL": "",
+    "HelmRepositoryURL": "https://charts.bitnami.com/bitnami",
     "InternalAuthSettings": {
       "RequiredPasswordLength": 12
     },
     "KubeconfigExpiry": "0",
-    "KubectlShellImage": "portainer/kubectl-shell:2.27.1",
+    "KubectlShellImage": "portainer/kubectl-shell:2.26.1",
     "LDAPSettings": {
       "AnonymousMode": true,
       "AutoCreateUsers": true,
@@ -943,7 +943,7 @@
     }
   ],
   "version": {
-    "VERSION": "{\"SchemaVersion\":\"2.27.1\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
+    "VERSION": "{\"SchemaVersion\":\"2.26.1\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
   },
   "webhooks": null
 }

api/docker/client/client.go

@@ -3,8 +3,8 @@ package client
 import (
 	"bytes"
 	"errors"
-	"fmt"
 	"io"
+	"maps"
 	"net/http"
 	"strings"
 	"time"
@@ -141,6 +141,7 @@ func createAgentClient(endpoint *portainer.Endpoint, endpointURL string, signatu
 
 type NodeNameTransport struct {
 	*http.Transport
+	nodeNames map[string]string
 }
 
 func (t *NodeNameTransport) RoundTrip(req *http.Request) (*http.Response, error) {
@@ -175,19 +176,18 @@ func (t *NodeNameTransport) RoundTrip(req *http.Request) (*http.Response, error)
 		return resp, nil
 	}
 
-	nodeNames, ok := req.Context().Value("nodeNames").(map[string]string)
-	if ok {
-		for idx, r := range rs {
-			// as there is no way to differentiate the same image available in multiple nodes only by their ID
-			// we append the index of the image in the payload response to match the node name later
-			// from the image.Summary[] list returned by docker's client.ImageList()
-			nodeNames[fmt.Sprintf("%s-%d", r.ID, idx)] = r.Portainer.Agent.NodeName
-		}
+	t.nodeNames = make(map[string]string)
+	for _, r := range rs {
+		t.nodeNames[r.ID] = r.Portainer.Agent.NodeName
 	}
 
 	return resp, err
 }
 
+func (t *NodeNameTransport) NodeNames() map[string]string {
+	return maps.Clone(t.nodeNames)
+}
+
 func httpClient(endpoint *portainer.Endpoint, timeout *time.Duration) (*http.Client, error) {
 	transport := &NodeNameTransport{
 		Transport: &http.Transport{},

api/exec/swarm_stack.go

@@ -127,7 +127,7 @@ func (manager *SwarmStackManager) Remove(stack *portainer.Stack, endpoint *porta
 		return err
 	}
 
-	args = append(args, "stack", "rm", "--detach=false", stack.Name)
+	args = append(args, "stack", "rm", stack.Name)
 
 	return runCommandAndCaptureStdErr(command, args, nil, "")
 }

api/filesystem/filesystem.go

@@ -841,11 +841,11 @@ func (service *Service) GetDefaultSSLCertsPath() (string, string) {
 }
 
 func defaultMTLSCertPathUnderFileStore() (string, string, string) {
-	caCertPath := JoinPaths(SSLCertPath, MTLSCACertFilename)
 	certPath := JoinPaths(SSLCertPath, MTLSCertFilename)
+	caCertPath := JoinPaths(SSLCertPath, MTLSCACertFilename)
 	keyPath := JoinPaths(SSLCertPath, MTLSKeyFilename)
 
-	return caCertPath, certPath, keyPath
+	return certPath, caCertPath, keyPath
 }
 
 // GetDefaultChiselPrivateKeyPath returns the chisle private key path
@@ -1014,45 +1014,26 @@ func CreateFile(path string, r io.Reader) error {
 	return err
 }
 
-func (service *Service) StoreMTLSCertificates(caCert, cert, key []byte) (string, string, string, error) {
-	caCertPath, certPath, keyPath := defaultMTLSCertPathUnderFileStore()
+func (service *Service) StoreMTLSCertificates(cert, caCert, key []byte) (string, string, string, error) {
+	certPath, caCertPath, keyPath := defaultMTLSCertPathUnderFileStore()
 
-	r := bytes.NewReader(caCert)
-	if err := service.createFileInStore(caCertPath, r); err != nil {
+	r := bytes.NewReader(cert)
+	err := service.createFileInStore(certPath, r)
+	if err != nil {
 		return "", "", "", err
 	}
 
-	r = bytes.NewReader(cert)
-	if err := service.createFileInStore(certPath, r); err != nil {
+	r = bytes.NewReader(caCert)
+	err = service.createFileInStore(caCertPath, r)
+	if err != nil {
 		return "", "", "", err
 	}
 
 	r = bytes.NewReader(key)
-	if err := service.createFileInStore(keyPath, r); err != nil {
+	err = service.createFileInStore(keyPath, r)
+	if err != nil {
 		return "", "", "", err
 	}
 
-	return service.wrapFileStore(caCertPath), service.wrapFileStore(certPath), service.wrapFileStore(keyPath), nil
-}
-
-func (service *Service) GetMTLSCertificates() (string, string, string, error) {
-	caCertPath, certPath, keyPath := defaultMTLSCertPathUnderFileStore()
-
-	caCertPath = service.wrapFileStore(caCertPath)
-	certPath = service.wrapFileStore(certPath)
-	keyPath = service.wrapFileStore(keyPath)
-
-	paths := [...]string{caCertPath, certPath, keyPath}
-	for _, path := range paths {
-		exists, err := service.FileExists(path)
-		if err != nil {
-			return "", "", "", err
-		}
-
-		if !exists {
-			return "", "", "", fmt.Errorf("file %s does not exist", path)
-		}
-	}
-
-	return caCertPath, certPath, keyPath, nil
+	return service.wrapFileStore(certPath), service.wrapFileStore(caCertPath), service.wrapFileStore(keyPath), nil
 }

api/filesystem/serialize_per_dev_configs.go

@@ -44,10 +44,11 @@ func deduplicate(dirEntries []DirEntry) []DirEntry {
 
 // FilterDirForPerDevConfigs filers the given dirEntries, returns entries for the given device
 // For given configPath A/B/C, return entries:
-//  1. all entries outside of dir A/B/C
-//  2. For filterType file:
+//  1. all entries outside of dir A
+//  2. dir entries A, A/B, A/B/C
+//  3. For filterType file:
 //     file entries: A/B/C/<deviceName> and A/B/C/<deviceName>.*
-//  3. For filterType dir:
+//  4. For filterType dir:
 //     dir entry:   A/B/C/<deviceName>
 //     all entries: A/B/C/<deviceName>/*
 func FilterDirForPerDevConfigs(dirEntries []DirEntry, deviceName, configPath string, filterType portainer.PerDevConfigsFilterType) []DirEntry {
@@ -65,7 +66,12 @@ func FilterDirForPerDevConfigs(dirEntries []DirEntry, deviceName, configPath str
 func shouldIncludeEntry(dirEntry DirEntry, deviceName, configPath string, filterType portainer.PerDevConfigsFilterType) bool {
 
 	// Include all entries outside of dir A
-	if !isInConfigDir(dirEntry, configPath) {
+	if !isInConfigRootDir(dirEntry, configPath) {
+		return true
+	}
+
+	// Include dir entries A, A/B, A/B/C
+	if isParentDir(dirEntry, configPath) {
 		return true
 	}
 
@@ -84,9 +90,21 @@ func shouldIncludeEntry(dirEntry DirEntry, deviceName, configPath string, filter
 	return false
 }
 
-func isInConfigDir(dirEntry DirEntry, configPath string) bool {
-	// return true if entry name starts with "A/B"
-	return strings.HasPrefix(dirEntry.Name, appendTailSeparator(configPath))
+func isInConfigRootDir(dirEntry DirEntry, configPath string) bool {
+	// get the first element of the configPath
+	rootDir := strings.Split(configPath, string(os.PathSeparator))[0]
+
+	// return true if entry name starts with "A/"
+	return strings.HasPrefix(dirEntry.Name, appendTailSeparator(rootDir))
+}
+
+func isParentDir(dirEntry DirEntry, configPath string) bool {
+	if dirEntry.IsFile {
+		return false
+	}
+
+	// return true for dir entries A, A/B, A/B/C
+	return strings.HasPrefix(appendTailSeparator(configPath), appendTailSeparator(dirEntry.Name))
 }
 
 func shouldIncludeFile(dirEntry DirEntry, deviceName, configPath string) bool {

api/filesystem/serialize_per_dev_configs_test.go

@@ -90,24 +90,3 @@ func TestMultiFilterDirForPerDevConfigs(t *testing.T) {
 		})
 	}
 }
-
-func TestIsInConfigDir(t *testing.T) {
-	f := func(dirEntry DirEntry, configPath string, expect bool) {
-		t.Helper()
-
-		actual := isInConfigDir(dirEntry, configPath)
-		assert.Equal(t, expect, actual)
-	}
-
-	f(DirEntry{Name: "edge-configs"}, "edge-configs", false)
-	f(DirEntry{Name: "edge-configs_backup"}, "edge-configs", false)
-	f(DirEntry{Name: "edge-configs/standalone-edge-agent-standard"}, "edge-configs", true)
-	f(DirEntry{Name: "parent/edge-configs/"}, "edge-configs", false)
-	f(DirEntry{Name: "edgestacktest"}, "edgestacktest/edge-configs", false)
-	f(DirEntry{Name: "edgestacktest/edgeconfigs-test.yaml"}, "edgestacktest/edge-configs", false)
-	f(DirEntry{Name: "edgestacktest/file1.conf"}, "edgestacktest/edge-configs", false)
-	f(DirEntry{Name: "edgeconfigs-test.yaml"}, "edgestacktest/edge-configs", false)
-	f(DirEntry{Name: "edgestacktest/edge-configs"}, "edgestacktest/edge-configs", false)
-	f(DirEntry{Name: "edgestacktest/edge-configs/standalone-edge-agent-async"}, "edgestacktest/edge-configs", true)
-	f(DirEntry{Name: "edgestacktest/edge-configs/abc.txt"}, "edgestacktest/edge-configs", true)
-}

api/http/handler/customtemplates/customtemplate_create.go

@@ -482,3 +482,28 @@ func (handler *Handler) createCustomTemplateFromFileUpload(r *http.Request) (*po
 
 	return customTemplate, nil
 }
+
+// @id CustomTemplateCreate
+// @summary Create a custom template
+// @description Create a custom template.
+// @description **Access policy**: authenticated
+// @tags custom_templates
+// @security ApiKeyAuth
+// @security jwt
+// @accept json,multipart/form-data
+// @produce json
+// @param method query string true "method for creating template" Enums(string, file, repository)
+// @param body body object true "for body documentation see the relevant /custom_templates/{method} endpoint"
+// @success 200 {object} portainer.CustomTemplate
+// @failure 400 "Invalid request"
+// @failure 500 "Server error"
+// @deprecated
+// @router /custom_templates [post]
+func deprecatedCustomTemplateCreateUrlParser(w http.ResponseWriter, r *http.Request) (string, *httperror.HandlerError) {
+	method, err := request.RetrieveQueryParameter(r, "method", false)
+	if err != nil {
+		return "", httperror.BadRequest("Invalid query parameter: method", err)
+	}
+
+	return "/custom_templates/create/" + method, nil
+}

api/http/handler/customtemplates/handler.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gorilla/mux"
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/dataservices"
+	"github.com/portainer/portainer/api/http/middlewares"
 	"github.com/portainer/portainer/api/http/security"
 	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 )
@@ -32,6 +33,7 @@ func NewHandler(bouncer security.BouncerService, dataStore dataservices.DataStor
 
 	h.Handle("/custom_templates/create/{method}",
 		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.customTemplateCreate))).Methods(http.MethodPost)
+	h.Handle("/custom_templates", middlewares.Deprecated(h, deprecatedCustomTemplateCreateUrlParser)).Methods(http.MethodPost) // Deprecated
 	h.Handle("/custom_templates",
 		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.customTemplateList))).Methods(http.MethodGet)
 	h.Handle("/custom_templates/{id}",

api/http/handler/docker/images/images_list.go

@@ -1,11 +1,10 @@
 package images
 
 import (
-	"context"
-	"fmt"
 	"net/http"
 	"strings"
 
+	"github.com/portainer/portainer/api/docker/client"
 	"github.com/portainer/portainer/api/http/handler/docker/utils"
 	"github.com/portainer/portainer/api/set"
 	httperror "github.com/portainer/portainer/pkg/libhttp/error"
@@ -47,16 +46,17 @@ func (handler *Handler) imagesList(w http.ResponseWriter, r *http.Request) *http
 		return httpErr
 	}
 
-	nodeNames := make(map[string]string)
-
-	// Pass the node names map to the context so the custom NodeNameTransport can use it
-	ctx := context.WithValue(r.Context(), "nodeNames", nodeNames)
-
-	images, err := cli.ImageList(ctx, image.ListOptions{})
+	images, err := cli.ImageList(r.Context(), image.ListOptions{})
 	if err != nil {
 		return httperror.InternalServerError("Unable to retrieve Docker images", err)
 	}
 
+	// Extract the node name from the custom transport
+	nodeNames := make(map[string]string)
+	if t, ok := cli.HTTPClient().Transport.(*client.NodeNameTransport); ok {
+		nodeNames = t.NodeNames()
+	}
+
 	withUsage, err := request.RetrieveBooleanQueryParameter(r, "withUsage", true)
 	if err != nil {
 		return httperror.BadRequest("Invalid query parameter: withUsage", err)
@@ -85,12 +85,8 @@ func (handler *Handler) imagesList(w http.ResponseWriter, r *http.Request) *http
 		}
 
 		imagesList[i] = ImageResponse{
-			Created: image.Created,
-			// Only works if the order of `images` is not changed between unmarshaling the agent's response
-			// in NodeNameTransport.RoundTrip()  (api/docker/client/client.go)
-			// and docker's cli.ImageList()
-			// As both functions unmarshal the same response body, the resulting array will be ordered the same way.
-			NodeName: nodeNames[fmt.Sprintf("%s-%d", image.ID, i)],
+			Created:  image.Created,
+			NodeName: nodeNames[image.ID],
 			ID:       image.ID,
 			Size:     image.Size,
 			Tags:     image.RepoTags,

api/http/handler/edgegroups/edgegroup_update.go

@@ -167,7 +167,7 @@ func (handler *Handler) edgeGroupUpdate(w http.ResponseWriter, r *http.Request)
 
 func (handler *Handler) updateEndpointStacks(tx dataservices.DataStoreTx, endpoint *portainer.Endpoint, edgeGroups []portainer.EdgeGroup, edgeStacks []portainer.EdgeStack) error {
 	relation, err := tx.EndpointRelation().EndpointRelation(endpoint.ID)
-	if err != nil && !handler.DataStore.IsErrObjectNotFound(err) {
+	if err != nil {
 		return err
 	}
 
@@ -183,12 +183,6 @@ func (handler *Handler) updateEndpointStacks(tx dataservices.DataStoreTx, endpoi
 		edgeStackSet[edgeStackID] = true
 	}
 
-	if relation == nil {
-		relation = &portainer.EndpointRelation{
-			EndpointID: endpoint.ID,
-			EdgeStacks: make(map[portainer.EdgeStackID]bool),
-		}
-	}
 	relation.EdgeStacks = edgeStackSet
 
 	return tx.EndpointRelation().UpdateEndpointRelation(endpoint.ID, relation)

api/http/handler/edgejobs/edgejob_create.go

@@ -271,3 +271,26 @@ func (handler *Handler) addAndPersistEdgeJob(tx dataservices.DataStoreTx, edgeJo
 
 	return tx.EdgeJob().CreateWithID(edgeJob.ID, edgeJob)
 }
+
+// @id EdgeJobCreate
+// @summary Create an EdgeJob
+// @description **Access policy**: administrator
+// @tags edge_jobs
+// @security ApiKeyAuth
+// @security jwt
+// @produce json
+// @param method query string true "Creation Method" Enums(file, string)
+// @param body body object true "for body documentation see the relevant /edge_jobs/create/{method} endpoint"
+// @success 200 {object} portainer.EdgeGroup
+// @failure 503 "Edge compute features are disabled"
+// @failure 500
+// @deprecated
+// @router /edge_jobs [post]
+func deprecatedEdgeJobCreateUrlParser(w http.ResponseWriter, r *http.Request) (string, *httperror.HandlerError) {
+	method, err := request.RetrieveQueryParameter(r, "method", false)
+	if err != nil {
+		return "", httperror.BadRequest("Invalid query parameter: method. Valid values are: file or string", err)
+	}
+
+	return "/edge_jobs/create/" + method, nil
+}

api/http/handler/edgejobs/handler.go

@@ -6,6 +6,7 @@ import (
 
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/dataservices"
+	"github.com/portainer/portainer/api/http/middlewares"
 	"github.com/portainer/portainer/api/http/security"
 	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 	"github.com/portainer/portainer/pkg/libhttp/response"
@@ -29,6 +30,8 @@ func NewHandler(bouncer security.BouncerService) *Handler {
 
 	h.Handle("/edge_jobs",
 		bouncer.AdminAccess(bouncer.EdgeComputeOperation(httperror.LoggerHandler(h.edgeJobList)))).Methods(http.MethodGet)
+	h.Handle("/edge_jobs",
+		bouncer.AdminAccess(bouncer.EdgeComputeOperation(middlewares.Deprecated(h, deprecatedEdgeJobCreateUrlParser)))).Methods(http.MethodPost)
 	h.Handle("/edge_jobs/create/{method}",
 		bouncer.AdminAccess(bouncer.EdgeComputeOperation(httperror.LoggerHandler(h.edgeJobCreate)))).Methods(http.MethodPost)
 	h.Handle("/edge_jobs/{id}",

api/http/handler/edgestacks/edgestack_create.go

@@ -55,3 +55,26 @@ func (handler *Handler) createSwarmStack(tx dataservices.DataStoreTx, method str
 
 	return nil, httperrors.NewInvalidPayloadError("Invalid value for query parameter: method. Value must be one of: string, repository or file")
 }
+
+// @id EdgeStackCreate
+// @summary Create an EdgeStack
+// @description **Access policy**: administrator
+// @tags edge_stacks
+// @security ApiKeyAuth
+// @security jwt
+// @produce json
+// @param method query string true "Creation Method" Enums(file,string,repository)
+// @param body body object true "for body documentation see the relevant /edge_stacks/create/{method} endpoint"
+// @success 200 {object} portainer.EdgeStack
+// @failure 500
+// @failure 503 "Edge compute features are disabled"
+// @deprecated
+// @router /edge_stacks [post]
+func deprecatedEdgeStackCreateUrlParser(w http.ResponseWriter, r *http.Request) (string, *httperror.HandlerError) {
+	method, err := request.RetrieveQueryParameter(r, "method", false)
+	if err != nil {
+		return "", httperror.BadRequest("Invalid query parameter: method. Valid values are: file or string", err)
+	}
+
+	return "/edge_stacks/create/" + method, nil
+}

api/http/handler/edgestacks/edgestack_delete.go

@@ -3,7 +3,6 @@ package edgestacks
 import (
 	"errors"
 	"net/http"
-	"strconv"
 
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/dataservices"
@@ -53,14 +52,10 @@ func (handler *Handler) deleteEdgeStack(tx dataservices.DataStoreTx, edgeStackID
 		return httperror.InternalServerError("Unable to find an edge stack with the specified identifier inside the database", err)
 	}
 
-	if err := handler.edgeStacksService.DeleteEdgeStack(tx, edgeStack.ID, edgeStack.EdgeGroups); err != nil {
+	err = handler.edgeStacksService.DeleteEdgeStack(tx, edgeStack.ID, edgeStack.EdgeGroups)
+	if err != nil {
 		return httperror.InternalServerError("Unable to delete edge stack", err)
 	}
 
-	stackFolder := handler.FileService.GetEdgeStackProjectPath(strconv.Itoa(int(edgeStack.ID)))
-	if err := handler.FileService.RemoveDirectory(stackFolder); err != nil {
-		return httperror.InternalServerError("Unable to remove edge stack project folder", err)
-	}
-
 	return nil
 }

api/http/handler/edgestacks/edgestack_delete_test.go

@@ -1,14 +1,12 @@
 package edgestacks
 
 import (
-	"bytes"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
 	portainer "github.com/portainer/portainer/api"
-	"github.com/stretchr/testify/assert"
 
 	"github.com/segmentio/encoding/json"
 )
@@ -103,52 +101,3 @@ func TestDeleteInvalidEdgeStack(t *testing.T) {
 		})
 	}
 }
-
-func TestDeleteEdgeStack_RemoveProjectFolder(t *testing.T) {
-	handler, rawAPIKey := setupHandler(t)
-
-	edgeGroup := createEdgeGroup(t, handler.DataStore)
-
-	payload := edgeStackFromStringPayload{
-		Name:             "test-stack",
-		DeploymentType:   portainer.EdgeStackDeploymentCompose,
-		EdgeGroups:       []portainer.EdgeGroupID{edgeGroup.ID},
-		StackFileContent: "version: '3.7'\nservices:\n  test:\n    image: test",
-	}
-
-	var buf bytes.Buffer
-	if err := json.NewEncoder(&buf).Encode(payload); err != nil {
-		t.Fatal("error encoding payload:", err)
-	}
-
-	// Create
-	req, err := http.NewRequest(http.MethodPost, "/edge_stacks/create/string", &buf)
-	if err != nil {
-		t.Fatal("request error:", err)
-	}
-
-	req.Header.Add("x-api-key", rawAPIKey)
-	rec := httptest.NewRecorder()
-	handler.ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusOK {
-		t.Fatalf("expected a %d response, found: %d", http.StatusNoContent, rec.Code)
-	}
-
-	assert.DirExists(t, handler.FileService.GetEdgeStackProjectPath("1"))
-
-	// Delete
-	if req, err = http.NewRequest(http.MethodDelete, "/edge_stacks/1", nil); err != nil {
-		t.Fatal("request error:", err)
-	}
-
-	req.Header.Add("x-api-key", rawAPIKey)
-	rec = httptest.NewRecorder()
-	handler.ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusNoContent {
-		t.Fatalf("expected a %d response, found: %d", http.StatusNoContent, rec.Code)
-	}
-
-	assert.NoDirExists(t, handler.FileService.GetEdgeStackProjectPath("1"))
-}

api/http/handler/edgestacks/edgestack_file.go

@@ -34,7 +34,7 @@ func (handler *Handler) edgeStackFile(w http.ResponseWriter, r *http.Request) *h
 
 	stack, err := handler.DataStore.EdgeStack().EdgeStack(portainer.EdgeStackID(stackID))
 	if err != nil {
-		return handlerDBErr(err, "Unable to find an edge stack with the specified identifier inside the database")
+		return handler.handlerDBErr(err, "Unable to find an edge stack with the specified identifier inside the database")
 	}
 
 	fileName := stack.EntryPoint

api/http/handler/edgestacks/edgestack_inspect.go

@@ -30,7 +30,7 @@ func (handler *Handler) edgeStackInspect(w http.ResponseWriter, r *http.Request)
 
 	edgeStack, err := handler.DataStore.EdgeStack().EdgeStack(portainer.EdgeStackID(edgeStackID))
 	if err != nil {
-		return handlerDBErr(err, "Unable to find an edge stack with the specified identifier inside the database")
+		return handler.handlerDBErr(err, "Unable to find an edge stack with the specified identifier inside the database")
 	}
 
 	return response.JSON(w, edgeStack)

api/http/handler/edgestacks/edgestack_status_delete.go

@@ -0,0 +1,87 @@
+package edgestacks
+
+import (
+	"errors"
+	"net/http"
+	"time"
+
+	portainer "github.com/portainer/portainer/api"
+	"github.com/portainer/portainer/api/dataservices"
+	"github.com/portainer/portainer/api/http/middlewares"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
+)
+
+// @id EdgeStackStatusDelete
+// @summary Delete an EdgeStack status
+// @description Authorized only if the request is done by an Edge Environment(Endpoint)
+// @tags edge_stacks
+// @produce json
+// @param id path int true "EdgeStack Id"
+// @param environmentId path int true "Environment identifier"
+// @success 200 {object} portainer.EdgeStack
+// @failure 500
+// @failure 400
+// @failure 404
+// @failure 403
+// @deprecated
+// @router /edge_stacks/{id}/status/{environmentId} [delete]
+func (handler *Handler) edgeStackStatusDelete(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
+	stackID, err := request.RetrieveNumericRouteVariableValue(r, "id")
+	if err != nil {
+		return httperror.BadRequest("Invalid stack identifier route variable", err)
+	}
+
+	endpoint, err := middlewares.FetchEndpoint(r)
+	if err != nil {
+		return httperror.InternalServerError("Unable to retrieve a valid endpoint from the handler context", err)
+	}
+
+	err = handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint)
+	if err != nil {
+		return httperror.Forbidden("Permission denied to access environment", err)
+	}
+
+	var stack *portainer.EdgeStack
+	err = handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
+		stack, err = handler.deleteEdgeStackStatus(tx, portainer.EdgeStackID(stackID), endpoint)
+		return err
+	})
+	if err != nil {
+		var httpErr *httperror.HandlerError
+		if errors.As(err, &httpErr) {
+			return httpErr
+		}
+
+		return httperror.InternalServerError("Unexpected error", err)
+	}
+
+	return response.JSON(w, stack)
+}
+
+func (handler *Handler) deleteEdgeStackStatus(tx dataservices.DataStoreTx, stackID portainer.EdgeStackID, endpoint *portainer.Endpoint) (*portainer.EdgeStack, error) {
+	stack, err := tx.EdgeStack().EdgeStack(stackID)
+	if err != nil {
+		return nil, handler.handlerDBErr(err, "Unable to find a stack with the specified identifier inside the database")
+	}
+
+	environmentStatus, ok := stack.Status[endpoint.ID]
+	if !ok {
+		environmentStatus = portainer.EdgeStackStatus{}
+	}
+
+	environmentStatus.Status = append(environmentStatus.Status, portainer.EdgeStackDeploymentStatus{
+		Time: time.Now().Unix(),
+		Type: portainer.EdgeStackStatusRemoved,
+	})
+
+	stack.Status[endpoint.ID] = environmentStatus
+
+	err = tx.EdgeStack().UpdateEdgeStack(stack.ID, stack)
+	if err != nil {
+		return nil, httperror.InternalServerError("Unable to persist the stack changes inside the database", err)
+	}
+
+	return stack, nil
+}

api/http/handler/edgestacks/edgestack_status_delete_test.go

@@ -0,0 +1,30 @@
+package edgestacks
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	portainer "github.com/portainer/portainer/api"
+)
+
+func TestDeleteStatus(t *testing.T) {
+	handler, _ := setupHandler(t)
+
+	endpoint := createEndpoint(t, handler.DataStore)
+	edgeStack := createEdgeStack(t, handler.DataStore, endpoint.ID)
+
+	req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("/edge_stacks/%d/status/%d", edgeStack.ID, endpoint.ID), nil)
+	if err != nil {
+		t.Fatal("request error:", err)
+	}
+
+	req.Header.Set(portainer.PortainerAgentEdgeIDHeader, endpoint.EdgeID)
+	rec := httptest.NewRecorder()
+	handler.ServeHTTP(rec, req)
+
+	if rec.Code != http.StatusOK {
+		t.Fatalf("expected a %d response, found: %d", http.StatusOK, rec.Code)
+	}
+}

api/http/handler/edgestacks/edgestack_status_update.go

@@ -4,11 +4,11 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"slices"
 	"strconv"
 	"time"
 
 	portainer "github.com/portainer/portainer/api"
+	"github.com/portainer/portainer/api/dataservices"
 	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 	"github.com/portainer/portainer/pkg/libhttp/request"
 	"github.com/portainer/portainer/pkg/libhttp/response"
@@ -69,21 +69,15 @@ func (handler *Handler) edgeStackStatusUpdate(w http.ResponseWriter, r *http.Req
 		return httperror.BadRequest("Invalid request payload", fmt.Errorf("edge polling error: %w. Environment ID: %d", err, payload.EndpointID))
 	}
 
-	endpoint, err := handler.DataStore.Endpoint().Endpoint(payload.EndpointID)
-	if err != nil {
-		return handlerDBErr(fmt.Errorf("unable to find the environment from the database: %w. Environment ID: %d", err, payload.EndpointID), "unable to find the environment")
-	}
+	var stack *portainer.EdgeStack
+	if err := handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
+		if r.Context().Err() != nil {
+			return err
+		}
 
-	if err := handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint); err != nil {
-		return httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment name: %s", err, endpoint.Name))
-	}
-
-	updateFn := func(stack *portainer.EdgeStack) (*portainer.EdgeStack, error) {
-		return handler.updateEdgeStackStatus(stack, stack.ID, payload)
-	}
-
-	stack, err := handler.stackCoordinator.UpdateStatus(r, portainer.EdgeStackID(stackID), updateFn)
-	if err != nil {
+		stack, err = handler.updateEdgeStackStatus(tx, r, portainer.EdgeStackID(stackID), payload)
+		return err
+	}); err != nil {
 		var httpErr *httperror.HandlerError
 		if errors.As(err, &httpErr) {
 			return httpErr
@@ -99,11 +93,36 @@ func (handler *Handler) edgeStackStatusUpdate(w http.ResponseWriter, r *http.Req
 	return response.JSON(w, stack)
 }
 
-func (handler *Handler) updateEdgeStackStatus(stack *portainer.EdgeStack, stackID portainer.EdgeStackID, payload updateStatusPayload) (*portainer.EdgeStack, error) {
+func (handler *Handler) updateEdgeStackStatus(tx dataservices.DataStoreTx, r *http.Request, stackID portainer.EdgeStackID, payload updateStatusPayload) (*portainer.EdgeStack, error) {
+	stack, err := tx.EdgeStack().EdgeStack(stackID)
+	if err != nil {
+		if dataservices.IsErrObjectNotFound(err) {
+			// Skip error because agent tries to report on deleted stack
+			log.Debug().
+				Err(err).
+				Int("stackID", int(stackID)).
+				Int("status", int(*payload.Status)).
+				Msg("Unable to find a stack inside the database, skipping error")
+
+			return nil, nil
+		}
+
+		return nil, fmt.Errorf("unable to retrieve Edge stack from the database: %w. Environment ID: %d", err, payload.EndpointID)
+	}
+
 	if payload.Version > 0 && payload.Version < stack.Version {
 		return stack, nil
 	}
 
+	endpoint, err := tx.Endpoint().Endpoint(payload.EndpointID)
+	if err != nil {
+		return nil, handler.handlerDBErr(fmt.Errorf("unable to find the environment from the database: %w. Environment ID: %d", err, payload.EndpointID), "unable to find the environment")
+	}
+
+	if err := handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint); err != nil {
+		return nil, httperror.Forbidden("Permission denied to access environment", fmt.Errorf("unauthorized edge endpoint operation: %w. Environment name: %s", err, endpoint.Name))
+	}
+
 	status := *payload.Status
 
 	log.Debug().
@@ -119,6 +138,10 @@ func (handler *Handler) updateEdgeStackStatus(stack *portainer.EdgeStack, stackI
 
 	updateEnvStatus(payload.EndpointID, stack, deploymentStatus)
 
+	if err := tx.EdgeStack().UpdateEdgeStack(stackID, stack); err != nil {
+		return nil, handler.handlerDBErr(fmt.Errorf("unable to update Edge stack to the database: %w. Environment name: %s", err, endpoint.Name), "unable to update Edge stack")
+	}
+
 	return stack, nil
 }
 
@@ -137,11 +160,7 @@ func updateEnvStatus(environmentId portainer.EndpointID, stack *portainer.EdgeSt
 		}
 	}
 
-	if containsStatus := slices.ContainsFunc(environmentStatus.Status, func(e portainer.EdgeStackDeploymentStatus) bool {
-		return e.Type == deploymentStatus.Type
-	}); !containsStatus {
-		environmentStatus.Status = append(environmentStatus.Status, deploymentStatus)
-	}
+	environmentStatus.Status = append(environmentStatus.Status, deploymentStatus)
 
 	stack.Status[environmentId] = environmentStatus
 }

api/http/handler/edgestacks/edgestack_status_update_coordinator.go

@@ -1,155 +0,0 @@
-package edgestacks
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-
-	portainer "github.com/portainer/portainer/api"
-	"github.com/portainer/portainer/api/dataservices"
-
-	"github.com/rs/zerolog/log"
-)
-
-type statusRequest struct {
-	respCh   chan statusResponse
-	stackID  portainer.EdgeStackID
-	updateFn statusUpdateFn
-}
-
-type statusResponse struct {
-	Stack *portainer.EdgeStack
-	Error error
-}
-
-type statusUpdateFn func(*portainer.EdgeStack) (*portainer.EdgeStack, error)
-
-type EdgeStackStatusUpdateCoordinator struct {
-	updateCh  chan statusRequest
-	dataStore dataservices.DataStore
-}
-
-var errAnotherStackUpdateInProgress = errors.New("another stack update is in progress")
-
-func NewEdgeStackStatusUpdateCoordinator(dataStore dataservices.DataStore) *EdgeStackStatusUpdateCoordinator {
-	return &EdgeStackStatusUpdateCoordinator{
-		updateCh:  make(chan statusRequest),
-		dataStore: dataStore,
-	}
-}
-
-func (c *EdgeStackStatusUpdateCoordinator) Start() {
-	for {
-		c.loop()
-	}
-}
-
-func (c *EdgeStackStatusUpdateCoordinator) loop() {
-	u := <-c.updateCh
-
-	respChs := []chan statusResponse{u.respCh}
-
-	var stack *portainer.EdgeStack
-
-	err := c.dataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
-		// 1. Load the edge stack
-		var err error
-
-		stack, err = loadEdgeStack(tx, u.stackID)
-		if err != nil {
-			return err
-		}
-
-		// Return early when the agent tries to update the status on a deleted stack
-		if stack == nil {
-			return nil
-		}
-
-		// 2. Mutate the edge stack opportunistically until there are no more pending updates
-		for {
-			stack, err = u.updateFn(stack)
-			if err != nil {
-				return err
-			}
-
-			if m, ok := c.getNextUpdate(stack.ID); ok {
-				u = m
-			} else {
-				break
-			}
-
-			respChs = append(respChs, u.respCh)
-		}
-
-		// 3. Save the changes back to the database
-		if err := tx.EdgeStack().UpdateEdgeStack(stack.ID, stack); err != nil {
-			return handlerDBErr(fmt.Errorf("unable to update Edge stack: %w.", err), "Unable to persist the stack changes inside the database")
-		}
-
-		return nil
-	})
-
-	// 4. Send back the responses
-	for _, ch := range respChs {
-		ch <- statusResponse{Stack: stack, Error: err}
-	}
-}
-
-func loadEdgeStack(tx dataservices.DataStoreTx, stackID portainer.EdgeStackID) (*portainer.EdgeStack, error) {
-	stack, err := tx.EdgeStack().EdgeStack(stackID)
-	if err != nil {
-		if dataservices.IsErrObjectNotFound(err) {
-			// Skip the error when the agent tries to update the status on a deleted stack
-			log.Debug().
-				Err(err).
-				Int("stackID", int(stackID)).
-				Msg("Unable to find a stack inside the database, skipping error")
-
-			return nil, nil
-		}
-
-		return nil, fmt.Errorf("unable to retrieve Edge stack from the database: %w.", err)
-	}
-
-	return stack, nil
-}
-
-func (c *EdgeStackStatusUpdateCoordinator) getNextUpdate(stackID portainer.EdgeStackID) (statusRequest, bool) {
-	for {
-		select {
-		case u := <-c.updateCh:
-			// Discard the update and let the agent retry
-			if u.stackID != stackID {
-				u.respCh <- statusResponse{Error: errAnotherStackUpdateInProgress}
-
-				continue
-			}
-
-			return u, true
-
-		default:
-			return statusRequest{}, false
-		}
-	}
-}
-
-func (c *EdgeStackStatusUpdateCoordinator) UpdateStatus(r *http.Request, stackID portainer.EdgeStackID, updateFn statusUpdateFn) (*portainer.EdgeStack, error) {
-	respCh := make(chan statusResponse)
-	defer close(respCh)
-
-	msg := statusRequest{
-		respCh:   respCh,
-		stackID:  stackID,
-		updateFn: updateFn,
-	}
-
-	select {
-	case c.updateCh <- msg:
-		r := <-respCh
-
-		return r.Stack, r.Error
-
-	case <-r.Context().Done():
-		return nil, r.Context().Err()
-	}
-}

api/http/handler/edgestacks/edgestack_test.go

@@ -51,14 +51,10 @@ func setupHandler(t *testing.T) (*Handler, string) {
 		t.Fatal(err)
 	}
 
-	coord := NewEdgeStackStatusUpdateCoordinator(store)
-	go coord.Start()
-
 	handler := NewHandler(
 		security.NewRequestBouncer(store, jwtService, apiKeyService),
 		store,
 		edgestacks.NewService(store),
-		coord,
 	)
 
 	handler.FileService = fs
@@ -148,15 +144,3 @@ func createEdgeStack(t *testing.T, store dataservices.DataStore, endpointID port
 
 	return edgeStack
 }
-
-func createEdgeGroup(t *testing.T, store dataservices.DataStore) portainer.EdgeGroup {
-	edgeGroup := portainer.EdgeGroup{
-		ID:   1,
-		Name: "EdgeGroup 1",
-	}
-
-	if err := store.EdgeGroup().Create(&edgeGroup); err != nil {
-		t.Fatal(err)
-	}
-	return edgeGroup
-}

api/http/handler/edgestacks/edgestack_update.go

@@ -80,7 +80,7 @@ func (handler *Handler) edgeStackUpdate(w http.ResponseWriter, r *http.Request)
 func (handler *Handler) updateEdgeStack(tx dataservices.DataStoreTx, stackID portainer.EdgeStackID, payload updateEdgeStackPayload) (*portainer.EdgeStack, error) {
 	stack, err := tx.EdgeStack().EdgeStack(stackID)
 	if err != nil {
-		return nil, handlerDBErr(err, "Unable to find a stack with the specified identifier inside the database")
+		return nil, handler.handlerDBErr(err, "Unable to find a stack with the specified identifier inside the database")
 	}
 
 	relationConfig, err := edge.FetchEndpointRelationsConfig(tx)
@@ -107,7 +107,7 @@ func (handler *Handler) updateEdgeStack(tx dataservices.DataStoreTx, stackID por
 
 	hasWrongType, err := hasWrongEnvironmentType(tx.Endpoint(), relatedEndpointIds, payload.DeploymentType)
 	if err != nil {
-		return nil, httperror.InternalServerError("unable to check for existence of non fitting environments: %w", err)
+		return nil, httperror.BadRequest("unable to check for existence of non fitting environments: %w", err)
 	}
 	if hasWrongType {
 		return nil, httperror.BadRequest("edge stack with config do not match the environment type", nil)
@@ -138,19 +138,48 @@ func (handler *Handler) handleChangeEdgeGroups(tx dataservices.DataStoreTx, edge
 		return nil, nil, errors.WithMessage(err, "Unable to retrieve edge stack related environments from database")
 	}
 
-	oldRelatedEnvironmentsSet := set.ToSet(oldRelatedEnvironmentIDs)
-	newRelatedEnvironmentsSet := set.ToSet(newRelatedEnvironmentIDs)
+	oldRelatedSet := set.ToSet(oldRelatedEnvironmentIDs)
+	newRelatedSet := set.ToSet(newRelatedEnvironmentIDs)
 
-	relatedEnvironmentsToAdd := newRelatedEnvironmentsSet.Difference(oldRelatedEnvironmentsSet)
-	relatedEnvironmentsToRemove := oldRelatedEnvironmentsSet.Difference(newRelatedEnvironmentsSet)
-
-	if len(relatedEnvironmentsToRemove) > 0 {
-		tx.EndpointRelation().RemoveEndpointRelationsForEdgeStack(relatedEnvironmentsToRemove.Keys(), edgeStackID)
+	endpointsToRemove := set.Set[portainer.EndpointID]{}
+	for endpointID := range oldRelatedSet {
+		if !newRelatedSet[endpointID] {
+			endpointsToRemove[endpointID] = true
+		}
 	}
 
-	if len(relatedEnvironmentsToAdd) > 0 {
-		tx.EndpointRelation().AddEndpointRelationsForEdgeStack(relatedEnvironmentsToAdd.Keys(), edgeStackID)
+	for endpointID := range endpointsToRemove {
+		relation, err := tx.EndpointRelation().EndpointRelation(endpointID)
+		if err != nil {
+			return nil, nil, errors.WithMessage(err, "Unable to find environment relation in database")
+		}
+
+		delete(relation.EdgeStacks, edgeStackID)
+
+		if err := tx.EndpointRelation().UpdateEndpointRelation(endpointID, relation); err != nil {
+			return nil, nil, errors.WithMessage(err, "Unable to persist environment relation in database")
+		}
 	}
 
-	return newRelatedEnvironmentIDs, relatedEnvironmentsToAdd, nil
+	endpointsToAdd := set.Set[portainer.EndpointID]{}
+	for endpointID := range newRelatedSet {
+		if !oldRelatedSet[endpointID] {
+			endpointsToAdd[endpointID] = true
+		}
+	}
+
+	for endpointID := range endpointsToAdd {
+		relation, err := tx.EndpointRelation().EndpointRelation(endpointID)
+		if err != nil {
+			return nil, nil, errors.WithMessage(err, "Unable to find environment relation in database")
+		}
+
+		relation.EdgeStacks[edgeStackID] = true
+
+		if err := tx.EndpointRelation().UpdateEndpointRelation(endpointID, relation); err != nil {
+			return nil, nil, errors.WithMessage(err, "Unable to persist environment relation in database")
+		}
+	}
+
+	return newRelatedEnvironmentIDs, endpointsToAdd, nil
 }

api/http/handler/edgestacks/handler.go

@@ -22,21 +22,21 @@ type Handler struct {
 	GitService         portainer.GitService
 	edgeStacksService  *edgestackservice.Service
 	KubernetesDeployer portainer.KubernetesDeployer
-	stackCoordinator   *EdgeStackStatusUpdateCoordinator
 }
 
 // NewHandler creates a handler to manage environment(endpoint) group operations.
-func NewHandler(bouncer security.BouncerService, dataStore dataservices.DataStore, edgeStacksService *edgestackservice.Service, stackCoordinator *EdgeStackStatusUpdateCoordinator) *Handler {
+func NewHandler(bouncer security.BouncerService, dataStore dataservices.DataStore, edgeStacksService *edgestackservice.Service) *Handler {
 	h := &Handler{
 		Router:            mux.NewRouter(),
 		requestBouncer:    bouncer,
 		DataStore:         dataStore,
 		edgeStacksService: edgeStacksService,
-		stackCoordinator:  stackCoordinator,
 	}
 
 	h.Handle("/edge_stacks/create/{method}",
 		bouncer.AdminAccess(bouncer.EdgeComputeOperation(httperror.LoggerHandler(h.edgeStackCreate)))).Methods(http.MethodPost)
+	h.Handle("/edge_stacks",
+		bouncer.AdminAccess(bouncer.EdgeComputeOperation(middlewares.Deprecated(h, deprecatedEdgeStackCreateUrlParser)))).Methods(http.MethodPost) // Deprecated
 	h.Handle("/edge_stacks",
 		bouncer.AdminAccess(bouncer.EdgeComputeOperation(httperror.LoggerHandler(h.edgeStackList)))).Methods(http.MethodGet)
 	h.Handle("/edge_stacks/{id}",
@@ -53,13 +53,15 @@ func NewHandler(bouncer security.BouncerService, dataStore dataservices.DataStor
 	edgeStackStatusRouter := h.NewRoute().Subrouter()
 	edgeStackStatusRouter.Use(middlewares.WithEndpoint(h.DataStore.Endpoint(), "endpoint_id"))
 
+	edgeStackStatusRouter.PathPrefix("/edge_stacks/{id}/status/{endpoint_id}").Handler(bouncer.PublicAccess(httperror.LoggerHandler(h.edgeStackStatusDelete))).Methods(http.MethodDelete)
+
 	return h
 }
 
-func handlerDBErr(err error, msg string) *httperror.HandlerError {
+func (handler *Handler) handlerDBErr(err error, msg string) *httperror.HandlerError {
 	httpErr := httperror.InternalServerError(msg, err)
 
-	if dataservices.IsErrObjectNotFound(err) {
+	if handler.DataStore.IsErrObjectNotFound(err) {
 		httpErr.StatusCode = http.StatusNotFound
 	}
 

api/http/handler/edgetemplates/edgetemplate_list.go

@@ -0,0 +1,71 @@
+package edgetemplates
+
+import (
+	"net/http"
+	"slices"
+
+	portainer "github.com/portainer/portainer/api"
+	"github.com/portainer/portainer/api/http/client"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/response"
+
+	"github.com/segmentio/encoding/json"
+)
+
+type templateFileFormat struct {
+	Version   string               `json:"version"`
+	Templates []portainer.Template `json:"templates"`
+}
+
+// @id EdgeTemplateList
+// @deprecated
+// @summary Fetches the list of Edge Templates
+// @description **Access policy**: administrator
+// @tags edge_templates
+// @security ApiKeyAuth
+// @security jwt
+// @accept json
+// @produce json
+// @success 200 {array} portainer.Template
+// @failure 500
+// @router /edge_templates [get]
+func (handler *Handler) edgeTemplateList(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
+	settings, err := handler.DataStore.Settings().Settings()
+	if err != nil {
+		return httperror.InternalServerError("Unable to retrieve settings from the database", err)
+	}
+
+	url := portainer.DefaultTemplatesURL
+	if settings.TemplatesURL != "" {
+		url = settings.TemplatesURL
+	}
+
+	var templateData []byte
+	templateData, err = client.Get(url, 10)
+	if err != nil {
+		return httperror.InternalServerError("Unable to retrieve external templates", err)
+	}
+
+	var templateFile templateFileFormat
+
+	err = json.Unmarshal(templateData, &templateFile)
+	if err != nil {
+		return httperror.InternalServerError("Unable to parse template file", err)
+	}
+
+	// We only support version 3 of the template format
+	// this is only a temporary fix until we have custom edge templates
+	if templateFile.Version != "3" {
+		return httperror.InternalServerError("Unsupported template version", nil)
+	}
+
+	filteredTemplates := make([]portainer.Template, 0)
+
+	for _, template := range templateFile.Templates {
+		if slices.Contains(template.Categories, "edge") && slices.Contains([]portainer.TemplateType{portainer.ComposeStackTemplate, portainer.SwarmStackTemplate}, template.Type) {
+			filteredTemplates = append(filteredTemplates, template)
+		}
+	}
+
+	return response.JSON(w, filteredTemplates)
+}

api/http/handler/edgetemplates/handler.go

@@ -0,0 +1,32 @@
+package edgetemplates
+
+import (
+	"net/http"
+
+	"github.com/portainer/portainer/api/dataservices"
+	"github.com/portainer/portainer/api/http/middlewares"
+	"github.com/portainer/portainer/api/http/security"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+
+	"github.com/gorilla/mux"
+)
+
+// Handler is the HTTP handler used to handle edge environment(endpoint) operations.
+type Handler struct {
+	*mux.Router
+	requestBouncer security.BouncerService
+	DataStore      dataservices.DataStore
+}
+
+// NewHandler creates a handler to manage environment(endpoint) operations.
+func NewHandler(bouncer security.BouncerService) *Handler {
+	h := &Handler{
+		Router:         mux.NewRouter(),
+		requestBouncer: bouncer,
+	}
+
+	h.Handle("/edge_templates",
+		bouncer.AdminAccess(middlewares.Deprecated(httperror.LoggerHandler(h.edgeTemplateList), func(w http.ResponseWriter, r *http.Request) (string, *httperror.HandlerError) { return "", nil }))).Methods(http.MethodGet)
+
+	return h
+}

api/http/handler/endpointedge/endpointedge_status_inspect.go

@@ -264,9 +264,6 @@ func (handler *Handler) buildSchedules(tx dataservices.DataStoreTx, endpointID p
 func (handler *Handler) buildEdgeStacks(tx dataservices.DataStoreTx, endpointID portainer.EndpointID) ([]stackStatusResponse, *httperror.HandlerError) {
 	relation, err := tx.EndpointRelation().EndpointRelation(endpointID)
 	if err != nil {
-		if tx.IsErrObjectNotFound(err) {
-			return nil, nil
-		}
 		return nil, httperror.InternalServerError("Unable to retrieve relation object from the database", err)
 	}
 

api/http/handler/endpointgroups/endpoints.go

@@ -21,17 +21,10 @@ func (handler *Handler) updateEndpointRelations(tx dataservices.DataStoreTx, end
 	}
 
 	endpointRelation, err := tx.EndpointRelation().EndpointRelation(endpoint.ID)
-	if err != nil && !tx.IsErrObjectNotFound(err) {
+	if err != nil {
 		return err
 	}
 
-	if endpointRelation == nil {
-		endpointRelation = &portainer.EndpointRelation{
-			EndpointID: endpoint.ID,
-			EdgeStacks: make(map[portainer.EdgeStackID]bool),
-		}
-	}
-
 	edgeGroups, err := tx.EdgeGroup().ReadAll()
 	if err != nil {
 		return err
@@ -39,9 +32,6 @@ func (handler *Handler) updateEndpointRelations(tx dataservices.DataStoreTx, end
 
 	edgeStacks, err := tx.EdgeStack().EdgeStacks()
 	if err != nil {
-		if tx.IsErrObjectNotFound(err) {
-			return nil
-		}
 		return err
 	}
 

api/http/handler/endpoints/endpoint_delete.go

@@ -91,7 +91,7 @@ func (handler *Handler) endpointDelete(w http.ResponseWriter, r *http.Request) *
 // @failure 400 "Invalid request payload, such as missing required fields or fields not meeting validation criteria."
 // @failure 403 "Unauthorized access or operation not allowed."
 // @failure 500 "Server error occurred while attempting to delete the specified environments."
-// @router /endpoints/delete [post]
+// @router /endpoints [delete]
 func (handler *Handler) endpointDeleteBatch(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
 	var p endpointDeleteBatchPayload
 	if err := request.DecodeAndValidateJSONPayload(r, &p); err != nil {
@@ -127,27 +127,6 @@ func (handler *Handler) endpointDeleteBatch(w http.ResponseWriter, r *http.Reque
 	return response.Empty(w)
 }
 
-// @id EndpointDeleteBatchDeprecated
-// @summary Remove multiple environments
-// @deprecated
-// @description Deprecated: use the `POST` endpoint instead.
-// @description Remove multiple environments and optionally clean-up associated resources.
-// @description **Access policy**: Administrator only.
-// @tags endpoints
-// @security ApiKeyAuth || jwt
-// @accept json
-// @produce json
-// @param body body endpointDeleteBatchPayload true "List of environments to delete, with optional deleteCluster flag to clean-up associated resources (cloud environments only)"
-// @success 204 "Environment(s) successfully deleted."
-// @failure 207 {object} endpointDeleteBatchPartialResponse "Partial success. Some environments were deleted successfully, while others failed."
-// @failure 400 "Invalid request payload, such as missing required fields or fields not meeting validation criteria."
-// @failure 403 "Unauthorized access or operation not allowed."
-// @failure 500 "Server error occurred while attempting to delete the specified environments."
-// @router /endpoints [delete]
-func (handler *Handler) endpointDeleteBatchDeprecated(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
-	return handler.endpointDeleteBatch(w, r)
-}
-
 func (handler *Handler) deleteEndpoint(tx dataservices.DataStoreTx, endpointID portainer.EndpointID, deleteCluster bool) error {
 	endpoint, err := tx.Endpoint().Endpoint(endpointID)
 	if tx.IsErrObjectNotFound(err) {

api/http/handler/endpoints/handler.go

@@ -68,8 +68,8 @@ func NewHandler(bouncer security.BouncerService) *Handler {
 		bouncer.AdminAccess(httperror.LoggerHandler(h.endpointUpdate))).Methods(http.MethodPut)
 	h.Handle("/endpoints/{id}",
 		bouncer.AdminAccess(httperror.LoggerHandler(h.endpointDelete))).Methods(http.MethodDelete)
-	h.Handle("/endpoints/delete",
-		bouncer.AdminAccess(httperror.LoggerHandler(h.endpointDeleteBatch))).Methods(http.MethodPost)
+	h.Handle("/endpoints",
+		bouncer.AdminAccess(httperror.LoggerHandler(h.endpointDeleteBatch))).Methods(http.MethodDelete)
 	h.Handle("/endpoints/{id}/dockerhub/{registryId}",
 		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.endpointDockerhubStatus))).Methods(http.MethodGet)
 	h.Handle("/endpoints/{id}/snapshot",
@@ -85,7 +85,6 @@ func NewHandler(bouncer security.BouncerService) *Handler {
 
 	// DEPRECATED
 	h.Handle("/endpoints/{id}/status", bouncer.PublicAccess(httperror.LoggerHandler(h.endpointStatusInspect))).Methods(http.MethodGet)
-	h.Handle("/endpoints", bouncer.AdminAccess(httperror.LoggerHandler(h.endpointDeleteBatchDeprecated))).Methods(http.MethodDelete)
 
 	return h
 }

api/http/handler/endpoints/update_edge_relations.go

@@ -23,7 +23,6 @@ func (handler *Handler) updateEdgeRelations(tx dataservices.DataStoreTx, endpoin
 
 		relation = &portainer.EndpointRelation{
 			EndpointID: endpoint.ID,
-			EdgeStacks: map[portainer.EdgeStackID]bool{},
 		}
 		if err := tx.EndpointRelation().Create(relation); err != nil {
 			return errors.WithMessage(err, "Unable to create environment relation inside the database")

api/http/handler/handler.go

@@ -11,6 +11,7 @@ import (
 	"github.com/portainer/portainer/api/http/handler/edgegroups"
 	"github.com/portainer/portainer/api/http/handler/edgejobs"
 	"github.com/portainer/portainer/api/http/handler/edgestacks"
+	"github.com/portainer/portainer/api/http/handler/edgetemplates"
 	"github.com/portainer/portainer/api/http/handler/endpointedge"
 	"github.com/portainer/portainer/api/http/handler/endpointgroups"
 	"github.com/portainer/portainer/api/http/handler/endpointproxy"
@@ -49,6 +50,7 @@ type Handler struct {
 	EdgeGroupsHandler      *edgegroups.Handler
 	EdgeJobsHandler        *edgejobs.Handler
 	EdgeStacksHandler      *edgestacks.Handler
+	EdgeTemplatesHandler   *edgetemplates.Handler
 	EndpointEdgeHandler    *endpointedge.Handler
 	EndpointGroupHandler   *endpointgroups.Handler
 	EndpointHandler        *endpoints.Handler
@@ -81,7 +83,7 @@ type Handler struct {
 }
 
 // @title PortainerCE API
-// @version 2.27.1
+// @version 2.26.1
 // @description.markdown api-description.md
 // @termsOfService
 
@@ -188,6 +190,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		http.StripPrefix("/api", h.EdgeGroupsHandler).ServeHTTP(w, r)
 	case strings.HasPrefix(r.URL.Path, "/api/edge_jobs"):
 		http.StripPrefix("/api", h.EdgeJobsHandler).ServeHTTP(w, r)
+	case strings.HasPrefix(r.URL.Path, "/api/edge_templates"):
+		http.StripPrefix("/api", h.EdgeTemplatesHandler).ServeHTTP(w, r)
 	case strings.HasPrefix(r.URL.Path, "/api/endpoint_groups"):
 		http.StripPrefix("/api", h.EndpointGroupHandler).ServeHTTP(w, r)
 	case strings.HasPrefix(r.URL.Path, "/api/kubernetes"):

api/http/handler/helm/handler.go

@@ -53,6 +53,12 @@ func NewHandler(bouncer security.BouncerService, dataStore dataservices.DataStor
 	h.Handle("/{id}/kubernetes/helm",
 		httperror.LoggerHandler(h.helmInstall)).Methods(http.MethodPost)
 
+	// Deprecated
+	h.Handle("/{id}/kubernetes/helm/repositories",
+		httperror.LoggerHandler(h.userGetHelmRepos)).Methods(http.MethodGet)
+	h.Handle("/{id}/kubernetes/helm/repositories",
+		httperror.LoggerHandler(h.userCreateHelmRepo)).Methods(http.MethodPost)
+
 	return h
 }
 

api/http/handler/helm/helm_install_test.go

@@ -45,7 +45,7 @@ func Test_helmInstall(t *testing.T) {
 	is.NotNil(h, "Handler should not fail")
 
 	// Install a single chart.  We expect to get these values back
-	options := options.InstallOptions{Name: "nginx-1", Chart: "nginx", Namespace: "default", Repo: "https://kubernetes.github.io/ingress-nginx"}
+	options := options.InstallOptions{Name: "nginx-1", Chart: "nginx", Namespace: "default", Repo: "https://charts.bitnami.com/bitnami"}
 	optdata, err := json.Marshal(options)
 	is.NoError(err)
 

api/http/handler/helm/helm_repo_search_test.go

@@ -20,7 +20,7 @@ func Test_helmRepoSearch(t *testing.T) {
 
 	assert.NotNil(t, h, "Handler should not fail")
 
-	repos := []string{"https://kubernetes.github.io/ingress-nginx", "https://portainer.github.io/k8s"}
+	repos := []string{"https://charts.bitnami.com/bitnami", "https://portainer.github.io/k8s"}
 
 	for _, repo := range repos {
 		t.Run(repo, func(t *testing.T) {

api/http/handler/helm/helm_show_test.go

@@ -31,7 +31,7 @@ func Test_helmShow(t *testing.T) {
 		t.Run(cmd, func(t *testing.T) {
 			is.NotNil(h, "Handler should not fail")
 
-			repoUrlEncoded := url.QueryEscape("https://kubernetes.github.io/ingress-nginx")
+			repoUrlEncoded := url.QueryEscape("https://charts.bitnami.com/bitnami")
 			chart := "nginx"
 			req := httptest.NewRequest("GET", fmt.Sprintf("/templates/helm/%s?repo=%s&chart=%s", cmd, repoUrlEncoded, chart), nil)
 			rr := httptest.NewRecorder()

api/http/handler/helm/user_helm_repos.go

@@ -0,0 +1,127 @@
+package helm
+
+import (
+	"net/http"
+	"strings"
+
+	portainer "github.com/portainer/portainer/api"
+	"github.com/portainer/portainer/api/http/security"
+	"github.com/portainer/portainer/pkg/libhelm"
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
+
+	"github.com/pkg/errors"
+)
+
+type helmUserRepositoryResponse struct {
+	GlobalRepository string                         `json:"GlobalRepository"`
+	UserRepositories []portainer.HelmUserRepository `json:"UserRepositories"`
+}
+
+type addHelmRepoUrlPayload struct {
+	URL string `json:"url"`
+}
+
+func (p *addHelmRepoUrlPayload) Validate(_ *http.Request) error {
+	return libhelm.ValidateHelmRepositoryURL(p.URL, nil)
+}
+
+// @id HelmUserRepositoryCreateDeprecated
+// @summary Create a user helm repository
+// @description Create a user helm repository.
+// @description **Access policy**: authenticated
+// @tags helm
+// @security ApiKeyAuth
+// @security jwt
+// @accept json
+// @produce json
+// @param id path int true "Environment(Endpoint) identifier"
+// @param payload body addHelmRepoUrlPayload true "Helm Repository"
+// @success 200 {object} portainer.HelmUserRepository "Success"
+// @failure 400 "Invalid request"
+// @failure 403 "Permission denied"
+// @failure 500 "Server error"
+// @deprecated
+// @router /endpoints/{id}/kubernetes/helm/repositories [post]
+func (handler *Handler) userCreateHelmRepo(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
+	tokenData, err := security.RetrieveTokenData(r)
+	if err != nil {
+		return httperror.InternalServerError("Unable to retrieve user authentication token", err)
+	}
+	userID := tokenData.ID
+
+	p := new(addHelmRepoUrlPayload)
+	err = request.DecodeAndValidateJSONPayload(r, p)
+	if err != nil {
+		return httperror.BadRequest("Invalid Helm repository URL", err)
+	}
+
+	// lowercase, remove trailing slash
+	p.URL = strings.TrimSuffix(strings.ToLower(p.URL), "/")
+
+	records, err := handler.dataStore.HelmUserRepository().HelmUserRepositoryByUserID(userID)
+	if err != nil {
+		return httperror.InternalServerError("Unable to access the DataStore", err)
+	}
+
+	// check if repo already exists - by doing case insensitive comparison
+	for _, record := range records {
+		if strings.EqualFold(record.URL, p.URL) {
+			errMsg := "Helm repo already registered for user"
+			return httperror.BadRequest(errMsg, errors.New(errMsg))
+		}
+	}
+
+	record := portainer.HelmUserRepository{
+		UserID: userID,
+		URL:    p.URL,
+	}
+
+	err = handler.dataStore.HelmUserRepository().Create(&record)
+	if err != nil {
+		return httperror.InternalServerError("Unable to save a user Helm repository URL", err)
+	}
+
+	return response.JSON(w, record)
+}
+
+// @id HelmUserRepositoriesListDeprecated
+// @summary List a users helm repositories
+// @description Inspect a user helm repositories.
+// @description **Access policy**: authenticated
+// @tags helm
+// @security ApiKeyAuth
+// @security jwt
+// @produce json
+// @param id path int true "User identifier"
+// @success 200 {object} helmUserRepositoryResponse "Success"
+// @failure 400 "Invalid request"
+// @failure 403 "Permission denied"
+// @failure 500 "Server error"
+// @deprecated
+// @router /endpoints/{id}/kubernetes/helm/repositories [get]
+func (handler *Handler) userGetHelmRepos(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
+	tokenData, err := security.RetrieveTokenData(r)
+	if err != nil {
+		return httperror.InternalServerError("Unable to retrieve user authentication token", err)
+	}
+	userID := tokenData.ID
+
+	settings, err := handler.dataStore.Settings().Settings()
+	if err != nil {
+		return httperror.InternalServerError("Unable to retrieve settings from the database", err)
+	}
+
+	userRepos, err := handler.dataStore.HelmUserRepository().HelmUserRepositoryByUserID(userID)
+	if err != nil {
+		return httperror.InternalServerError("Unable to get user Helm repositories", err)
+	}
+
+	resp := helmUserRepositoryResponse{
+		GlobalRepository: settings.HelmRepositoryURL,
+		UserRepositories: userRepos,
+	}
+
+	return response.JSON(w, resp)
+}

api/http/handler/registries/registry_list.go

@@ -36,9 +36,5 @@ func (handler *Handler) registryList(w http.ResponseWriter, r *http.Request) *ht
 		return httperror.InternalServerError("Unable to retrieve registries from the database", err)
 	}
 
-	for idx := range registries {
-		hideFields(&registries[idx], false)
-	}
-
 	return response.JSON(w, registries)
 }

api/http/handler/settings/settings_update.go

@@ -46,7 +46,7 @@ type settingsUpdatePayload struct {
 	// Whether telemetry is enabled
 	EnableTelemetry *bool `example:"false"`
 	// Helm repository URL
-	HelmRepositoryURL *string `example:"https://kubernetes.github.io/ingress-nginx"`
+	HelmRepositoryURL *string `example:"https://charts.bitnami.com/bitnami"`
 	// Kubectl Shell Image
 	KubectlShellImage *string `example:"portainer/kubectl-shell:latest"`
 	// TrustOnFirstConnect makes Portainer accepting edge agent connection by default

api/http/handler/stacks/handler.go

@@ -11,6 +11,7 @@ import (
 	"github.com/portainer/portainer/api/dataservices"
 	dockerclient "github.com/portainer/portainer/api/docker/client"
 	"github.com/portainer/portainer/api/docker/consts"
+	"github.com/portainer/portainer/api/http/middlewares"
 	"github.com/portainer/portainer/api/http/security"
 	"github.com/portainer/portainer/api/internal/authorization"
 	"github.com/portainer/portainer/api/internal/endpointutils"
@@ -61,6 +62,8 @@ func NewHandler(bouncer security.BouncerService) *Handler {
 
 	h.Handle("/stacks/create/{type}/{method}",
 		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.stackCreate))).Methods(http.MethodPost)
+	h.Handle("/stacks",
+		bouncer.AuthenticatedAccess(middlewares.Deprecated(h, deprecatedStackCreateUrlParser))).Methods(http.MethodPost) // Deprecated
 	h.Handle("/stacks",
 		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.stackList))).Methods(http.MethodGet)
 	h.Handle("/stacks/{id}",

api/http/handler/stacks/stack_create.go

@@ -1,6 +1,7 @@
 package stacks
 
 import (
+	"fmt"
 	"net/http"
 
 	portainer "github.com/portainer/portainer/api"
@@ -140,3 +141,53 @@ func (handler *Handler) decorateStackResponse(w http.ResponseWriter, stack *port
 
 	return response.JSON(w, stack)
 }
+
+func getStackTypeFromQueryParameter(r *http.Request) (string, error) {
+	stackType, err := request.RetrieveNumericQueryParameter(r, "type", false)
+	if err != nil {
+		return "", err
+	}
+
+	switch stackType {
+	case 1:
+		return "swarm", nil
+	case 2:
+		return "standalone", nil
+	case 3:
+		return "kubernetes", nil
+	}
+
+	return "", errors.New(request.ErrInvalidQueryParameter)
+}
+
+// @id StackCreate
+// @summary Deploy a new stack
+// @description Deploy a new stack into a Docker environment(endpoint) specified via the environment(endpoint) identifier.
+// @description **Access policy**: authenticated
+// @tags stacks
+// @security ApiKeyAuth
+// @security jwt
+// @accept json,multipart/form-data
+// @produce json
+// @param type query int true "Stack deployment type. Possible values: 1 (Swarm stack), 2 (Compose stack) or 3 (Kubernetes stack)." Enums(1,2,3)
+// @param method query string true "Stack deployment method. Possible values: file, string, repository or url." Enums(string, file, repository, url)
+// @param endpointId query int true "Identifier of the environment(endpoint) that will be used to deploy the stack"
+// @param body body object true "for body documentation see the relevant /stacks/create/{type}/{method} endpoint"
+// @success 200 {object} portainer.Stack
+// @failure 400 "Invalid request"
+// @failure 500 "Server error"
+// @deprecated
+// @router /stacks [post]
+func deprecatedStackCreateUrlParser(w http.ResponseWriter, r *http.Request) (string, *httperror.HandlerError) {
+	method, err := request.RetrieveQueryParameter(r, "method", false)
+	if err != nil {
+		return "", httperror.BadRequest("Invalid query parameter: method. Valid values are: file or string", err)
+	}
+
+	stackType, err := getStackTypeFromQueryParameter(r)
+	if err != nil {
+		return "", httperror.BadRequest("Invalid query parameter: type", err)
+	}
+
+	return fmt.Sprintf("/stacks/create/%s/%s", stackType, method), nil
+}

api/http/handler/system/handler.go

@@ -59,6 +59,10 @@ func NewHandler(bouncer security.BouncerService,
 	// Deprecated /status endpoint, will be removed in the future.
 	h.Handle("/status",
 		bouncer.PublicAccess(httperror.LoggerHandler(h.statusInspectDeprecated))).Methods(http.MethodGet)
+	h.Handle("/status/version",
+		bouncer.AuthenticatedAccess(http.HandlerFunc(h.versionDeprecated))).Methods(http.MethodGet)
+	h.Handle("/status/nodes",
+		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.statusNodesCountDeprecated))).Methods(http.MethodGet)
 
 	return h
 }

api/http/handler/system/nodes_count.go

@@ -3,11 +3,12 @@ package system
 import (
 	"net/http"
 
-	portainer "github.com/portainer/portainer/api"
 	statusutil "github.com/portainer/portainer/api/internal/nodes"
 	"github.com/portainer/portainer/api/internal/snapshot"
 	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 	"github.com/portainer/portainer/pkg/libhttp/response"
+
+	"github.com/rs/zerolog/log"
 )
 
 type nodesCountResponse struct {
@@ -30,15 +31,32 @@ func (handler *Handler) systemNodesCount(w http.ResponseWriter, r *http.Request)
 		return httperror.InternalServerError("Failed to get environment list", err)
 	}
 
-	var nodes int
-
-	for _, endpoint := range endpoints {
-		if err := snapshot.FillSnapshotData(handler.dataStore, &endpoint); err != nil {
+	for i := range endpoints {
+		err = snapshot.FillSnapshotData(handler.dataStore, &endpoints[i])
+		if err != nil {
 			return httperror.InternalServerError("Unable to add snapshot data", err)
 		}
-
-		nodes += statusutil.NodesCount([]portainer.Endpoint{endpoint})
 	}
 
+	nodes := statusutil.NodesCount(endpoints)
+
 	return response.JSON(w, &nodesCountResponse{Nodes: nodes})
 }
+
+// @id statusNodesCount
+// @summary Retrieve the count of nodes
+// @deprecated
+// @description Deprecated: use the `/system/nodes` endpoint instead.
+// @description **Access policy**: authenticated
+// @security ApiKeyAuth
+// @security jwt
+// @tags status
+// @produce json
+// @success 200 {object} nodesCountResponse "Success"
+// @failure 500 "Server error"
+// @router /status/nodes [get]
+func (handler *Handler) statusNodesCountDeprecated(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
+	log.Warn().Msg("The /status/nodes endpoint is deprecated, please use the /system/nodes endpoint instead")
+
+	return handler.systemNodesCount(w, r)
+}

api/http/handler/system/system_info.go

@@ -3,7 +3,6 @@ package system
 import (
 	"net/http"
 
-	"github.com/pkg/errors"
 	"github.com/portainer/portainer/api/internal/endpointutils"
 	plf "github.com/portainer/portainer/api/platform"
 	httperror "github.com/portainer/portainer/pkg/libhttp/error"
@@ -47,12 +46,7 @@ func (handler *Handler) systemInfo(w http.ResponseWriter, r *http.Request) *http
 
 	platform, err := handler.platformService.GetPlatform()
 	if err != nil {
-		if !errors.Is(err, plf.ErrNoLocalEnvironment) {
-			return httperror.InternalServerError("Failed to get platform", err)
-		}
-		// If no local environment is detected, we assume the platform is Docker
-		// UI will stop showing the upgrade banner
-		platform = plf.PlatformDocker
+		return httperror.InternalServerError("Failed to get platform", err)
 	}
 
 	return response.JSON(w, &systemInfoResponse{

api/http/handler/system/system_upgrade.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"regexp"
 
-	ceplf "github.com/portainer/portainer/api/platform"
 	httperror "github.com/portainer/portainer/pkg/libhttp/error"
 	"github.com/portainer/portainer/pkg/libhttp/request"
 	"github.com/portainer/portainer/pkg/libhttp/response"
@@ -46,9 +45,6 @@ func (handler *Handler) systemUpgrade(w http.ResponseWriter, r *http.Request) *h
 
 	environment, err := handler.platformService.GetLocalEnvironment()
 	if err != nil {
-		if errors.Is(err, ceplf.ErrNoLocalEnvironment) {
-			return httperror.NotFound("The system upgrade feature is disabled because no local environment was detected.", err)
-		}
 		return httperror.InternalServerError("Failed to get local environment", err)
 	}
 
@@ -57,7 +53,8 @@ func (handler *Handler) systemUpgrade(w http.ResponseWriter, r *http.Request) *h
 		return httperror.InternalServerError("Failed to get platform", err)
 	}
 
-	if err := handler.upgradeService.Upgrade(platform, environment, payload.License); err != nil {
+	err = handler.upgradeService.Upgrade(platform, environment, payload.License)
+	if err != nil {
 		return httperror.InternalServerError("Failed to upgrade Portainer", err)
 	}
 

api/http/handler/system/version.go

@@ -106,3 +106,21 @@ func HasNewerVersion(currentVersion, latestVersion string) bool {
 
 	return currentVersionSemver.LessThan(*latestVersionSemver)
 }
+
+// @id Version
+// @summary Check for portainer updates
+// @deprecated
+// @description Deprecated: use the `/system/version` endpoint instead.
+// @description Check if portainer has an update available
+// @description **Access policy**: authenticated
+// @security ApiKeyAuth
+// @security jwt
+// @tags status
+// @produce json
+// @success 200 {object} versionResponse "Success"
+// @router /status/version [get]
+func (handler *Handler) versionDeprecated(w http.ResponseWriter, r *http.Request) {
+	log.Warn().Msg("The /status/version endpoint is deprecated, please use the /system/version endpoint instead")
+
+	handler.version(w, r)
+}

api/http/handler/tags/tag_delete.go

@@ -133,17 +133,10 @@ func deleteTag(tx dataservices.DataStoreTx, tagID portainer.TagID) error {
 
 func updateEndpointRelations(tx dataservices.DataStoreTx, endpoint portainer.Endpoint, edgeGroups []portainer.EdgeGroup, edgeStacks []portainer.EdgeStack) error {
 	endpointRelation, err := tx.EndpointRelation().EndpointRelation(endpoint.ID)
-	if err != nil && !tx.IsErrObjectNotFound(err) {
+	if err != nil {
 		return err
 	}
 
-	if endpointRelation == nil {
-		endpointRelation = &portainer.EndpointRelation{
-			EndpointID: endpoint.ID,
-			EdgeStacks: make(map[portainer.EdgeStackID]bool),
-		}
-	}
-
 	endpointGroup, err := tx.EndpointGroup().Read(endpoint.GroupID)
 	if err != nil {
 		return err
@@ -154,7 +147,6 @@ func updateEndpointRelations(tx dataservices.DataStoreTx, endpoint portainer.End
 	for _, edgeStackID := range endpointStacks {
 		stacksSet[edgeStackID] = true
 	}
-
 	endpointRelation.EdgeStacks = stacksSet
 
 	return tx.EndpointRelation().UpdateEndpointRelation(endpoint.ID, endpointRelation)

api/http/handler/templates/handler.go

@@ -29,5 +29,7 @@ func NewHandler(bouncer security.BouncerService) *Handler {
 		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.templateList))).Methods(http.MethodGet)
 	h.Handle("/templates/{id}/file",
 		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.templateFile))).Methods(http.MethodPost)
+	h.Handle("/templates/file",
+		bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.templateFileOld))).Methods(http.MethodPost)
 	return h
 }

api/http/handler/templates/template_file_old.go

@@ -0,0 +1,93 @@
+package templates
+
+import (
+	"errors"
+	"net/http"
+
+	httperror "github.com/portainer/portainer/pkg/libhttp/error"
+	"github.com/portainer/portainer/pkg/libhttp/request"
+	"github.com/portainer/portainer/pkg/libhttp/response"
+	"github.com/rs/zerolog/log"
+)
+
+type filePayload struct {
+	// URL of a git repository where the file is stored
+	RepositoryURL string `example:"https://github.com/portainer/portainer-compose" validate:"required"`
+	// Path to the file inside the git repository
+	ComposeFilePathInRepository string `example:"./subfolder/docker-compose.yml" validate:"required"`
+}
+
+func (payload *filePayload) Validate(r *http.Request) error {
+	if len(payload.RepositoryURL) == 0 {
+		return errors.New("Invalid repository url")
+	}
+
+	if len(payload.ComposeFilePathInRepository) == 0 {
+		return errors.New("Invalid file path")
+	}
+
+	return nil
+}
+
+func (handler *Handler) ifRequestedTemplateExists(payload *filePayload) *httperror.HandlerError {
+	response, httpErr := handler.fetchTemplates()
+	if httpErr != nil {
+		return httpErr
+	}
+
+	for _, t := range response.Templates {
+		if t.Repository.URL == payload.RepositoryURL && t.Repository.StackFile == payload.ComposeFilePathInRepository {
+			return nil
+		}
+	}
+	return httperror.InternalServerError("Invalid template", errors.New("requested template does not exist"))
+}
+
+// @id TemplateFileOld
+// @summary Get a template's file
+// @deprecated
+// @description Get a template's file
+// @description **Access policy**: authenticated
+// @tags templates
+// @security ApiKeyAuth
+// @security jwt
+// @accept json
+// @produce json
+// @param body body filePayload true "File details"
+// @success 200 {object} fileResponse "Success"
+// @failure 400 "Invalid request"
+// @failure 500 "Server error"
+// @router /templates/file [post]
+func (handler *Handler) templateFileOld(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
+	log.Warn().Msg("This api is deprecated. Please use /templates/{id}/file instead")
+
+	var payload filePayload
+	err := request.DecodeAndValidateJSONPayload(r, &payload)
+	if err != nil {
+		return httperror.BadRequest("Invalid request payload", err)
+	}
+
+	if err := handler.ifRequestedTemplateExists(&payload); err != nil {
+		return err
+	}
+
+	projectPath, err := handler.FileService.GetTemporaryPath()
+	if err != nil {
+		return httperror.InternalServerError("Unable to create temporary folder", err)
+	}
+
+	defer handler.cleanUp(projectPath)
+
+	err = handler.GitService.CloneRepository(projectPath, payload.RepositoryURL, "", "", "", false)
+	if err != nil {
+		return httperror.InternalServerError("Unable to clone git repository", err)
+	}
+
+	fileContent, err := handler.FileService.GetFileContent(projectPath, payload.ComposeFilePathInRepository)
+	if err != nil {
+		return httperror.InternalServerError("Failed loading file content", err)
+	}
+
+	return response.JSON(w, fileResponse{FileContent: string(fileContent)})
+
+}

api/http/server.go

@@ -24,6 +24,7 @@ import (
 	"github.com/portainer/portainer/api/http/handler/edgegroups"
 	"github.com/portainer/portainer/api/http/handler/edgejobs"
 	"github.com/portainer/portainer/api/http/handler/edgestacks"
+	"github.com/portainer/portainer/api/http/handler/edgetemplates"
 	"github.com/portainer/portainer/api/http/handler/endpointedge"
 	"github.com/portainer/portainer/api/http/handler/endpointgroups"
 	"github.com/portainer/portainer/api/http/handler/endpointproxy"
@@ -160,14 +161,14 @@ func (server *Server) Start() error {
 	edgeJobsHandler.FileService = server.FileService
 	edgeJobsHandler.ReverseTunnelService = server.ReverseTunnelService
 
-	edgeStackCoordinator := edgestacks.NewEdgeStackStatusUpdateCoordinator(server.DataStore)
-	go edgeStackCoordinator.Start()
-
-	var edgeStacksHandler = edgestacks.NewHandler(requestBouncer, server.DataStore, server.EdgeStacksService, edgeStackCoordinator)
+	var edgeStacksHandler = edgestacks.NewHandler(requestBouncer, server.DataStore, server.EdgeStacksService)
 	edgeStacksHandler.FileService = server.FileService
 	edgeStacksHandler.GitService = server.GitService
 	edgeStacksHandler.KubernetesDeployer = server.KubernetesDeployer
 
+	var edgeTemplatesHandler = edgetemplates.NewHandler(requestBouncer)
+	edgeTemplatesHandler.DataStore = server.DataStore
+
 	var endpointHandler = endpoints.NewHandler(requestBouncer)
 	endpointHandler.DataStore = server.DataStore
 	endpointHandler.FileService = server.FileService
@@ -302,6 +303,7 @@ func (server *Server) Start() error {
 		EdgeGroupsHandler:      edgeGroupsHandler,
 		EdgeJobsHandler:        edgeJobsHandler,
 		EdgeStacksHandler:      edgeStacksHandler,
+		EdgeTemplatesHandler:   edgeTemplatesHandler,
 		EndpointGroupHandler:   endpointGroupHandler,
 		EndpointHandler:        endpointHandler,
 		EndpointHelmHandler:    endpointHelmHandler,

api/internal/edge/edgestacks/service.go

@@ -99,15 +99,12 @@ func (service *Service) PersistEdgeStack(
 	stack.ManifestPath = manifestPath
 	stack.ProjectPath = projectPath
 	stack.EntryPoint = composePath
+	stack.NumDeployments = len(relatedEndpointIds)
 
 	if err := tx.EdgeStack().Create(stack.ID, stack); err != nil {
 		return nil, err
 	}
 
-	if err := tx.EndpointRelation().AddEndpointRelationsForEdgeStack(relatedEndpointIds, stack.ID); err != nil {
-		return nil, fmt.Errorf("unable to add endpoint relations: %w", err)
-	}
-
 	if err := service.updateEndpointRelations(tx, stack.ID, relatedEndpointIds); err != nil {
 		return nil, fmt.Errorf("unable to update endpoint relations: %w", err)
 	}
@@ -122,9 +119,6 @@ func (service *Service) updateEndpointRelations(tx dataservices.DataStoreTx, edg
 	for _, endpointID := range relatedEndpointIds {
 		relation, err := endpointRelationService.EndpointRelation(endpointID)
 		if err != nil {
-			if tx.IsErrObjectNotFound(err) {
-				continue
-			}
 			return fmt.Errorf("unable to find endpoint relation in database: %w", err)
 		}
 
@@ -150,8 +144,17 @@ func (service *Service) DeleteEdgeStack(tx dataservices.DataStoreTx, edgeStackID
 		return errors.WithMessage(err, "Unable to retrieve edge stack related environments from database")
 	}
 
-	if err := tx.EndpointRelation().RemoveEndpointRelationsForEdgeStack(relatedEndpointIds, edgeStackID); err != nil {
-		return errors.WithMessage(err, "unable to remove environment relation in database")
+	for _, endpointID := range relatedEndpointIds {
+		relation, err := tx.EndpointRelation().EndpointRelation(endpointID)
+		if err != nil {
+			return errors.WithMessage(err, "Unable to find environment relation in database")
+		}
+
+		delete(relation.EdgeStacks, edgeStackID)
+
+		if err := tx.EndpointRelation().UpdateEndpointRelation(endpointID, relation); err != nil {
+			return errors.WithMessage(err, "Unable to persist environment relation in database")
+		}
 	}
 
 	if err := tx.EdgeStack().DeleteEdgeStack(edgeStackID); err != nil {

api/internal/testhelpers/datastore.go

@@ -9,8 +9,6 @@ import (
 	"github.com/portainer/portainer/api/dataservices/errors"
 )
 
-var _ dataservices.DataStore = &testDatastore{}
-
 type testDatastore struct {
 	customTemplate          dataservices.CustomTemplateService
 	edgeGroup               dataservices.EdgeGroupService
@@ -229,30 +227,6 @@ func (s *stubEndpointRelationService) UpdateEndpointRelation(ID portainer.Endpoi
 	return nil
 }
 
-func (s *stubEndpointRelationService) AddEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error {
-	for _, endpointID := range endpointIDs {
-		for i, r := range s.relations {
-			if r.EndpointID == endpointID {
-				s.relations[i].EdgeStacks[edgeStackID] = true
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *stubEndpointRelationService) RemoveEndpointRelationsForEdgeStack(endpointIDs []portainer.EndpointID, edgeStackID portainer.EdgeStackID) error {
-	for _, endpointID := range endpointIDs {
-		for i, r := range s.relations {
-			if r.EndpointID == endpointID {
-				delete(s.relations[i].EdgeStacks, edgeStackID)
-			}
-		}
-	}
-
-	return nil
-}
-
 func (s *stubEndpointRelationService) DeleteEndpointRelation(ID portainer.EndpointID) error {
 	return nil
 }

api/oauth/oauth.go

@@ -50,7 +50,7 @@ func (*Service) Authenticate(code string, configuration *portainer.OAuthSettings
 		return "", err
 	}
 
-	maps.Copy(resource, idToken)
+	maps.Copy(idToken, resource)
 
 	username, err := GetUsername(resource, configuration.UserIdentifier)
 	if err != nil {

api/platform/service.go

@@ -14,10 +14,6 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-var (
-	ErrNoLocalEnvironment = errors.New("No local environment was detected")
-)
-
 type Service interface {
 	GetLocalEnvironment() (*portainer.Endpoint, error)
 	GetPlatform() (ContainerPlatform, error)
@@ -39,7 +35,7 @@ func (service *service) loadEnvAndPlatform() error {
 		return nil
 	}
 
-	environment, platform, err := detectLocalEnvironment(service.dataStore)
+	environment, platform, err := guessLocalEnvironment(service.dataStore)
 	if err != nil {
 		return err
 	}
@@ -77,7 +73,7 @@ var platformToEndpointType = map[ContainerPlatform][]portainer.EndpointType{
 	PlatformKubernetes: {portainer.KubernetesLocalEnvironment},
 }
 
-func detectLocalEnvironment(dataStore dataservices.DataStore) (*portainer.Endpoint, ContainerPlatform, error) {
+func guessLocalEnvironment(dataStore dataservices.DataStore) (*portainer.Endpoint, ContainerPlatform, error) {
 	platform := DetermineContainerPlatform()
 
 	if !slices.Contains([]ContainerPlatform{PlatformDocker, PlatformKubernetes}, platform) {
@@ -117,7 +113,7 @@ func detectLocalEnvironment(dataStore dataservices.DataStore) (*portainer.Endpoi
 		}
 	}
 
-	return nil, "", ErrNoLocalEnvironment
+	return nil, "", errors.New("failed to find local environment")
 }
 
 func checkDockerEnvTypeForUpgrade(environment *portainer.Endpoint) ContainerPlatform {

api/portainer.go

@@ -588,7 +588,7 @@ type (
 		// User identifier
 		UserID UserID `json:"UserId" example:"1"`
 		// Helm repository URL
-		URL string `json:"URL" example:"https://kubernetes.github.io/ingress-nginx"`
+		URL string `json:"URL" example:"https://charts.bitnami.com/bitnami"`
 	}
 
 	// QuayRegistryData represents data required for Quay registry to work
@@ -984,8 +984,8 @@ type (
 		KubeconfigExpiry string `json:"KubeconfigExpiry" example:"24h"`
 		// Whether telemetry is enabled
 		EnableTelemetry bool `json:"EnableTelemetry" example:"false"`
-		// Helm repository URL, defaults to ""
-		HelmRepositoryURL string `json:"HelmRepositoryURL"`
+		// Helm repository URL, defaults to "https://charts.bitnami.com/bitnami"
+		HelmRepositoryURL string `json:"HelmRepositoryURL" example:"https://charts.bitnami.com/bitnami"`
 		// KubectlImage, defaults to portainer/kubectl-shell
 		KubectlShellImage string `json:"KubectlShellImage" example:"portainer/kubectl-shell"`
 		// TrustOnFirstConnect makes Portainer accepting edge agent connection by default
@@ -1491,8 +1491,7 @@ type (
 		StoreSSLCertPair(cert, key []byte) (string, string, error)
 		CopySSLCertPair(certPath, keyPath string) (string, string, error)
 		CopySSLCACert(caCertPath string) (string, error)
-		StoreMTLSCertificates(caCert, cert, key []byte) (string, string, string, error)
-		GetMTLSCertificates() (string, string, string, error)
+		StoreMTLSCertificates(cert, caCert, key []byte) (string, string, string, error)
 		GetDefaultChiselPrivateKeyPath() string
 		StoreChiselPrivateKey(privateKey []byte) error
 	}
@@ -1637,9 +1636,9 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.27.1"
+	APIVersion = "2.26.1"
 	// Support annotation for the API version ("STS" for Short-Term Support or "LTS" for Long-Term Support)
-	APIVersionSupport = "LTS"
+	APIVersionSupport = "STS"
 	// Edition is what this edition of Portainer is called
 	Edition = PortainerCE
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax
@@ -1673,8 +1672,8 @@ const (
 	DefaultEdgeAgentCheckinIntervalInSeconds = 5
 	// DefaultTemplatesURL represents the URL to the official templates supported by Portainer
 	DefaultTemplatesURL = "https://raw.githubusercontent.com/portainer/templates/v3/templates.json"
-	// DefaultHelmrepositoryURL set to empty string until oci support is added
-	DefaultHelmRepositoryURL = ""
+	// DefaultHelmrepositoryURL represents the URL to the official templates supported by Bitnami
+	DefaultHelmRepositoryURL = "https://charts.bitnami.com/bitnami"
 	// DefaultUserSessionTimeout represents the default timeout after which the user session is cleared
 	DefaultUserSessionTimeout = "8h"
 	// DefaultUserSessionTimeout represents the default timeout after which the user session is cleared

app/constants.ts

@@ -5,6 +5,7 @@ export const API_ENDPOINT_CUSTOM_TEMPLATES = 'api/custom_templates';
 export const API_ENDPOINT_EDGE_GROUPS = 'api/edge_groups';
 export const API_ENDPOINT_EDGE_JOBS = 'api/edge_jobs';
 export const API_ENDPOINT_EDGE_STACKS = 'api/edge_stacks';
+export const API_ENDPOINT_EDGE_TEMPLATES = 'api/edge_templates';
 export const API_ENDPOINT_ENDPOINTS = 'api/endpoints';
 export const API_ENDPOINT_ENDPOINT_GROUPS = 'api/endpoint_groups';
 export const API_ENDPOINT_KUBERNETES = 'api/kubernetes';

app/docker/helpers/imageHelper.js

@@ -1,4 +1,4 @@
-import { buildImageFullURIFromModel, imageContainsURL, fullURIIntoRepoAndTag } from '@/react/docker/images/utils';
+import { buildImageFullURIFromModel, imageContainsURL } from '@/react/docker/images/utils';
 
 angular.module('portainer.docker').factory('ImageHelper', ImageHelperFactory);
 function ImageHelperFactory() {
@@ -18,12 +18,8 @@ function ImageHelperFactory() {
    * @param {PorImageRegistryModel} registry
    */
   function createImageConfigForContainer(imageModel) {
-    const fromImage = buildImageFullURIFromModel(imageModel);
-    const { tag, repo } = fullURIIntoRepoAndTag(fromImage);
     return {
-      fromImage,
-      tag,
-      repo,
+      fromImage: buildImageFullURIFromModel(imageModel),
     };
   }
 

app/docker/views/containers/edit/containerController.js

@@ -207,9 +207,9 @@ angular.module('portainer.docker').controller('ContainerController', [
     async function commitContainerAsync() {
       $scope.config.commitInProgress = true;
       const registryModel = $scope.config.RegistryModel;
-      const { repo, tag } = ImageHelper.createImageConfigForContainer(registryModel);
+      const imageConfig = ImageHelper.createImageConfigForContainer(registryModel);
       try {
-        await commitContainer(endpoint.Id, { container: $transition$.params().id, repo, tag });
+        await commitContainer(endpoint.Id, { container: $transition$.params().id, repo: imageConfig.fromImage });
         Notifications.success('Image created', $transition$.params().id);
         $state.reload();
       } catch (err) {

app/docker/views/images/edit/imageController.js

@@ -2,6 +2,7 @@ import _ from 'lodash-es';
 import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
 import { confirmImageExport } from '@/react/docker/images/common/ConfirmExportModal';
 import { confirmDelete } from '@@/modals/confirm';
+import { fullURIIntoRepoAndTag } from '@/react/docker/images/utils';
 
 angular.module('portainer.docker').controller('ImageController', [
   '$async',
@@ -70,7 +71,8 @@ angular.module('portainer.docker').controller('ImageController', [
     $scope.tagImage = function () {
       const registryModel = $scope.formValues.RegistryModel;
 
-      const { repo, tag } = ImageHelper.createImageConfigForContainer(registryModel);
+      const image = ImageHelper.createImageConfigForContainer(registryModel);
+      const { repo, tag } = fullURIIntoRepoAndTag(image.fromImage);
 
       ImageService.tagImage($transition$.params().id, repo, tag)
         .then(function success() {

app/docker/views/images/import/importImageController.js

@@ -1,4 +1,5 @@
 import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
+import { fullURIIntoRepoAndTag } from '@/react/docker/images/utils';
 
 angular.module('portainer.docker').controller('ImportImageController', [
   '$scope',
@@ -33,7 +34,8 @@ angular.module('portainer.docker').controller('ImportImageController', [
     async function tagImage(id) {
       const registryModel = $scope.formValues.RegistryModel;
       if (registryModel.Image) {
-        const { repo, tag } = ImageHelper.createImageConfigForContainer(registryModel);
+        const image = ImageHelper.createImageConfigForContainer(registryModel);
+        const { repo, tag } = fullURIIntoRepoAndTag(image.fromImage);
         try {
           await ImageService.tagImage(id, repo, tag);
         } catch (err) {

app/docker/views/services/edit/service.html

@@ -1,281 +1,274 @@
 <page-header title="'Service details'" breadcrumbs="[{label:'Services', link:'docker.services'}, service.Name]" reload="true"> </page-header>
 
-<div ng-if="!isLoading">
-  <div class="row">
-    <div ng-if="isUpdating" class="col-lg-12 col-md-12 col-xs-12">
-      <div class="alert alert-info" role="alert" id="service-update-alert">
-        <p>This service is being updated. Editing this service is currently disabled.</p>
-        <a ui-sref="docker.services.service({id: service.Id}, {reload: true})">Refresh to see if this service has finished updated.</a>
-      </div>
+<div class="row">
+  <div ng-if="isUpdating" class="col-lg-12 col-md-12 col-xs-12">
+    <div class="alert alert-info" role="alert" id="service-update-alert">
+      <p>This service is being updated. Editing this service is currently disabled.</p>
+      <a ui-sref="docker.services.service({id: service.Id}, {reload: true})">Refresh to see if this service has finished updated.</a>
     </div>
   </div>
-  <div class="row">
-    <div class="col-lg-9 col-md-9 col-xs-9">
-      <rd-widget>
-        <rd-widget-header icon="shuffle" title-text="Service details"></rd-widget-header>
-        <rd-widget-body classes="no-padding">
-          <table class="table">
-            <tbody>
-              <tr>
-                <td class="w-1/5">Name</td>
-                <td ng-if="applicationState.endpoint.apiVersion <= 1.24">
-                  <input
-                    type="text"
-                    class="form-control"
-                    ng-model="service.Name"
-                    ng-change="updateServiceAttribute(service, 'Name')"
-                    ng-disabled="isUpdating"
-                    data-cy="docker-service-edit-name"
-                  />
-                </td>
-                <td ng-if="applicationState.endpoint.apiVersion >= 1.25"> {{ service.Name }} </td>
-              </tr>
-              <tr>
-                <td>ID</td>
-                <td> {{ service.Id }} </td>
-              </tr>
-              <tr ng-if="service.CreatedAt">
-                <td>Created at</td>
-                <td>{{ service.CreatedAt | getisodate }}</td>
-              </tr>
-              <tr ng-if="service.UpdatedAt">
-                <td>Last updated at</td>
-                <td>{{ service.UpdatedAt | getisodate }}</td>
-              </tr>
-              <tr ng-if="service.Version">
-                <td>Version</td>
-                <td>{{ service.Version }}</td>
-              </tr>
-              <tr>
-                <td>Scheduling mode</td>
-                <td>{{ service.Mode }}</td>
-              </tr>
-              <tr ng-if="service.Mode === 'replicated'">
-                <td>Replicas</td>
-                <td>
-                  <span ng-if="service.Mode === 'replicated'">
-                    <input
-                      class="input-sm"
-                      type="number"
-                      data-cy="docker-service-edit-replicas-input"
-                      ng-model="service.Replicas"
-                      ng-change="updateServiceAttribute(service, 'Replicas')"
-                      disable-authorization="DockerServiceUpdate"
-                    />
-                  </span>
-                </td>
-              </tr>
-              <tr>
-                <td>Image</td>
-                <td>{{ service.Image }}</td>
-              </tr>
-              <tr ng-if="isAdmin && applicationState.endpoint.type !== 4">
-                <td>
-                  <div class="inline-flex items-center">
-                    <div> Service webhook </div>
-                    <portainer-tooltip
-                      message="'Webhook (or callback URI) used to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service.'"
-                    >
-                    </portainer-tooltip>
-                  </div>
-                </td>
-                <td>
-                  <div class="flex flex-wrap items-center">
-                    <por-switch-field
-                      label-class="'!mr-0'"
-                      checked="WebhookExists"
-                      disabled="disabledWebhookButton(WebhookExists)"
-                      on-change="(onWebhookChange)"
-                    ></por-switch-field>
-                    <span ng-if="webhookURL">
-                      <span class="text-muted">{{ webhookURL | truncatelr }}</span>
-                      <button type="button" class="btn btn-sm btn-primary btn-sm space-left" ng-if="webhookURL" ng-click="copyWebhook()">
-                        <pr-icon icon="'copy'" class-name="'mr-1'"></pr-icon>
-                        Copy link
-                      </button>
-                      <span>
-                        <pr-icon id="copyNotification" icon="'check'" mode="'success'" style="display: none"></pr-icon>
-                      </span>
-                    </span>
-                  </div>
-                </td>
-              </tr>
-              <tr authorization="DockerServiceLogs, DockerServiceUpdate, DockerServiceDelete">
-                <td colspan="2">
-                  <p class="small text-muted" authorization="DockerServiceUpdate">
-                    Note: you can only rollback one level of changes. Clicking the rollback button without making a new change will undo your previous rollback </p
-                  ><div class="flex flex-wrap gap-x-2 gap-y-1">
-                    <a
-                      authorization="DockerServiceLogs"
-                      ng-if="applicationState.endpoint.apiVersion >= 1.3"
-                      class="btn btn-primary btn-sm"
-                      type="button"
-                      ui-sref="docker.services.service.logs({id: service.Id})"
-                    >
-                      <pr-icon icon="'file-text'"></pr-icon>Service logs</a
-                    >
-                    <button
-                      authorization="DockerServiceUpdate"
-                      type="button"
-                      class="btn btn-primary btn-sm !ml-0"
-                      ng-disabled="state.updateInProgress || isUpdating"
-                      ng-click="forceUpdateService(service)"
-                      button-spinner="state.updateInProgress"
-                      ng-if="applicationState.endpoint.apiVersion >= 1.25"
-                    >
-                      <span ng-hide="state.updateInProgress" class="vertical-center">
-                        <pr-icon icon="'refresh-cw'"></pr-icon>
-                        Update the service</span
-                      >
-                      <span ng-show="state.updateInProgress">Update in progress...</span>
-                    </button>
-                    <button
-                      authorization="DockerServiceUpdate"
-                      type="button"
-                      class="btn btn-primary btn-sm !ml-0"
-                      ng-disabled="state.rollbackInProgress || isUpdating"
-                      ng-click="rollbackService(service)"
-                      button-spinner="state.rollbackInProgress"
-                      ng-if="applicationState.endpoint.apiVersion >= 1.25"
-                    >
-                      <span ng-hide="state.rollbackInProgress" class="vertical-center">
-                        <pr-icon icon="'rotate-ccw'"></pr-icon>
-                        Rollback the service</span
-                      >
-                      <span ng-show="state.rollbackInProgress">Rollback in progress...</span>
-                    </button>
-                    <button
-                      authorization="DockerServiceDelete"
-                      type="button"
-                      class="btn btn-danger btn-sm !ml-0"
-                      ng-disabled="state.deletionInProgress || isUpdating"
-                      ng-click="removeService()"
-                      button-spinner="state.deletionInProgress"
-                    >
-                      <span ng-hide="state.deletionInProgress" class="vertical-center">
-                        <pr-icon icon="'trash-2'"></pr-icon>
-                        Delete the service</span
-                      >
-                      <span ng-show="state.deletionInProgress">Deletion in progress...</span>
-                    </button>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </rd-widget-body>
-        <rd-widget-footer authorization="DockerServiceUpdate">
-          <p class="small text-muted">
-            Do you need help? View the Docker Service documentation <a href="https://docs.docker.com/engine/reference/commandline/service_update/" target="self">here</a>.
-          </p>
-          <div class="btn-toolbar" role="toolbar">
-            <div class="btn-group" role="group">
-              <button type="button" class="btn btn-primary" ng-disabled="!hasChanges(service, ['Mode', 'Replicas', 'Name', 'Webhooks'])" ng-click="updateService(service)"
-                >Apply changes</button
-              >
-              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <pr-icon icon="'chevron-down'"></pr-icon>
-              </button>
-              <ul class="dropdown-menu">
-                <li><a ng-click="cancelChanges(service, ['Mode', 'Replicas', 'Name'])">Reset changes</a></li>
-                <li><a ng-click="cancelChanges(service)">Reset all changes</a></li>
-              </ul>
-            </div>
-          </div>
-        </rd-widget-footer>
-      </rd-widget>
-    </div>
-
-    <div class="col-lg-3 col-md-3 col-xs-3">
-      <rd-widget>
-        <rd-widget-header icon="menu" title-text="Quick navigation"></rd-widget-header>
-        <rd-widget-body classes="no-padding">
-          <ul class="nav nav-pills nav-stacked">
-            <li><a href ng-click="goToItem('service-env-variables')">Environment variables</a></li>
-            <li><a href ng-click="goToItem('service-container-image')">Container image</a></li>
-            <li><a href ng-click="goToItem('service-container-labels')">Container labels</a></li>
-            <li><a href ng-click="goToItem('service-mounts')">Mounts</a></li>
-            <li><a href ng-click="goToItem('service-network-specs')">Network &amp; published ports</a></li>
-            <li><a href ng-click="goToItem('service-resources')">Resource limits &amp; reservations</a></li>
-            <li><a href ng-click="goToItem('service-placement-constraints')">Placement constraints</a></li>
-            <li ng-if="applicationState.endpoint.apiVersion >= 1.3"><a href ng-click="goToItem('service-placement-preferences')">Placement preferences</a></li>
-            <li><a href ng-click="goToItem('service-restart-policy')">Restart policy</a></li>
-            <li><a href ng-click="goToItem('service-update-config')">Update configuration</a></li>
-            <li><a href ng-click="goToItem('service-logging')">Logging</a></li>
-            <li><a href ng-click="goToItem('service-labels')">Service labels</a></li>
-            <li><a href ng-click="goToItem('service-configs')">Configs</a></li>
-            <li ng-if="applicationState.endpoint.apiVersion >= 1.25"><a href ng-click="goToItem('service-secrets')">Secrets</a></li>
-            <li><a href ng-click="goToItem('service-tasks')">Tasks</a></li>
-          </ul>
-        </rd-widget-body>
-      </rd-widget>
-    </div>
-  </div>
-
-  <!-- access-control-panel -->
-  <access-control-panel
-    ng-if="service"
-    resource-id="service.Id"
-    resource-control="service.ResourceControl"
-    resource-type="resourceType"
-    on-update-success="(onUpdateResourceControlSuccess)"
-    environment-id="endpoint.Id"
-  >
-  </access-control-panel>
-  <!-- !access-control-panel -->
-
-  <div class="row">
-    <hr />
-    <div class="col-lg-12 col-md-12 col-xs-12">
-      <h3 id="container-specs">Container specification</h3>
-      <div id="service-container-spec" class="padding-top" ng-include="'app/docker/views/services/edit/includes/container-specs.html'"></div>
-      <div id="service-container-image" class="padding-top" ng-include="'app/docker/views/services/edit/includes/image.html'"></div>
-      <div id="service-env-variables" class="padding-top" ng-include="'app/docker/views/services/edit/includes/environmentvariables.html'"></div>
-      <div id="service-container-labels" class="padding-top" ng-include="'app/docker/views/services/edit/includes/containerlabels.html'"></div>
-      <div id="service-mounts" class="padding-top" ng-include="'app/docker/views/services/edit/includes/mounts.html'"></div>
-    </div>
-  </div>
-
-  <div class="row">
-    <hr />
-    <div class="col-lg-12 col-md-12 col-xs-12">
-      <h3 id="service-network-specs">Networks &amp; ports</h3>
-      <div id="service-networks" class="padding-top" ng-include="'app/docker/views/services/edit/includes/networks.html'"></div>
-
-      <docker-service-ports-mapping-field
-        id="service-published-ports"
-        class="block padding-top"
-        values="formValues.ports"
-        on-change="(onChangePorts)"
-        has-changes="hasChanges(service, ['Ports'])"
-        on-reset="(onResetPorts)"
-        on-submit="(onSubmit)"
-      ></docker-service-ports-mapping-field>
-
-      <div id="service-hosts-entries" class="padding-top" ng-include="'app/docker/views/services/edit/includes/hosts.html'"></div>
-    </div>
-  </div>
-
-  <div class="row">
-    <hr />
-    <div class="col-lg-12 col-md-12 col-xs-12">
-      <h3 id="service-specs">Service specification</h3>
-      <div id="service-resources" class="padding-top" ng-include="'app/docker/views/services/edit/includes/resources.html'"></div>
-      <div id="service-placement-constraints" class="padding-top" ng-include="'app/docker/views/services/edit/includes/constraints.html'"></div>
-      <div
-        id="service-placement-preferences"
-        ng-if="applicationState.endpoint.apiVersion >= 1.3"
-        class="padding-top"
-        ng-include="'app/docker/views/services/edit/includes/placementPreferences.html'"
-      ></div>
-      <div id="service-restart-policy" class="padding-top" ng-include="'app/docker/views/services/edit/includes/restart.html'"></div>
-      <div id="service-update-config" class="padding-top" ng-include="'app/docker/views/services/edit/includes/updateconfig.html'"></div>
-      <div id="service-logging" class="padding-top" ng-include="'app/docker/views/services/edit/includes/logging.html'"></div>
-      <div id="service-labels" class="padding-top" ng-include="'app/docker/views/services/edit/includes/servicelabels.html'"></div>
-      <div id="service-configs" class="padding-top" ng-include="'app/docker/views/services/edit/includes/configs.html'"></div>
-      <div id="service-secrets" ng-if="applicationState.endpoint.apiVersion >= 1.25" class="padding-top" ng-include="'app/docker/views/services/edit/includes/secrets.html'"></div>
-    </div>
-  </div>
-
-  <div id="service-tasks" class="padding-top" ng-include="'app/docker/views/services/edit/includes/tasks.html'"></div>
 </div>
+<div class="row">
+  <div class="col-lg-9 col-md-9 col-xs-9">
+    <rd-widget>
+      <rd-widget-header icon="shuffle" title-text="Service details"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr>
+              <td class="w-1/5">Name</td>
+              <td ng-if="applicationState.endpoint.apiVersion <= 1.24">
+                <input
+                  type="text"
+                  class="form-control"
+                  ng-model="service.Name"
+                  ng-change="updateServiceAttribute(service, 'Name')"
+                  ng-disabled="isUpdating"
+                  data-cy="docker-service-edit-name"
+                />
+              </td>
+              <td ng-if="applicationState.endpoint.apiVersion >= 1.25"> {{ service.Name }} </td>
+            </tr>
+            <tr>
+              <td>ID</td>
+              <td> {{ service.Id }} </td>
+            </tr>
+            <tr ng-if="service.CreatedAt">
+              <td>Created at</td>
+              <td>{{ service.CreatedAt | getisodate }}</td>
+            </tr>
+            <tr ng-if="service.UpdatedAt">
+              <td>Last updated at</td>
+              <td>{{ service.UpdatedAt | getisodate }}</td>
+            </tr>
+            <tr ng-if="service.Version">
+              <td>Version</td>
+              <td>{{ service.Version }}</td>
+            </tr>
+            <tr>
+              <td>Scheduling mode</td>
+              <td>{{ service.Mode }}</td>
+            </tr>
+            <tr ng-if="service.Mode === 'replicated'">
+              <td>Replicas</td>
+              <td>
+                <span ng-if="service.Mode === 'replicated'">
+                  <input
+                    class="input-sm"
+                    type="number"
+                    data-cy="docker-service-edit-replicas-input"
+                    ng-model="service.Replicas"
+                    ng-change="updateServiceAttribute(service, 'Replicas')"
+                    disable-authorization="DockerServiceUpdate"
+                  />
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <td>Image</td>
+              <td>{{ service.Image }}</td>
+            </tr>
+            <tr ng-if="isAdmin && applicationState.endpoint.type !== 4">
+              <td>
+                <div class="inline-flex items-center">
+                  <div> Service webhook </div>
+                  <portainer-tooltip
+                    message="'Webhook (or callback URI) used to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service.'"
+                  >
+                  </portainer-tooltip>
+                </div>
+              </td>
+              <td>
+                <div class="flex flex-wrap items-center">
+                  <por-switch-field label-class="'!mr-0'" checked="WebhookExists" disabled="disabledWebhookButton(WebhookExists)" on-change="(onWebhookChange)"></por-switch-field>
+                  <span ng-if="webhookURL">
+                    <span class="text-muted">{{ webhookURL | truncatelr }}</span>
+                    <button type="button" class="btn btn-sm btn-primary btn-sm space-left" ng-if="webhookURL" ng-click="copyWebhook()">
+                      <pr-icon icon="'copy'" class-name="'mr-1'"></pr-icon>
+                      Copy link
+                    </button>
+                    <span>
+                      <pr-icon id="copyNotification" icon="'check'" mode="'success'" style="display: none"></pr-icon>
+                    </span>
+                  </span>
+                </div>
+              </td>
+            </tr>
+            <tr authorization="DockerServiceLogs, DockerServiceUpdate, DockerServiceDelete">
+              <td colspan="2">
+                <p class="small text-muted" authorization="DockerServiceUpdate">
+                  Note: you can only rollback one level of changes. Clicking the rollback button without making a new change will undo your previous rollback </p
+                ><div class="flex flex-wrap gap-x-2 gap-y-1">
+                  <a
+                    authorization="DockerServiceLogs"
+                    ng-if="applicationState.endpoint.apiVersion >= 1.3"
+                    class="btn btn-primary btn-sm"
+                    type="button"
+                    ui-sref="docker.services.service.logs({id: service.Id})"
+                  >
+                    <pr-icon icon="'file-text'"></pr-icon>Service logs</a
+                  >
+                  <button
+                    authorization="DockerServiceUpdate"
+                    type="button"
+                    class="btn btn-primary btn-sm !ml-0"
+                    ng-disabled="state.updateInProgress || isUpdating"
+                    ng-click="forceUpdateService(service)"
+                    button-spinner="state.updateInProgress"
+                    ng-if="applicationState.endpoint.apiVersion >= 1.25"
+                  >
+                    <span ng-hide="state.updateInProgress" class="vertical-center">
+                      <pr-icon icon="'refresh-cw'"></pr-icon>
+                      Update the service</span
+                    >
+                    <span ng-show="state.updateInProgress">Update in progress...</span>
+                  </button>
+                  <button
+                    authorization="DockerServiceUpdate"
+                    type="button"
+                    class="btn btn-primary btn-sm !ml-0"
+                    ng-disabled="state.rollbackInProgress || isUpdating"
+                    ng-click="rollbackService(service)"
+                    button-spinner="state.rollbackInProgress"
+                    ng-if="applicationState.endpoint.apiVersion >= 1.25"
+                  >
+                    <span ng-hide="state.rollbackInProgress" class="vertical-center">
+                      <pr-icon icon="'rotate-ccw'"></pr-icon>
+                      Rollback the service</span
+                    >
+                    <span ng-show="state.rollbackInProgress">Rollback in progress...</span>
+                  </button>
+                  <button
+                    authorization="DockerServiceDelete"
+                    type="button"
+                    class="btn btn-danger btn-sm !ml-0"
+                    ng-disabled="state.deletionInProgress || isUpdating"
+                    ng-click="removeService()"
+                    button-spinner="state.deletionInProgress"
+                  >
+                    <span ng-hide="state.deletionInProgress" class="vertical-center">
+                      <pr-icon icon="'trash-2'"></pr-icon>
+                      Delete the service</span
+                    >
+                    <span ng-show="state.deletionInProgress">Deletion in progress...</span>
+                  </button>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+      <rd-widget-footer authorization="DockerServiceUpdate">
+        <p class="small text-muted">
+          Do you need help? View the Docker Service documentation <a href="https://docs.docker.com/engine/reference/commandline/service_update/" target="self">here</a>.
+        </p>
+        <div class="btn-toolbar" role="toolbar">
+          <div class="btn-group" role="group">
+            <button type="button" class="btn btn-primary" ng-disabled="!hasChanges(service, ['Mode', 'Replicas', 'Name', 'Webhooks'])" ng-click="updateService(service)"
+              >Apply changes</button
+            >
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <pr-icon icon="'chevron-down'"></pr-icon>
+            </button>
+            <ul class="dropdown-menu">
+              <li><a ng-click="cancelChanges(service, ['Mode', 'Replicas', 'Name'])">Reset changes</a></li>
+              <li><a ng-click="cancelChanges(service)">Reset all changes</a></li>
+            </ul>
+          </div>
+        </div>
+      </rd-widget-footer>
+    </rd-widget>
+  </div>
+
+  <div class="col-lg-3 col-md-3 col-xs-3">
+    <rd-widget>
+      <rd-widget-header icon="menu" title-text="Quick navigation"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <ul class="nav nav-pills nav-stacked">
+          <li><a href ng-click="goToItem('service-env-variables')">Environment variables</a></li>
+          <li><a href ng-click="goToItem('service-container-image')">Container image</a></li>
+          <li><a href ng-click="goToItem('service-container-labels')">Container labels</a></li>
+          <li><a href ng-click="goToItem('service-mounts')">Mounts</a></li>
+          <li><a href ng-click="goToItem('service-network-specs')">Network &amp; published ports</a></li>
+          <li><a href ng-click="goToItem('service-resources')">Resource limits &amp; reservations</a></li>
+          <li><a href ng-click="goToItem('service-placement-constraints')">Placement constraints</a></li>
+          <li ng-if="applicationState.endpoint.apiVersion >= 1.3"><a href ng-click="goToItem('service-placement-preferences')">Placement preferences</a></li>
+          <li><a href ng-click="goToItem('service-restart-policy')">Restart policy</a></li>
+          <li><a href ng-click="goToItem('service-update-config')">Update configuration</a></li>
+          <li><a href ng-click="goToItem('service-logging')">Logging</a></li>
+          <li><a href ng-click="goToItem('service-labels')">Service labels</a></li>
+          <li><a href ng-click="goToItem('service-configs')">Configs</a></li>
+          <li ng-if="applicationState.endpoint.apiVersion >= 1.25"><a href ng-click="goToItem('service-secrets')">Secrets</a></li>
+          <li><a href ng-click="goToItem('service-tasks')">Tasks</a></li>
+        </ul>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<!-- access-control-panel -->
+<access-control-panel
+  ng-if="service"
+  resource-id="service.Id"
+  resource-control="service.ResourceControl"
+  resource-type="resourceType"
+  on-update-success="(onUpdateResourceControlSuccess)"
+  environment-id="endpoint.Id"
+>
+</access-control-panel>
+<!-- !access-control-panel -->
+
+<div class="row">
+  <hr />
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <h3 id="container-specs">Container specification</h3>
+    <div id="service-container-spec" class="padding-top" ng-include="'app/docker/views/services/edit/includes/container-specs.html'"></div>
+    <div id="service-container-image" class="padding-top" ng-include="'app/docker/views/services/edit/includes/image.html'"></div>
+    <div id="service-env-variables" class="padding-top" ng-include="'app/docker/views/services/edit/includes/environmentvariables.html'"></div>
+    <div id="service-container-labels" class="padding-top" ng-include="'app/docker/views/services/edit/includes/containerlabels.html'"></div>
+    <div id="service-mounts" class="padding-top" ng-include="'app/docker/views/services/edit/includes/mounts.html'"></div>
+  </div>
+</div>
+
+<div class="row">
+  <hr />
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <h3 id="service-network-specs">Networks &amp; ports</h3>
+    <div id="service-networks" class="padding-top" ng-include="'app/docker/views/services/edit/includes/networks.html'"></div>
+
+    <docker-service-ports-mapping-field
+      id="service-published-ports"
+      class="block padding-top"
+      values="formValues.ports"
+      on-change="(onChangePorts)"
+      has-changes="hasChanges(service, ['Ports'])"
+      on-reset="(onResetPorts)"
+      on-submit="(onSubmit)"
+    ></docker-service-ports-mapping-field>
+
+    <div id="service-hosts-entries" class="padding-top" ng-include="'app/docker/views/services/edit/includes/hosts.html'"></div>
+  </div>
+</div>
+
+<div class="row">
+  <hr />
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <h3 id="service-specs">Service specification</h3>
+    <div id="service-resources" class="padding-top" ng-include="'app/docker/views/services/edit/includes/resources.html'"></div>
+    <div id="service-placement-constraints" class="padding-top" ng-include="'app/docker/views/services/edit/includes/constraints.html'"></div>
+    <div
+      id="service-placement-preferences"
+      ng-if="applicationState.endpoint.apiVersion >= 1.3"
+      class="padding-top"
+      ng-include="'app/docker/views/services/edit/includes/placementPreferences.html'"
+    ></div>
+    <div id="service-restart-policy" class="padding-top" ng-include="'app/docker/views/services/edit/includes/restart.html'"></div>
+    <div id="service-update-config" class="padding-top" ng-include="'app/docker/views/services/edit/includes/updateconfig.html'"></div>
+    <div id="service-logging" class="padding-top" ng-include="'app/docker/views/services/edit/includes/logging.html'"></div>
+    <div id="service-labels" class="padding-top" ng-include="'app/docker/views/services/edit/includes/servicelabels.html'"></div>
+    <div id="service-configs" class="padding-top" ng-include="'app/docker/views/services/edit/includes/configs.html'"></div>
+    <div id="service-secrets" ng-if="applicationState.endpoint.apiVersion >= 1.25" class="padding-top" ng-include="'app/docker/views/services/edit/includes/secrets.html'"></div>
+  </div>
+</div>
+
+<div id="service-tasks" class="padding-top" ng-include="'app/docker/views/services/edit/includes/tasks.html'"></div>

app/docker/views/services/edit/serviceController.js

@@ -731,7 +731,6 @@ angular.module('portainer.docker').controller('ServiceController', [
     };
 
     function initView() {
-      $scope.isLoading = true;
       var apiVersion = $scope.applicationState.endpoint.apiVersion;
       var agentProxy = $scope.applicationState.endpoint.mode.agentProxy;
 
@@ -856,9 +855,6 @@ angular.module('portainer.docker').controller('ServiceController', [
           $scope.secrets = [];
           $scope.configs = [];
           Notifications.error('Failure', err, 'Unable to retrieve service details');
-        })
-        .finally(() => {
-          $scope.isLoading = false;
         });
     }
 

app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html

@@ -31,34 +31,10 @@
       >Select the Helm chart to use. Bring further Helm charts into your selection list via
       <a ui-sref="portainer.account({'#': 'helm-repositories'})">User settings - Helm repositories</a>.</div
     >
-    <div class="relative flex w-fit gap-1 rounded-lg bg-gray-modern-3 p-4 text-sm th-highcontrast:bg-legacy-grey-3 th-dark:bg-legacy-grey-3 mt-2">
-      <div class="mt-0.5 shrink-0">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          width="24"
-          height="24"
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke="currentColor"
-          stroke-width="2"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          class="lucide lucide-lightbulb h-4 text-warning-7 th-highcontrast:text-warning-6 th-dark:text-warning-6"
-        >
-          <path d="M15 14c.2-1 .7-1.7 1.5-2.5 1-.9 1.5-2.2 1.5-3.5A6 6 0 0 0 6 8c0 1 .2 2.2 1.5 3.5.7.7 1.3 1.5 1.5 2.5"></path>
-          <path d="M9 18h6"></path>
-          <path d="M10 22h4"></path>
-        </svg>
-      </div>
-      <div>
-        <p class="align-middle text-[0.9em] font-medium pr-10 mb-2">Disclaimer</p>
-        <div class="small">
-          At present Portainer does not support OCI format Helm charts. Support for OCI charts will be available in a future release.<br />
-          If you would like to provide feedback on OCI support or get access to early releases to test this functionality,
-          <a href="https://bit.ly/3WVkayl" target="_blank" rel="noopener noreferrer">please get in touch</a>.
-        </div>
-      </div>
-    </div>
+    <beta-alert
+      is-html="true"
+      message="'Beta feature - so far, this functionality has been tested in limited scenarios. For more information, see this <a href=\'https://www.portainer.io/blog/portainer-now-with-helm-support\' target=\'_blank\' class=\'hyperlink\'>blog post on Portainer Helm support</a>.'"
+    ></beta-alert>
   </div>
 
   <div class="blocklist !px-0" role="list">
@@ -69,7 +45,7 @@
       on-select="($ctrl.selectAction)"
     >
     </helm-templates-list-item>
-    <div ng-if="!$ctrl.loading && !allCharts.length && $ctrl.charts.length !== 0" class="text-muted small mt-4"> No Helm charts found </div>
+    <div ng-if="!allCharts.length" class="text-muted small mt-4"> No Helm charts found </div>
     <div ng-if="$ctrl.loading" class="text-muted text-center">
       Loading...
       <div class="text-muted text-center"> Initial download of Helm charts can take a few minutes </div>

app/kubernetes/converters/configuration.js

@@ -5,7 +5,6 @@ class KubernetesConfigurationConverter {
   static secretToConfiguration(secret) {
     const res = new KubernetesConfiguration();
     res.Kind = KubernetesConfigurationKinds.SECRET;
-    res.kind = 'Secret';
     res.Id = secret.Id;
     res.Name = secret.Name;
     res.Type = secret.Type;
@@ -20,15 +19,8 @@ class KubernetesConfigurationConverter {
     res.IsRegistrySecret = secret.IsRegistrySecret;
     res.SecretType = secret.SecretType;
     if (secret.Annotations) {
-      const serviceAccountKey = 'kubernetes.io/service-account.name';
-      if (typeof secret.Annotations === 'object') {
-        res.ServiceAccountName = secret.Annotations[serviceAccountKey];
-      } else if (Array.isArray(secret.Annotations)) {
-        const serviceAccountAnnotation = secret.Annotations.find((a) => a.key === 'kubernetes.io/service-account.name');
-        res.ServiceAccountName = serviceAccountAnnotation ? serviceAccountAnnotation.value : undefined;
-      } else {
-        res.ServiceAccountName = undefined;
-      }
+      const serviceAccountAnnotation = secret.Annotations.find((a) => a.key === 'kubernetes.io/service-account.name');
+      res.ServiceAccountName = serviceAccountAnnotation ? serviceAccountAnnotation.value : undefined;
     }
     res.Labels = secret.Labels;
     return res;
@@ -37,7 +29,6 @@ class KubernetesConfigurationConverter {
   static configMapToConfiguration(configMap) {
     const res = new KubernetesConfiguration();
     res.Kind = KubernetesConfigurationKinds.CONFIGMAP;
-    res.kind = 'ConfigMap';
     res.Id = configMap.Id;
     res.Name = configMap.Name;
     res.Namespace = configMap.Namespace;

app/kubernetes/models/configuration/formvalues.js

@@ -9,7 +9,6 @@ const _KubernetesConfigurationFormValues = Object.freeze({
   Name: '',
   ConfigurationOwner: '',
   Kind: KubernetesConfigurationKinds.CONFIGMAP,
-  kind: 'ConfigMap',
   Data: [],
   DataYaml: '',
   IsSimple: true,

app/kubernetes/react/views/index.ts

@@ -22,8 +22,6 @@ import { VolumesView } from '@/react/kubernetes/volumes/ListView/VolumesView';
 import { NamespaceView } from '@/react/kubernetes/namespaces/ItemView/NamespaceView';
 import { AccessView } from '@/react/kubernetes/namespaces/AccessView/AccessView';
 import { JobsView } from '@/react/kubernetes/more-resources/JobsView/JobsView';
-import { ClusterView } from '@/react/kubernetes/cluster/ClusterView';
-import { HelmApplicationView } from '@/react/kubernetes/helm/HelmApplicationView';
 
 export const viewsModule = angular
   .module('portainer.kubernetes.react.views', [])
@@ -80,14 +78,6 @@ export const viewsModule = angular
       []
     )
   )
-  .component(
-    'kubernetesHelmApplicationView',
-    r2a(withUIRouter(withReactQuery(withCurrentUser(HelmApplicationView))), [])
-  )
-  .component(
-    'kubernetesClusterView',
-    r2a(withUIRouter(withReactQuery(withCurrentUser(ClusterView))), [])
-  )
   .component(
     'kubernetesConfigureView',
     r2a(withUIRouter(withReactQuery(withCurrentUser(ConfigureView))), [])

app/kubernetes/views/applications/helm/helm.controller.js

@@ -0,0 +1,52 @@
+import PortainerError from 'Portainer/error';
+
+export default class KubernetesHelmApplicationController {
+  /* @ngInject */
+  constructor($async, $state, Authentication, Notifications, HelmService) {
+    this.$async = $async;
+    this.$state = $state;
+    this.Authentication = Authentication;
+    this.Notifications = Notifications;
+    this.HelmService = HelmService;
+  }
+
+  /**
+   * APPLICATION
+   */
+  async getHelmApplication() {
+    try {
+      this.state.dataLoading = true;
+      const releases = await this.HelmService.listReleases(this.endpoint.Id, { filter: `^${this.state.params.name}$`, namespace: this.state.params.namespace });
+      if (releases.length > 0) {
+        this.state.release = releases[0];
+      } else {
+        throw new PortainerError(`Release ${this.state.params.name} not found`);
+      }
+    } catch (err) {
+      this.Notifications.error('Failure', err, 'Unable to retrieve helm application details');
+    } finally {
+      this.state.dataLoading = false;
+    }
+  }
+
+  $onInit() {
+    return this.$async(async () => {
+      this.state = {
+        dataLoading: true,
+        viewReady: false,
+        params: {
+          name: this.$state.params.name,
+          namespace: this.$state.params.namespace,
+        },
+        release: {
+          name: undefined,
+          chart: undefined,
+          app_version: undefined,
+        },
+      };
+
+      await this.getHelmApplication();
+      this.state.viewReady = true;
+    });
+  }
+}

app/kubernetes/views/applications/helm/helm.css

@@ -0,0 +1,5 @@
+.release-table tr {
+  display: grid;
+  grid-auto-flow: column;
+  grid-template-columns: 1fr 4fr;
+}

app/kubernetes/views/applications/helm/helm.html

@@ -0,0 +1,50 @@
+<page-header
+  ng-if="$ctrl.state.viewReady"
+  title="'Helm details'"
+  breadcrumbs="[{label:'Applications', link:'kubernetes.applications'}, $ctrl.state.params.name]"
+  reload="true"
+></page-header>
+
+<kubernetes-view-loading view-ready="$ctrl.state.viewReady"></kubernetes-view-loading>
+
+<div ng-if="$ctrl.state.viewReady">
+  <div class="row">
+    <div class="col-sm-12">
+      <rd-widget>
+        <div class="toolBar vertical-center w-full flex-wrap !gap-x-5 !gap-y-1 p-5">
+          <div class="toolBarTitle vertical-center">
+            <div class="widget-icon space-right">
+              <pr-icon icon="'svg-helm'"></pr-icon>
+            </div>
+
+            Release
+          </div>
+        </div>
+        <rd-widget-body>
+          <table class="table">
+            <tbody class="release-table">
+              <tr>
+                <td class="vertical-center">Name</td>
+                <td class="vertical-center !p-2" data-cy="k8sAppDetail-appName">
+                  {{ $ctrl.state.release.name }}
+                </td>
+              </tr>
+              <tr>
+                <td class="vertical-center">Chart</td>
+                <td class="vertical-center !p-2">
+                  {{ $ctrl.state.release.chart }}
+                </td>
+              </tr>
+              <tr>
+                <td class="vertical-center">App version</td>
+                <td class="vertical-center !p-2">
+                  {{ $ctrl.state.release.app_version }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </rd-widget-body>
+      </rd-widget>
+    </div>
+  </div>
+</div>

app/kubernetes/views/applications/helm/index.js

@@ -0,0 +1,11 @@
+import angular from 'angular';
+import controller from './helm.controller';
+import './helm.css';
+
+angular.module('portainer.kubernetes').component('kubernetesHelmApplicationView', {
+  templateUrl: './helm.html',
+  controller,
+  bindings: {
+    endpoint: '<',
+  },
+});

app/kubernetes/views/cluster/cluster.html

@@ -0,0 +1,56 @@
+<page-header ng-if="ctrl.state.viewReady" title="'Cluster'" breadcrumbs="['Cluster information']" reload="true"></page-header>
+
+<kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
+
+<div ng-if="ctrl.state.viewReady">
+  <div class="row" ng-if="ctrl.isAdmin">
+    <div class="col-sm-12">
+      <rd-widget>
+        <rd-widget-body>
+          <!-- resource-reservation -->
+          <form class="form-horizontal" ng-if="ctrl.resourceReservation">
+            <kubernetes-resource-reservation
+              description="Resource reservation represents the total amount of resource assigned to all the applications inside the cluster."
+              cpu-reservation="ctrl.resourceReservation.CPU"
+              cpu-limit="ctrl.CPULimit"
+              memory-reservation="ctrl.resourceReservation.Memory"
+              memory-limit="ctrl.MemoryLimit"
+              display-usage="ctrl.hasResourceUsageAccess()"
+              cpu-usage="ctrl.resourceUsage.CPU"
+              memory-usage="ctrl.resourceUsage.Memory"
+            >
+            </kubernetes-resource-reservation>
+          </form>
+          <!-- !resource-reservation -->
+
+          <!-- leader-status -->
+          <div ng-if="ctrl.systemEndpoints.length > 0">
+            <div class="col-sm-12 form-section-title"> Leader status </div>
+
+            <table class="table">
+              <tbody>
+                <tr class="text-muted">
+                  <td style="border-top: none; width: 25%">Component</td>
+                  <td style="border-top: none; width: 25%">Leader node</td>
+                </tr>
+                <tr ng-repeat="ep in ctrl.systemEndpoints">
+                  <td style="width: 25%">
+                    {{ ep.Name }}
+                  </td>
+                  <td style="width: 25%">
+                    {{ ep.HolderIdentity }}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <!-- !leader-status -->
+        </rd-widget-body>
+      </rd-widget>
+    </div>
+  </div>
+
+  <div class="row">
+    <kube-nodes-datatable></kube-nodes-datatable>
+  </div>
+</div>

app/kubernetes/views/cluster/cluster.js

@@ -0,0 +1,8 @@
+angular.module('portainer.kubernetes').component('kubernetesClusterView', {
+  templateUrl: './cluster.html',
+  controller: 'KubernetesClusterController',
+  controllerAs: 'ctrl',
+  bindings: {
+    endpoint: '<',
+  },
+});

app/kubernetes/views/cluster/clusterController.js

@@ -0,0 +1,139 @@
+import angular from 'angular';
+import _ from 'lodash-es';
+import filesizeParser from 'filesize-parser';
+import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
+import { KubernetesResourceReservation } from 'Kubernetes/models/resource-reservation/models';
+import { getMetricsForAllNodes, getTotalResourcesForAllApplications } from '@/react/kubernetes/metrics/metrics.ts';
+
+class KubernetesClusterController {
+  /* @ngInject */
+  constructor($async, $state, Notifications, LocalStorage, Authentication, KubernetesNodeService, KubernetesApplicationService, KubernetesEndpointService, EndpointService) {
+    this.$async = $async;
+    this.$state = $state;
+    this.Authentication = Authentication;
+    this.Notifications = Notifications;
+    this.LocalStorage = LocalStorage;
+    this.KubernetesNodeService = KubernetesNodeService;
+    this.KubernetesApplicationService = KubernetesApplicationService;
+    this.KubernetesEndpointService = KubernetesEndpointService;
+    this.EndpointService = EndpointService;
+
+    this.onInit = this.onInit.bind(this);
+    this.getNodes = this.getNodes.bind(this);
+    this.getNodesAsync = this.getNodesAsync.bind(this);
+    this.getApplicationsAsync = this.getApplicationsAsync.bind(this);
+    this.getEndpointsAsync = this.getEndpointsAsync.bind(this);
+    this.hasResourceUsageAccess = this.hasResourceUsageAccess.bind(this);
+  }
+
+  async getEndpointsAsync() {
+    try {
+      const endpoints = await this.KubernetesEndpointService.get();
+      const systemEndpoints = _.filter(endpoints, { Namespace: 'kube-system' });
+      this.systemEndpoints = _.filter(systemEndpoints, (ep) => ep.HolderIdentity);
+
+      const kubernetesEndpoint = _.find(endpoints, { Name: 'kubernetes' });
+      if (kubernetesEndpoint && kubernetesEndpoint.Subsets) {
+        const ips = _.flatten(_.map(kubernetesEndpoint.Subsets, 'Ips'));
+        _.forEach(this.nodes, (node) => {
+          node.Api = _.includes(ips, node.IPAddress);
+        });
+      }
+    } catch (err) {
+      this.Notifications.error('Failure', err, 'Unable to retrieve environments');
+    }
+  }
+
+  getEndpoints() {
+    return this.$async(this.getEndpointsAsync);
+  }
+
+  async getNodesAsync() {
+    try {
+      const nodes = await this.KubernetesNodeService.get();
+      _.forEach(nodes, (node) => (node.Memory = filesizeParser(node.Memory)));
+      this.nodes = nodes;
+      this.CPULimit = _.reduce(this.nodes, (acc, node) => node.CPU + acc, 0);
+      this.CPULimit = Math.round(this.CPULimit * 10000) / 10000;
+      this.MemoryLimit = _.reduce(this.nodes, (acc, node) => KubernetesResourceReservationHelper.megaBytesValue(node.Memory) + acc, 0);
+    } catch (err) {
+      this.Notifications.error('Failure', err, 'Unable to retrieve nodes');
+    }
+  }
+
+  getNodes() {
+    return this.$async(this.getNodesAsync);
+  }
+
+  async getApplicationsAsync() {
+    try {
+      this.state.applicationsLoading = true;
+
+      const applicationsResources = await getTotalResourcesForAllApplications(this.endpoint.Id);
+      this.resourceReservation = new KubernetesResourceReservation();
+      this.resourceReservation.CPU = Math.round(applicationsResources.CpuRequest / 1000);
+      this.resourceReservation.Memory = KubernetesResourceReservationHelper.megaBytesValue(applicationsResources.MemoryRequest);
+
+      if (this.hasResourceUsageAccess()) {
+        await this.getResourceUsage(this.endpoint.Id);
+      }
+    } catch (err) {
+      this.Notifications.error('Failure', err, 'Unable to retrieve applications');
+    } finally {
+      this.state.applicationsLoading = false;
+    }
+  }
+
+  getApplications() {
+    return this.$async(this.getApplicationsAsync);
+  }
+
+  async getResourceUsage(endpointId) {
+    try {
+      const nodeMetrics = await getMetricsForAllNodes(endpointId);
+      const resourceUsageList = nodeMetrics.items.map((i) => i.usage);
+      const clusterResourceUsage = resourceUsageList.reduce((total, u) => {
+        total.CPU += KubernetesResourceReservationHelper.parseCPU(u.cpu);
+        total.Memory += KubernetesResourceReservationHelper.megaBytesValue(u.memory);
+        return total;
+      }, new KubernetesResourceReservation());
+      this.resourceUsage = clusterResourceUsage;
+    } catch (err) {
+      this.Notifications.error('Failure', err, 'Unable to retrieve cluster resource usage');
+    }
+  }
+
+  /**
+   * Check if resource usage stats can be displayed
+   * @returns {boolean}
+   */
+  hasResourceUsageAccess() {
+    return this.isAdmin && this.state.useServerMetrics;
+  }
+
+  async onInit() {
+    this.endpoint = await this.EndpointService.endpoint(this.endpoint.Id);
+    this.isAdmin = this.Authentication.isAdmin();
+    const useServerMetrics = this.endpoint.Kubernetes.Configuration.UseServerMetrics;
+
+    this.state = {
+      applicationsLoading: true,
+      viewReady: false,
+      useServerMetrics,
+    };
+
+    await this.getNodes();
+    if (this.isAdmin) {
+      await Promise.allSettled([this.getEndpoints(), this.getApplicationsAsync()]);
+    }
+
+    this.state.viewReady = true;
+  }
+
+  $onInit() {
+    return this.$async(this.onInit);
+  }
+}
+
+export default KubernetesClusterController;
+angular.module('portainer.kubernetes').controller('KubernetesClusterController', KubernetesClusterController);

app/kubernetes/views/deploy/deploy.html

@@ -1,4 +1,4 @@
-<page-header ng-if="ctrl.state.viewReady" title="'Create from code'" breadcrumbs="['Deploy Kubernetes resources']" reload="true"></page-header>
+<page-header ng-if="ctrl.state.viewReady" title="'Create from file'" breadcrumbs="['Deploy Kubernetes resources']" reload="true"></page-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 

app/ng-constants.ts

@@ -7,6 +7,7 @@ import {
   API_ENDPOINT_EDGE_GROUPS,
   API_ENDPOINT_EDGE_JOBS,
   API_ENDPOINT_EDGE_STACKS,
+  API_ENDPOINT_EDGE_TEMPLATES,
   API_ENDPOINT_ENDPOINTS,
   API_ENDPOINT_ENDPOINT_GROUPS,
   API_ENDPOINT_KUBERNETES,
@@ -41,6 +42,7 @@ export const constantsModule = angular
   .constant('API_ENDPOINT_EDGE_GROUPS', API_ENDPOINT_EDGE_GROUPS)
   .constant('API_ENDPOINT_EDGE_JOBS', API_ENDPOINT_EDGE_JOBS)
   .constant('API_ENDPOINT_EDGE_STACKS', API_ENDPOINT_EDGE_STACKS)
+  .constant('API_ENDPOINT_EDGE_TEMPLATES', API_ENDPOINT_EDGE_TEMPLATES)
   .constant('API_ENDPOINT_ENDPOINTS', API_ENDPOINT_ENDPOINTS)
   .constant('API_ENDPOINT_ENDPOINT_GROUPS', API_ENDPOINT_ENDPOINT_GROUPS)
   .constant('API_ENDPOINT_KUBERNETES', API_ENDPOINT_KUBERNETES)

app/portainer/helpers/strings.ts

@@ -1,7 +1,7 @@
-// Re-exporting so we don't have to update one meeeeellion files that are already importing these
-// functions from here.
-export {
-  pluralize,
-  addPlural,
-  grammaticallyJoin,
-} from '@/react/common/string-utils';
+export function pluralize(val: number, word: string, plural = `${word}s`) {
+  return [1, -1].includes(Number(val)) ? word : plural;
+}
+
+export function addPlural(value: number, word: string, plural = `${word}s`) {
+  return `${value} ${pluralize(value, word, plural)}`;
+}

app/react-tools/react-query.ts

@@ -10,13 +10,8 @@ import {
 import { notifyError } from '@/portainer/services/notifications';
 
 /**
- * @deprecated for `useQuery` ONLY. Use `withGlobalError`.
- *
- * `onError` and other callbacks are not supported on `useQuery` in react-query v5
- *
- * Using `withError` is fine for mutations (`useMutation`)
- *
- * see https://tkdodo.eu/blog/breaking-react-querys-api-on-purpose
+ * @deprecated use withGlobalError
+ * `onError` and other callbacks are not supported on react-query v5
  */
 export function withError(fallbackMessage?: string, title = 'Failure') {
   return {

app/react-tools/test-mocks.ts

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import { QueryObserverResult } from '@tanstack/react-query';
 
 import { Team } from '@/react/portainer/users/teams/types';
 import { Role, User, UserId } from '@/portainer/users/types';
@@ -135,38 +134,3 @@ export function createMockEnvironment(): Environment {
     },
   };
 }
-
-export function createMockQueryResult<TData, TError = unknown>(
-  data: TData,
-  overrides?: Partial<QueryObserverResult<TData, TError>>
-) {
-  const defaultResult = {
-    data,
-    dataUpdatedAt: 0,
-    error: null,
-    errorUpdatedAt: 0,
-    failureCount: 0,
-    errorUpdateCount: 0,
-    failureReason: null,
-    isError: false,
-    isFetched: true,
-    isFetchedAfterMount: true,
-    isFetching: false,
-    isInitialLoading: false,
-    isLoading: false,
-    isLoadingError: false,
-    isPaused: false,
-    isPlaceholderData: false,
-    isPreviousData: false,
-    isRefetchError: false,
-    isRefetching: false,
-    isStale: false,
-    isSuccess: true,
-    refetch: async () => defaultResult,
-    remove: () => {},
-    status: 'success',
-    fetchStatus: 'idle',
-  };
-
-  return { ...defaultResult, ...overrides };
-}

app/react-tools/useDebugPropChanges.ts

@@ -1,52 +0,0 @@
-/* eslint-disable no-console */
-import { intersection } from 'lodash';
-import { useEffect, useRef } from 'react';
-
-function logPropDifferences(
-  newProps: Record<string, unknown>,
-  lastProps: Record<string, unknown>,
-  verbose: boolean
-) {
-  const allKeys = intersection(Object.keys(newProps), Object.keys(lastProps));
-
-  const changedKeys: string[] = [];
-
-  allKeys.forEach((key) => {
-    const newValue = newProps[key];
-    const lastValue = lastProps[key];
-    if (newValue !== lastValue) {
-      changedKeys.push(key);
-    }
-  });
-
-  if (changedKeys.length) {
-    if (verbose) {
-      changedKeys.forEach((key) => {
-        const newValue = newProps[key];
-        const lastValue = lastProps[key];
-        console.log('Key [', key, '] changed');
-        console.log('From: ', lastValue);
-        console.log('To:   ', newValue);
-        console.log('------');
-      });
-    } else {
-      console.log('Changed keys: ', changedKeys.join());
-    }
-  }
-}
-
-export function useDebugPropChanges(
-  newProps: Record<string, unknown>,
-  verbose: boolean = true
-) {
-  const lastProps = useRef<Record<string, unknown>>();
-  // Should only run when the component re-mounts
-  useEffect(() => {
-    console.log('Mounted');
-  }, []);
-  if (lastProps.current) {
-    logPropDifferences(newProps, lastProps.current, verbose);
-  }
-  lastProps.current = newProps;
-}
-/* eslint-enable no-console */

app/react/common/string-utils.ts

@@ -1,27 +0,0 @@
-export function capitalize(s: string) {
-  return s.slice(0, 1).toUpperCase() + s.slice(1);
-}
-
-export function pluralize(val: number, word: string, plural = `${word}s`) {
-  return [1, -1].includes(Number(val)) ? word : plural;
-}
-
-export function addPlural(value: number, word: string, plural = `${word}s`) {
-  return `${value} ${pluralize(value, word, plural)}`;
-}
-
-/**
- * Joins an array of strings into a grammatically correct sentence.
- */
-export function grammaticallyJoin(
-  values: string[],
-  separator = ', ',
-  lastSeparator = ' and '
-) {
-  if (values.length === 0) return '';
-  if (values.length === 1) return values[0];
-
-  const allButLast = values.slice(0, -1);
-  const last = values[values.length - 1];
-  return `${allButLast.join(separator)}${lastSeparator}${last}`;
-}

app/react/components/CodeEditor.tsx

@@ -3,7 +3,7 @@ import { StreamLanguage, LanguageSupport } from '@codemirror/language';
 import { yaml } from '@codemirror/legacy-modes/mode/yaml';
 import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile';
 import { shell } from '@codemirror/legacy-modes/mode/shell';
-import { useCallback, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { createTheme } from '@uiw/codemirror-themes';
 import { tags as highlightTags } from '@lezer/highlight';
 
@@ -11,8 +11,6 @@ import { AutomationTestingProps } from '@/types';
 
 import { CopyButton } from '@@/buttons/CopyButton';
 
-import { useDebounce } from '../hooks/useDebounce';
-
 import styles from './CodeEditor.module.css';
 import { TextTip } from './Tip/TextTip';
 import { StackVersionSelector } from './StackVersionSelector';
@@ -91,17 +89,17 @@ export function CodeEditor({
     return extensions;
   }, [type]);
 
-  const handleVersionChange = useCallback(
-    (version: number) => {
-      if (versions && versions.length > 1) {
-        setIsRollback(version < versions[0]);
+  function handleVersionChange(version: number) {
+    if (versions && versions.length > 1) {
+      if (version < versions[0]) {
+        setIsRollback(true);
+      } else {
+        setIsRollback(false);
       }
-      onVersionChange?.(version);
-    },
-    [onVersionChange, versions]
-  );
+    }
 
-  const [debouncedValue, debouncedOnChange] = useDebounce(value, onChange);
+    onVersionChange?.(version);
+  }
 
   return (
     <>
@@ -138,8 +136,8 @@ export function CodeEditor({
       <CodeMirror
         className={styles.root}
         theme={theme}
-        value={debouncedValue}
-        onChange={debouncedOnChange}
+        value={value}
+        onChange={onChange}
         readOnly={readonly || isRollback}
         id={id}
         extensions={extensions}

app/react/components/PageHeader/ContextHelp.tsx

@@ -40,10 +40,17 @@ export function useDocsUrl(doc?: string): string {
   }
 
   let url = 'https://docs.portainer.io/';
+  if (versionQuery.data) {
+    let { ServerVersion } = versionQuery.data;
+    if (ServerVersion[0] === 'v') {
+      ServerVersion = ServerVersion.substring(1);
+    }
 
-  // Add LTS or STS version if we have it
-  if (versionQuery.data?.VersionSupport) {
-    url += versionQuery.data.VersionSupport.toLowerCase();
+    const parts = ServerVersion.split('.');
+    if (parts.length >= 2) {
+      const version = parts.slice(0, 2).join('.');
+      url += `v/${version}`;
+    }
   }
 
   if (doc) {

app/react/components/TagSelector/TagSelector.tsx

@@ -104,7 +104,6 @@ export function TagSelector({
           onCreateOption={handleCreateOption}
           aria-label="Tags"
           data-cy="environment-tags-selector"
-          id="environment-tags-selector"
         />
       </FormControl>
     </>

app/react/components/UsersSelector/UsersSelector.tsx

@@ -36,7 +36,6 @@ export function UsersSelector({
         onChange(selectedUsers.map((user) => user.Id))
       }
       data-cy={dataCy}
-      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
       isDisabled={disabled}

app/react/components/datatables/Datatable.test.tsx

@@ -1,5 +1,4 @@
 import { render, screen, fireEvent } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 import { describe, it, expect } from 'vitest';
 import {
   createColumnHelper,
@@ -156,81 +155,6 @@ describe('Datatable', () => {
 
     expect(screen.getByText('No data available')).toBeInTheDocument();
   });
-
-  it('selects/deselects only page rows when select all is clicked', () => {
-    render(
-      <Datatable
-        dataset={mockData}
-        columns={mockColumns}
-        settingsManager={{ ...mockSettingsManager, pageSize: 2 }}
-        data-cy="test-table"
-      />
-    );
-
-    const selectAllCheckbox = screen.getByLabelText('Select all rows');
-    fireEvent.click(selectAllCheckbox);
-
-    // Check if all rows on the page are selected
-    expect(screen.getByText('2 items selected')).toBeInTheDocument();
-
-    // Deselect
-    fireEvent.click(selectAllCheckbox);
-    const checkboxes: HTMLInputElement[] = screen.queryAllByRole('checkbox');
-    expect(checkboxes.filter((checkbox) => checkbox.checked).length).toBe(0);
-  });
-
-  it('selects/deselects all rows including other pages when select all is clicked with shift key', () => {
-    render(
-      <Datatable
-        dataset={mockData}
-        columns={mockColumns}
-        settingsManager={{ ...mockSettingsManager, pageSize: 2 }}
-        data-cy="test-table"
-      />
-    );
-
-    const selectAllCheckbox = screen.getByLabelText('Select all rows');
-    fireEvent.click(selectAllCheckbox, { shiftKey: true });
-
-    // Check if all rows on the page are selected
-    expect(screen.getByText('3 items selected')).toBeInTheDocument();
-
-    // Deselect
-    fireEvent.click(selectAllCheckbox, { shiftKey: true });
-    const checkboxes: HTMLInputElement[] = screen.queryAllByRole('checkbox');
-    expect(checkboxes.filter((checkbox) => checkbox.checked).length).toBe(0);
-  });
-
-  it('shows indeterminate state and correct footer text when hidden rows are selected', async () => {
-    const user = userEvent.setup();
-    render(
-      <DatatableWithStore
-        dataset={mockData}
-        columns={mockColumns}
-        data-cy="test-table"
-        title="Test table with search"
-      />
-    );
-
-    // Select Jane
-    const checkboxes = screen.getAllByRole('checkbox');
-    await user.click(checkboxes[2]); // Select the second row
-
-    // Search for John (will hide selected Jane)
-    const searchInput = screen.getByPlaceholderText('Search...');
-    await user.type(searchInput, 'John');
-
-    // Check if the footer text is correct
-    expect(
-      await screen.findByText('1 item selected (1 hidden by filters)')
-    ).toBeInTheDocument();
-
-    // Check if the checkbox is indeterminate
-    const selectAllCheckbox: HTMLInputElement =
-      screen.getByLabelText('Select all rows');
-    expect(selectAllCheckbox.indeterminate).toBe(true);
-    expect(selectAllCheckbox.checked).toBe(false);
-  });
 });
 
 // Test the defaultGlobalFilterFn used in searches

app/react/components/datatables/Datatable.tsx

@@ -171,14 +171,6 @@ export function Datatable<D extends DefaultType>({
 
   const selectedRowModel = tableInstance.getSelectedRowModel();
   const selectedItems = selectedRowModel.rows.map((row) => row.original);
-  const filteredItems = tableInstance
-    .getFilteredRowModel()
-    .rows.map((row) => row.original);
-
-  const hiddenSelectedItems = useMemo(
-    () => _.difference(selectedItems, filteredItems),
-    [selectedItems, filteredItems]
-  );
 
   return (
     <Table.Container noWidget={noWidget} aria-label={title}>
@@ -211,7 +203,6 @@ export function Datatable<D extends DefaultType>({
         pageSize={tableState.pagination.pageSize}
         pageCount={tableInstance.getPageCount()}
         totalSelected={selectedItems.length}
-        totalHiddenSelected={hiddenSelectedItems.length}
       />
     </Table.Container>
   );

app/react/components/datatables/DatatableFooter.tsx

@@ -5,7 +5,6 @@ import { SelectedRowsCount } from './SelectedRowsCount';
 
 interface Props {
   totalSelected: number;
-  totalHiddenSelected: number;
   pageSize: number;
   page: number;
   onPageChange(page: number): void;
@@ -15,7 +14,6 @@ interface Props {
 
 export function DatatableFooter({
   totalSelected,
-  totalHiddenSelected,
   pageSize,
   page,
   onPageChange,
@@ -24,7 +22,7 @@ export function DatatableFooter({
 }: Props) {
   return (
     <Table.Footer>
-      <SelectedRowsCount value={totalSelected} hidden={totalHiddenSelected} />
+      <SelectedRowsCount value={totalSelected} />
       <PaginationControls
         showAll
         pageLimit={pageSize}

app/react/components/datatables/SelectedRowsCount.tsx

@@ -1,15 +1,9 @@
-import { addPlural } from '@/react/common/string-utils';
-
 interface SelectedRowsCountProps {
   value: number;
-  hidden: number;
 }
 
-export function SelectedRowsCount({ value, hidden }: SelectedRowsCountProps) {
+export function SelectedRowsCount({ value }: SelectedRowsCountProps) {
   return value !== 0 ? (
-    <div className="infoBar">
-      {addPlural(value, 'item')} selected
-      {hidden !== 0 && ` (${hidden} hidden by filters)`}
-    </div>
+    <div className="infoBar">{value} item(s) selected</div>
   ) : null;
 }

app/react/components/datatables/select-column.tsx

@@ -1,19 +1,7 @@
-import { ColumnDef, Row, Table } from '@tanstack/react-table';
+import { ColumnDef, Row } from '@tanstack/react-table';
 
 import { Checkbox } from '@@/form-components/Checkbox';
 
-function allRowsSelected<T>(table: Table<T>) {
-  return table.getCoreRowModel().rows.every((row) => row.getIsSelected());
-}
-
-function someRowsSelected<T>(table: Table<T>) {
-  return table.getCoreRowModel().rows.some((row) => row.getIsSelected());
-}
-
-function somePageRowsSelected<T>(table: Table<T>) {
-  return table.getRowModel().rows.some((row) => row.getIsSelected());
-}
-
 export function createSelectColumn<T>(dataCy: string): ColumnDef<T> {
   let lastSelectedId = '';
 
@@ -23,22 +11,15 @@ export function createSelectColumn<T>(dataCy: string): ColumnDef<T> {
       <Checkbox
         id="select-all"
         data-cy={`select-all-checkbox-${dataCy}`}
-        checked={allRowsSelected(table)}
-        indeterminate={!allRowsSelected(table) && someRowsSelected(table)}
-        onChange={(e) => {
-          // Select all rows if shift key is held down, otherwise only page rows
-          if (e.nativeEvent instanceof MouseEvent && e.nativeEvent.shiftKey) {
-            table.toggleAllRowsSelected();
-            return;
-          }
-          table.toggleAllPageRowsSelected(!somePageRowsSelected(table));
-        }}
+        checked={table.getIsAllRowsSelected()}
+        indeterminate={table.getIsSomeRowsSelected()}
+        onChange={table.getToggleAllRowsSelectedHandler()}
         disabled={table.getRowModel().rows.every((row) => !row.getCanSelect())}
         onClick={(e) => {
           e.stopPropagation();
         }}
         aria-label="Select all rows"
-        title="Select all rows. Hold shift key to select across all pages."
+        title="Select all rows"
       />
     ),
     cell: ({ row, table }) => (

app/react/components/form-components/Checkbox.tsx

@@ -42,8 +42,6 @@ export const Checkbox = forwardRef<HTMLInputElement, Props>(
       resolvedRef = defaultRef;
     }
 
-    // Need to check this on every render as the browser will always set the element's
-    // indeterminate state to false when the checkbox is clicked, even if the indeterminate prop hasn't changed
     useEffect(() => {
       if (resolvedRef === null || resolvedRef.current === null) {
         return;
@@ -52,7 +50,7 @@ export const Checkbox = forwardRef<HTMLInputElement, Props>(
       if (typeof indeterminate !== 'undefined') {
         resolvedRef.current.indeterminate = indeterminate;
       }
-    });
+    }, [resolvedRef, indeterminate]);
 
     return (
       <div className="md-checkbox flex items-center" title={title || label}>

app/react/components/form-components/FormControl/FormControl.tsx

@@ -1,4 +1,4 @@
-import { PropsWithChildren, ReactNode } from 'react';
+import { ComponentProps, PropsWithChildren, ReactNode } from 'react';
 import clsx from 'clsx';
 
 import { Tooltip } from '@@/Tip/Tooltip';
@@ -10,11 +10,10 @@ export type Size = 'xsmall' | 'small' | 'medium' | 'large' | 'vertical';
 
 export interface Props {
   inputId?: string;
-  dataCy?: string;
   label: ReactNode;
   size?: Size;
-  tooltip?: ReactNode;
-  setTooltipHtmlMessage?: boolean;
+  tooltip?: ComponentProps<typeof Tooltip>['message'];
+  setTooltipHtmlMessage?: ComponentProps<typeof Tooltip>['setHtmlMessage'];
   children: ReactNode;
   errors?: ReactNode;
   required?: boolean;
@@ -25,7 +24,6 @@ export interface Props {
 
 export function FormControl({
   inputId,
-  dataCy,
   label,
   size = 'small',
   tooltip = '',
@@ -44,7 +42,6 @@ export function FormControl({
         'form-group',
         'after:clear-both after:table after:content-[""]' // to fix issues with float
       )}
-      data-cy={dataCy}
     >
       <label
         htmlFor={inputId}
@@ -59,15 +56,10 @@ export function FormControl({
         )}
       </label>
 
-      <div className={clsx('flex flex-col', sizeClassChildren(size))}>
-        {isLoading && (
-          // 34px height to reduce layout shift when loading is complete
-          <div className="h-[34px] flex items-center">
-            <InlineLoader>{loadingText}</InlineLoader>
-          </div>
-        )}
+      <div className={sizeClassChildren(size)}>
+        {isLoading && <InlineLoader>{loadingText}</InlineLoader>}
         {!isLoading && children}
-        {!!errors && !isLoading && <FormError>{errors}</FormError>}
+        {errors && <FormError>{errors}</FormError>}
       </div>
     </div>
   );

app/react/components/form-components/Input/Select.tsx

@@ -18,7 +18,6 @@ export function Select<T extends number | string>({
   options,
   className,
   'data-cy': dataCy,
-  id,
   ...props
 }: Props<T> & SelectHTMLAttributes<HTMLSelectElement>) {
   return (

app/react/components/form-components/PortainerSelect.tsx

@@ -111,7 +111,6 @@ export function SingleSelect<TValue = string>({
       onChange={(option) => onChange(option ? option.value : null)}
       isOptionDisabled={(option) => !!option.disabled}
       data-cy={dataCy}
-      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
       isDisabled={disabled}
@@ -178,7 +177,6 @@ export function MultiSelect<TValue = string>({
       closeMenuOnSelect={false}
       onChange={(newValue) => onChange(newValue.map((option) => option.value))}
       data-cy={dataCy}
-      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
       isDisabled={disabled}