diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 37eb771df..ad3e449d0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,7 +93,7 @@ $ yarn start Portainer can now be accessed at . -Find more detailed steps at . +Find more detailed steps at . ### Build customisation @@ -103,6 +103,10 @@ You can customise the following settings: - `PORTAINER_PROJECT`: The root dir of the repository - `${portainerRoot}/dist/` is imported into the container to get the build artifacts and external tools (defaults to `your current dir`). - `PORTAINER_FLAGS`: a list of flags to be used on the portainer commandline, in the form `--admin-password= --feat fdo=false --feat open-amt` (default: `""`). +## Testing your build + +The `--log-level=DEBUG` flag can be passed to the Portainer container in order to provide additional debug output which may be useful when troubleshooting your builds. Please note that this flag was originally intended for internal use and as such the format, functionality and output may change between releases without warning. + ## Adding api docs When adding a new resource (or a route handler), we should add a new tag to api/http/handler/handler.go#L136 like this: diff --git a/api/agent/version.go b/api/agent/version.go index bdb7ebce1..03d3cf4f6 100644 --- a/api/agent/version.go +++ b/api/agent/version.go @@ -4,6 +4,7 @@ import ( "crypto/tls" "errors" "fmt" + "io" "net/http" "strconv" "time" @@ -42,7 +43,9 @@ func GetAgentVersionAndPlatform(endpointUrl string, tlsConfig *tls.Config) (port if err != nil { return 0, "", err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() if resp.StatusCode != http.StatusNoContent { return 0, "", fmt.Errorf("Failed request with status %d", resp.StatusCode) diff --git a/api/cli/cli.go b/api/cli/cli.go index c04f41121..5f7062c21 100644 --- a/api/cli/cli.go +++ b/api/cli/cli.go @@ -72,6 +72,7 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) { if err != nil { panic(err) } + *flags.Assets = filepath.Join(filepath.Dir(ex), *flags.Assets) } @@ -80,7 +81,6 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) { // ValidateFlags validates the values of the flags. func (*Service) ValidateFlags(flags *portainer.CLIFlags) error { - displayDeprecationWarnings(flags) err := validateEndpointURL(*flags.EndpointURL) @@ -111,31 +111,38 @@ func displayDeprecationWarnings(flags *portainer.CLIFlags) { } func validateEndpointURL(endpointURL string) error { - if endpointURL != "" { - if !strings.HasPrefix(endpointURL, "unix://") && !strings.HasPrefix(endpointURL, "tcp://") && !strings.HasPrefix(endpointURL, "npipe://") { - return errInvalidEndpointProtocol - } + if endpointURL == "" { + return nil + } - if strings.HasPrefix(endpointURL, "unix://") || strings.HasPrefix(endpointURL, "npipe://") { - socketPath := strings.TrimPrefix(endpointURL, "unix://") - socketPath = strings.TrimPrefix(socketPath, "npipe://") - if _, err := os.Stat(socketPath); err != nil { - if os.IsNotExist(err) { - return errSocketOrNamedPipeNotFound - } - return err + if !strings.HasPrefix(endpointURL, "unix://") && !strings.HasPrefix(endpointURL, "tcp://") && !strings.HasPrefix(endpointURL, "npipe://") { + return errInvalidEndpointProtocol + } + + if strings.HasPrefix(endpointURL, "unix://") || strings.HasPrefix(endpointURL, "npipe://") { + socketPath := strings.TrimPrefix(endpointURL, "unix://") + socketPath = strings.TrimPrefix(socketPath, "npipe://") + if _, err := os.Stat(socketPath); err != nil { + if os.IsNotExist(err) { + return errSocketOrNamedPipeNotFound } + + return err } } + return nil } func validateSnapshotInterval(snapshotInterval string) error { - if snapshotInterval != "" { - _, err := time.ParseDuration(snapshotInterval) - if err != nil { - return errInvalidSnapshotInterval - } + if snapshotInterval == "" { + return nil } + + _, err := time.ParseDuration(snapshotInterval) + if err != nil { + return errInvalidSnapshotInterval + } + return nil } diff --git a/api/cli/confirm.go b/api/cli/confirm.go index ac468e97e..ec1076057 100644 --- a/api/cli/confirm.go +++ b/api/cli/confirm.go @@ -12,13 +12,14 @@ func Confirm(message string) (bool, error) { fmt.Printf("%s [y/N]", message) reader := bufio.NewReader(os.Stdin) + answer, err := reader.ReadString('\n') if err != nil { return false, err } - answer = strings.Replace(answer, "\n", "", -1) + + answer = strings.ReplaceAll(answer, "\n", "") answer = strings.ToLower(answer) return answer == "y" || answer == "yes", nil - } diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index 9a0285f0d..c3479cac4 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -684,25 +684,21 @@ func buildServer(flags *portainer.CLIFlags) portainer.Server { log.Fatal().Msg("failed to fetch SSL settings from DB") } - upgradeService, err := upgrade.NewService(*flags.Assets, composeDeployer) + upgradeService, err := upgrade.NewService(*flags.Assets, composeDeployer, kubernetesClientFactory) if err != nil { log.Fatal().Err(err).Msg("failed initializing upgrade service") } - // FIXME: In 2.16 we changed the way ingress controller permissions are - // stored. Instead of being stored as annotation on an ingress rule, we keep - // them in our database. However, in order to run the migration we need an - // admin kube client to run lookup the old ingress rules and compare them - // with the current existing ingress classes. - // - // Unfortunately, our migrations run as part of the database initialization - // and our kubeclients require an initialized database. So it is not - // possible to do this migration as part of our normal flow. We DO have a - // migration which toggles a boolean in kubernetes configuration that - // indicated that this "post init" migration should be run. If/when this is - // resolved we can remove this function. - err = kubernetesClientFactory.PostInitMigrateIngresses() - if err != nil { + // Our normal migrations run as part of the database initialization + // but some more complex migrations require access to a kubernetes or docker + // client. Therefore we run a separate migration process just before + // starting the server. + postInitMigrator := datastore.NewPostInitMigrator( + kubernetesClientFactory, + dockerClientFactory, + dataStore, + ) + if err := postInitMigrator.PostInitMigrate(); err != nil { log.Fatal().Err(err).Msg("failure during post init migrations") } diff --git a/api/crypto/ecdsa.go b/api/crypto/ecdsa.go index 1cd119fce..bbf839324 100644 --- a/api/crypto/ecdsa.go +++ b/api/crypto/ecdsa.go @@ -7,7 +7,6 @@ import ( "crypto/x509" "encoding/base64" "encoding/hex" - "math/big" "github.com/portainer/libcrypto" ) @@ -115,9 +114,6 @@ func (service *ECDSAService) CreateSignature(message string) (string, error) { hash := libcrypto.HashFromBytes([]byte(message)) - r := big.NewInt(0) - s := big.NewInt(0) - r, s, err := ecdsa.Sign(rand.Reader, service.privateKey, hash) if err != nil { return "", err diff --git a/api/database/boltdb/json_test.go b/api/database/boltdb/json_test.go index 2d22bfafc..3d6d83ce1 100644 --- a/api/database/boltdb/json_test.go +++ b/api/database/boltdb/json_test.go @@ -129,7 +129,7 @@ func Test_UnMarshalObjectUnencrypted(t *testing.T) { var object string err := conn.UnmarshalObject(test.object, &object) is.NoError(err) - is.Equal(test.expected, string(object)) + is.Equal(test.expected, object) }) } } diff --git a/api/database/boltdb/tx.go b/api/database/boltdb/tx.go index e62e7b2d9..c4503fde8 100644 --- a/api/database/boltdb/tx.go +++ b/api/database/boltdb/tx.go @@ -92,7 +92,7 @@ func (tx *DbTransaction) CreateObject(bucketName string, fn func(uint64) (int, i return err } - return bucket.Put(tx.conn.ConvertToKey(int(id)), data) + return bucket.Put(tx.conn.ConvertToKey(id), data) } func (tx *DbTransaction) CreateObjectWithId(bucketName string, id int, obj interface{}) error { diff --git a/api/database/database.go b/api/database/database.go index f4705cc94..492d56bcf 100644 --- a/api/database/database.go +++ b/api/database/database.go @@ -9,8 +9,7 @@ import ( // NewDatabase should use config options to return a connection to the requested database func NewDatabase(storeType, storePath string, encryptionKey []byte) (connection portainer.Connection, err error) { - switch storeType { - case "boltdb": + if storeType == "boltdb" { return &boltdb.DbConnection{ Path: storePath, EncryptionKey: encryptionKey, diff --git a/api/datastore/migrate_post_init.go b/api/datastore/migrate_post_init.go new file mode 100644 index 000000000..2f943c193 --- /dev/null +++ b/api/datastore/migrate_post_init.go @@ -0,0 +1,117 @@ +package datastore + +import ( + "context" + + "github.com/docker/docker/api/types" + portainer "github.com/portainer/portainer/api" + "github.com/portainer/portainer/api/dataservices" + "github.com/portainer/portainer/api/docker" + "github.com/portainer/portainer/api/kubernetes/cli" + + "github.com/rs/zerolog/log" +) + +type PostInitMigrator struct { + kubeFactory *cli.ClientFactory + dockerFactory *docker.ClientFactory + dataStore dataservices.DataStore +} + +func NewPostInitMigrator(kubeFactory *cli.ClientFactory, dockerFactory *docker.ClientFactory, dataStore dataservices.DataStore) *PostInitMigrator { + return &PostInitMigrator{ + kubeFactory: kubeFactory, + dockerFactory: dockerFactory, + dataStore: dataStore, + } +} + +func (migrator *PostInitMigrator) PostInitMigrate() error { + if err := migrator.PostInitMigrateIngresses(); err != nil { + return err + } + + migrator.PostInitMigrateGPUs() + + return nil +} + +func (migrator *PostInitMigrator) PostInitMigrateIngresses() error { + endpoints, err := migrator.dataStore.Endpoint().Endpoints() + if err != nil { + return err + } + + for i := range endpoints { + // Early exit if we do not need to migrate! + if !endpoints[i].PostInitMigrations.MigrateIngresses { + return nil + } + + err := migrator.kubeFactory.MigrateEndpointIngresses(&endpoints[i]) + if err != nil { + log.Debug().Err(err).Msg("failure migrating endpoint ingresses") + } + } + + return nil +} + +// PostInitMigrateGPUs will check all docker endpoints for containers with GPUs and set EnableGPUManagement to true if any are found +// If there's an error getting the containers, we'll log it and move on +func (migrator *PostInitMigrator) PostInitMigrateGPUs() { + environments, err := migrator.dataStore.Endpoint().Endpoints() + if err != nil { + log.Err(err).Msg("failure getting endpoints") + return + } + + for i := range environments { + if environments[i].Type == portainer.DockerEnvironment { + // // Early exit if we do not need to migrate! + if !environments[i].PostInitMigrations.MigrateGPUs { + return + } + + // set the MigrateGPUs flag to false so we don't run this again + environments[i].PostInitMigrations.MigrateGPUs = false + migrator.dataStore.Endpoint().UpdateEndpoint(environments[i].ID, &environments[i]) + + // create a docker client + dockerClient, err := migrator.dockerFactory.CreateClient(&environments[i], "", nil) + if err != nil { + log.Err(err).Msg("failure creating docker client for environment: " + environments[i].Name) + return + } + defer dockerClient.Close() + + // get all containers + containers, err := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{All: true}) + if err != nil { + log.Err(err).Msg("failed to list containers") + return + } + + // check for a gpu on each container. If even one GPU is found, set EnableGPUManagement to true for the whole endpoint + containersLoop: + for _, container := range containers { + // https://www.sobyte.net/post/2022-10/go-docker/ has nice documentation on the docker client with GPUs + containerDetails, err := dockerClient.ContainerInspect(context.Background(), container.ID) + if err != nil { + log.Err(err).Msg("failed to inspect container") + return + } + + deviceRequests := containerDetails.HostConfig.Resources.DeviceRequests + for _, deviceRequest := range deviceRequests { + if deviceRequest.Driver == "nvidia" { + environments[i].EnableGPUManagement = true + migrator.dataStore.Endpoint().UpdateEndpoint(environments[i].ID, &environments[i]) + + break containersLoop + } + } + } + } + } +} diff --git a/api/datastore/migrator/migrate_dbversion90.go b/api/datastore/migrator/migrate_dbversion90.go index 4d890a40a..fe107188d 100644 --- a/api/datastore/migrator/migrate_dbversion90.go +++ b/api/datastore/migrator/migrate_dbversion90.go @@ -3,11 +3,16 @@ package migrator import ( "github.com/rs/zerolog/log" + portainer "github.com/portainer/portainer/api" portainerDsErrors "github.com/portainer/portainer/api/dataservices/errors" ) func (m *Migrator) migrateDBVersionToDB90() error { - if err := m.updateUserThemForDB90(); err != nil { + if err := m.updateUserThemeForDB90(); err != nil { + return err + } + + if err := m.updateEnableGpuManagementFeatures(); err != nil { return err } @@ -39,7 +44,7 @@ func (m *Migrator) updateEdgeStackStatusForDB90() error { return nil } -func (m *Migrator) updateUserThemForDB90() error { +func (m *Migrator) updateUserThemeForDB90() error { log.Info().Msg("updating existing user theme settings") users, err := m.userService.Users() @@ -60,3 +65,28 @@ func (m *Migrator) updateUserThemForDB90() error { return nil } + +func (m *Migrator) updateEnableGpuManagementFeatures() error { + // get all environments + environments, err := m.endpointService.Endpoints() + if err != nil { + return err + } + + for _, environment := range environments { + if environment.Type == portainer.DockerEnvironment { + // set the PostInitMigrations.MigrateGPUs to true on this environment to run the migration only on the 2.18 upgrade + environment.PostInitMigrations.MigrateGPUs = true + // if there's one or more gpu, set the EnableGpuManagement setting to true + gpuList := environment.Gpus + if len(gpuList) > 0 { + environment.EnableGPUManagement = true + } + // update the environment + if err := m.endpointService.UpdateEndpoint(environment.ID, &environment); err != nil { + return err + } + } + } + return nil +} diff --git a/api/datastore/test_data/output_24_to_latest.json b/api/datastore/test_data/output_24_to_latest.json index a4d4b2ac8..9ef6f3d01 100644 --- a/api/datastore/test_data/output_24_to_latest.json +++ b/api/datastore/test_data/output_24_to_latest.json @@ -46,6 +46,7 @@ }, "EdgeCheckinInterval": 0, "EdgeKey": "", + "EnableGPUManagement": false, "Gpus": [], "GroupId": 1, "Id": 1, @@ -63,6 +64,7 @@ "UseServerMetrics": false }, "Flags": { + "IsServerIngressClassDetected": false, "IsServerMetricsDetected": false, "IsServerStorageDetected": false }, @@ -71,6 +73,7 @@ "LastCheckInDate": 0, "Name": "local", "PostInitMigrations": { + "MigrateGPUs": true, "MigrateIngresses": true }, "PublicURL": "", @@ -903,8 +906,7 @@ }, "Role": 1, "ThemeSettings": { - "color": "", - "subtleUpgradeButton": false + "color": "" }, "TokenIssueAt": 0, "UserTheme": "", @@ -934,8 +936,7 @@ }, "Role": 1, "ThemeSettings": { - "color": "", - "subtleUpgradeButton": false + "color": "" }, "TokenIssueAt": 0, "UserTheme": "", @@ -943,6 +944,6 @@ } ], "version": { - "VERSION": "{\"SchemaVersion\":\"2.18.0\",\"MigratorCount\":1,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}" + "VERSION": "{\"SchemaVersion\":\"2.19.0\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}" } } \ No newline at end of file diff --git a/api/docker/client.go b/api/docker/client.go index 909fbe708..af9161b17 100644 --- a/api/docker/client.go +++ b/api/docker/client.go @@ -38,17 +38,19 @@ func NewClientFactory(signatureService portainer.DigitalSignatureService, revers // with an agent enabled environment(endpoint) to target a specific node in an agent cluster. // The underlying http client timeout may be specified, a default value is used otherwise. func (factory *ClientFactory) CreateClient(endpoint *portainer.Endpoint, nodeName string, timeout *time.Duration) (*client.Client, error) { - if endpoint.Type == portainer.AzureEnvironment { + switch endpoint.Type { + case portainer.AzureEnvironment: return nil, errUnsupportedEnvironmentType - } else if endpoint.Type == portainer.AgentOnDockerEnvironment { + case portainer.AgentOnDockerEnvironment: return createAgentClient(endpoint, factory.signatureService, nodeName, timeout) - } else if endpoint.Type == portainer.EdgeAgentOnDockerEnvironment { + case portainer.EdgeAgentOnDockerEnvironment: return createEdgeClient(endpoint, factory.signatureService, factory.reverseTunnelService, nodeName, timeout) } if strings.HasPrefix(endpoint.URL, "unix://") || strings.HasPrefix(endpoint.URL, "npipe://") { return createLocalClient(endpoint) } + return createTCPClient(endpoint, timeout) } diff --git a/api/exec/compose_stack.go b/api/exec/compose_stack.go index dd84bd6a2..bd9985cd4 100644 --- a/api/exec/compose_stack.go +++ b/api/exec/compose_stack.go @@ -82,9 +82,11 @@ func (manager *ComposeStackManager) Down(ctx context.Context, stack *portainer.S } err = manager.deployer.Remove(ctx, stack.Name, nil, libstack.Options{ + WorkingDir: stack.ProjectPath, EnvFilePath: envFilePath, Host: url, }) + return errors.Wrap(err, "failed to remove a stack") } diff --git a/api/exec/swarm_stack.go b/api/exec/swarm_stack.go index 114ac3fd4..b16cfe11a 100644 --- a/api/exec/swarm_stack.go +++ b/api/exec/swarm_stack.go @@ -59,6 +59,7 @@ func (manager *SwarmStackManager) Login(registries []portainer.Registry, endpoin if err != nil { return err } + for _, registry := range registries { if registry.Authentication { err = registryutils.EnsureRegTokenValid(manager.dataStore, ®istry) @@ -75,6 +76,7 @@ func (manager *SwarmStackManager) Login(registries []portainer.Registry, endpoin runCommandAndCaptureStdErr(command, registryArgs, nil, "") } } + return nil } @@ -84,7 +86,9 @@ func (manager *SwarmStackManager) Logout(endpoint *portainer.Endpoint) error { if err != nil { return err } + args = append(args, "logout") + return runCommandAndCaptureStdErr(command, args, nil, "") } @@ -101,6 +105,7 @@ func (manager *SwarmStackManager) Deploy(stack *portainer.Stack, prune bool, pul } else { args = append(args, "stack", "deploy", "--with-registry-auth") } + if !pullImage { args = append(args, "--resolve-image=never") } @@ -112,6 +117,7 @@ func (manager *SwarmStackManager) Deploy(stack *portainer.Stack, prune bool, pul for _, envvar := range stack.Env { env = append(env, envvar.Name+"="+envvar.Value) } + return runCommandAndCaptureStdErr(command, args, env, stack.ProjectPath) } @@ -121,7 +127,9 @@ func (manager *SwarmStackManager) Remove(stack *portainer.Stack, endpoint *porta if err != nil { return err } + args = append(args, "stack", "rm", stack.Name) + return runCommandAndCaptureStdErr(command, args, nil, "") } @@ -198,6 +206,7 @@ func (manager *SwarmStackManager) updateDockerCLIConfiguration(configPath string if config["HttpHeaders"] == nil { config["HttpHeaders"] = make(map[string]interface{}) } + headersObject := config["HttpHeaders"].(map[string]interface{}) headersObject["X-PortainerAgent-ManagerOperation"] = "1" headersObject["X-PortainerAgent-Signature"] = signature @@ -230,5 +239,6 @@ func configureFilePaths(args []string, filePaths []string) []string { for _, path := range filePaths { args = append(args, "--compose-file", path) } + return args } diff --git a/api/git/azure.go b/api/git/azure.go index 7bbe65c64..72d35802c 100644 --- a/api/git/azure.go +++ b/api/git/azure.go @@ -75,6 +75,7 @@ func newHttpClientForAzure() *http.Client { } client.InstallProtocol("https", githttp.NewClient(httpsCli)) + return httpsCli } @@ -98,10 +99,12 @@ func (a *azureClient) downloadZipFromAzureDevOps(ctx context.Context, opt cloneO if err != nil { return "", errors.WithMessage(err, "failed to parse url") } + downloadUrl, err := a.buildDownloadUrl(config, opt.referenceName) if err != nil { return "", errors.WithMessage(err, "failed to build download url") } + zipFile, err := os.CreateTemp("", "azure-git-repo-*.zip") if err != nil { return "", errors.WithMessage(err, "failed to create temp file") @@ -133,6 +136,7 @@ func (a *azureClient) downloadZipFromAzureDevOps(ctx context.Context, opt cloneO if err != nil { return "", errors.WithMessage(err, "failed to save HTTP response to a file") } + return zipFile.Name(), nil } @@ -141,6 +145,7 @@ func (a *azureClient) latestCommitID(ctx context.Context, opt fetchOption) (stri if err != nil { return "", err } + return rootItem.CommitId, nil } @@ -187,6 +192,7 @@ func (a *azureClient) getRootItem(ctx context.Context, opt fetchOption) (*azureI if len(items.Value) == 0 || items.Value[0].CommitId == "" { return nil, errors.Errorf("failed to get latest commitID in the repository") } + return &items.Value[0], nil } @@ -205,7 +211,7 @@ func parseUrl(rawUrl string) (*azureOptions, error) { return nil, errors.Errorf("supported url schemes are https and ssh; recevied URL %s rawUrl", rawUrl) } -var expectedSshUrl = "git@ssh.dev.azure.com:v3/Organisation/Project/Repository" +const expectedSshUrl = "git@ssh.dev.azure.com:v3/Organisation/Project/Repository" func parseSshUrl(rawUrl string) (*azureOptions, error) { path := strings.Split(rawUrl, "/") @@ -343,6 +349,7 @@ func (a *azureClient) buildTreeUrl(config *azureOptions, rootObjectHash string) if err != nil { return "", errors.Wrapf(err, "failed to parse list tree url path %s", rawUrl) } + q := u.Query() // projectId={projectId}&recursive=true&fileName={fileName}&$format={$format}&api-version=6.0 q.Set("recursive", "true") @@ -361,9 +368,11 @@ func formatReferenceName(name string) string { if strings.HasPrefix(name, branchPrefix) { return strings.TrimPrefix(name, branchPrefix) } + if strings.HasPrefix(name, tagPrefix) { return strings.TrimPrefix(name, tagPrefix) } + return name } @@ -371,9 +380,11 @@ func getVersionType(name string) string { if strings.HasPrefix(name, branchPrefix) { return "branch" } + if strings.HasPrefix(name, tagPrefix) { return "tag" } + return "commit" } @@ -490,5 +501,6 @@ func checkAzureStatusCode(err error, code int) error { } else if code == http.StatusUnauthorized || code == http.StatusNonAuthoritativeInfo { return gittypes.ErrAuthenticationFailure } + return err } diff --git a/api/git/azure_integration_test.go b/api/git/azure_integration_test.go index 8c22a3e91..f5aba3218 100644 --- a/api/git/azure_integration_test.go +++ b/api/git/azure_integration_test.go @@ -8,14 +8,13 @@ import ( "testing" "time" - _ "github.com/joho/godotenv/autoload" gittypes "github.com/portainer/portainer/api/git/types" + + _ "github.com/joho/godotenv/autoload" "github.com/stretchr/testify/assert" ) -var ( - privateAzureRepoURL = "https://portainer.visualstudio.com/gitops-test/_git/gitops-test" -) +const privateAzureRepoURL = "https://portainer.visualstudio.com/gitops-test/_git/gitops-test" func TestService_ClonePublicRepository_Azure(t *testing.T) { ensureIntegrationTest(t) @@ -107,7 +106,7 @@ func TestService_ListRefs_Azure_Concurrently(t *testing.T) { accessToken := getRequiredValue(t, "AZURE_DEVOPS_PAT") username := getRequiredValue(t, "AZURE_DEVOPS_USERNAME") - service := newService(context.TODO(), REPOSITORY_CACHE_SIZE, 200*time.Millisecond) + service := newService(context.TODO(), repositoryCacheSize, 200*time.Millisecond) go service.ListRefs(privateAzureRepoURL, username, accessToken, false) service.ListRefs(privateAzureRepoURL, username, accessToken, false) @@ -269,7 +268,7 @@ func TestService_ListFiles_Azure_Concurrently(t *testing.T) { accessToken := getRequiredValue(t, "AZURE_DEVOPS_PAT") username := getRequiredValue(t, "AZURE_DEVOPS_USERNAME") - service := newService(context.TODO(), REPOSITORY_CACHE_SIZE, 200*time.Millisecond) + service := newService(context.TODO(), repositoryCacheSize, 200*time.Millisecond) go service.ListFiles(privateAzureRepoURL, "refs/heads/main", username, accessToken, false, []string{}) service.ListFiles(privateAzureRepoURL, "refs/heads/main", username, accessToken, false, []string{}) diff --git a/api/git/git_integration_test.go b/api/git/git_integration_test.go index 886003c8d..6c72532dc 100644 --- a/api/git/git_integration_test.go +++ b/api/git/git_integration_test.go @@ -60,7 +60,7 @@ func TestService_ListRefs_Github_Concurrently(t *testing.T) { accessToken := getRequiredValue(t, "GITHUB_PAT") username := getRequiredValue(t, "GITHUB_USERNAME") - service := newService(context.TODO(), REPOSITORY_CACHE_SIZE, 200*time.Millisecond) + service := newService(context.TODO(), repositoryCacheSize, 200*time.Millisecond) repositoryUrl := privateGitRepoURL go service.ListRefs(repositoryUrl, username, accessToken, false) @@ -224,7 +224,7 @@ func TestService_ListFiles_Github_Concurrently(t *testing.T) { repositoryUrl := privateGitRepoURL accessToken := getRequiredValue(t, "GITHUB_PAT") username := getRequiredValue(t, "GITHUB_USERNAME") - service := newService(context.TODO(), REPOSITORY_CACHE_SIZE, 200*time.Millisecond) + service := newService(context.TODO(), repositoryCacheSize, 200*time.Millisecond) go service.ListFiles(repositoryUrl, "refs/heads/main", username, accessToken, false, []string{}) service.ListFiles(repositoryUrl, "refs/heads/main", username, accessToken, false, []string{}) diff --git a/api/git/git_test.go b/api/git/git_test.go index 5f129d4f5..0e2d6caeb 100644 --- a/api/git/git_test.go +++ b/api/git/git_test.go @@ -95,10 +95,12 @@ func getCommitHistoryLength(t *testing.T, err error, dir string) int { if err != nil { t.Fatalf("can't open a git repo at %s with error %v", dir, err) } + iter, err := repo.Log(&git.LogOptions{All: true}) if err != nil { t.Fatalf("can't get a commit history iterator with error %v", err) } + count := 0 err = iter.ForEach(func(_ *object.Commit) error { count++ @@ -107,6 +109,7 @@ func getCommitHistoryLength(t *testing.T, err error, dir string) int { if err != nil { t.Fatalf("can't iterate over the commit history with error %v", err) } + return count } diff --git a/api/git/service.go b/api/git/service.go index baf3a841d..7f062cd7a 100644 --- a/api/git/service.go +++ b/api/git/service.go @@ -10,9 +10,9 @@ import ( "github.com/rs/zerolog/log" ) -var ( - REPOSITORY_CACHE_SIZE = 4 - REPOSITORY_CACHE_TTL = 5 * time.Minute +const ( + repositoryCacheSize = 4 + repositoryCacheTTL = 5 * time.Minute ) // baseOption provides a minimum group of information to operate a git repository, like git-remote @@ -58,7 +58,7 @@ type Service struct { // NewService initializes a new service. func NewService(ctx context.Context) *Service { - return newService(ctx, REPOSITORY_CACHE_SIZE, REPOSITORY_CACHE_TTL) + return newService(ctx, repositoryCacheSize, repositoryCacheTTL) } func newService(ctx context.Context, cacheSize int, cacheTTL time.Duration) *Service { diff --git a/api/git/update/update.go b/api/git/update/update.go index d43ef2102..e0c23eefd 100644 --- a/api/git/update/update.go +++ b/api/git/update/update.go @@ -34,7 +34,7 @@ func UpdateGitObject(gitService portainer.GitService, dataStore dataservices.Dat return false, "", errors.WithMessagef(err, "failed to fetch latest commit id of %v", objId) } - hashChanged := !strings.EqualFold(newHash, string(gitConfig.ConfigHash)) + hashChanged := !strings.EqualFold(newHash, gitConfig.ConfigHash) forceUpdate := autoUpdateConfig != nil && autoUpdateConfig.ForceUpdate if !hashChanged && !forceUpdate { log.Debug(). diff --git a/api/go.sum b/api/go.sum index e8019a424..206c3bdd1 100644 --- a/api/go.sum +++ b/api/go.sum @@ -342,12 +342,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/portainer/docker-compose-wrapper v0.0.0-20221215210951-2c30d1b17a27 h1:PceCpp86SDYb3lZHT4KpuBCkmcJMW5x1qrdFNEfAdUo= -github.com/portainer/docker-compose-wrapper v0.0.0-20221215210951-2c30d1b17a27/go.mod h1:03UmPLyjiPUexGJuW20mQXvmsoSpeErvMlItJGtq/Ww= -github.com/portainer/docker-compose-wrapper v0.0.0-20230209071700-ee11af9c546a h1:4VGM1OH15fqm5rgki0eLF6vND/NxHfoPt3CA6/YdA0k= -github.com/portainer/docker-compose-wrapper v0.0.0-20230209071700-ee11af9c546a/go.mod h1:03UmPLyjiPUexGJuW20mQXvmsoSpeErvMlItJGtq/Ww= -github.com/portainer/docker-compose-wrapper v0.0.0-20230209082344-8a5b52de366f h1:z/lmLhZMMSIwg70Ap1rPluXNe1vQXH9gfK9K/ols4JA= -github.com/portainer/docker-compose-wrapper v0.0.0-20230209082344-8a5b52de366f/go.mod h1:03UmPLyjiPUexGJuW20mQXvmsoSpeErvMlItJGtq/Ww= github.com/portainer/docker-compose-wrapper v0.0.0-20230301083819-3dbc6abf1ce7 h1:/i985KPNw0KvVtLhTEPUa86aJMtun5ZPOyFCJzdY+dY= github.com/portainer/docker-compose-wrapper v0.0.0-20230301083819-3dbc6abf1ce7/go.mod h1:03UmPLyjiPUexGJuW20mQXvmsoSpeErvMlItJGtq/Ww= github.com/portainer/libcrypto v0.0.0-20220506221303-1f4fb3b30f9a h1:B0z3skIMT+OwVNJPQhKp52X+9OWW6A9n5UWig3lHBJk= diff --git a/api/hostmanagement/fdo/owner_client.go b/api/hostmanagement/fdo/owner_client.go index bfd10b8ce..0f3aba696 100644 --- a/api/hostmanagement/fdo/owner_client.go +++ b/api/hostmanagement/fdo/owner_client.go @@ -113,7 +113,9 @@ func (c FDOOwnerClient) PutDeviceSVI(info ServiceInfo) error { if err != nil { return err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() if resp.StatusCode != http.StatusOK { return errors.New(http.StatusText(resp.StatusCode)) @@ -132,7 +134,9 @@ func (c FDOOwnerClient) PutDeviceSVIRaw(info url.Values, body []byte) error { if err != nil { return err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() if resp.StatusCode != http.StatusOK { return errors.New(http.StatusText(resp.StatusCode)) @@ -151,7 +155,9 @@ func (c FDOOwnerClient) GetVouchers() ([]string, error) { if err != nil { return nil, err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, errors.New(http.StatusText(resp.StatusCode)) @@ -182,7 +188,9 @@ func (c FDOOwnerClient) DeleteVoucher(guid string) error { if err != nil { return err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() if resp.StatusCode != http.StatusOK { return errors.New(http.StatusText(resp.StatusCode)) @@ -201,7 +209,9 @@ func (c FDOOwnerClient) GetDeviceSVI(guid string) (string, error) { if err != nil { return "", err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() body, err := io.ReadAll(resp.Body) if err != nil { @@ -225,7 +235,9 @@ func (c FDOOwnerClient) DeleteDeviceSVI(id string) error { if err != nil { return err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() if resp.StatusCode != http.StatusOK { return errors.New(http.StatusText(resp.StatusCode)) diff --git a/api/hostmanagement/openamt/authorization.go b/api/hostmanagement/openamt/authorization.go index 9d5050d2e..463cb4dcf 100644 --- a/api/hostmanagement/openamt/authorization.go +++ b/api/hostmanagement/openamt/authorization.go @@ -33,10 +33,13 @@ func (service *Service) Authorization(configuration portainer.OpenAMTConfigurati if err != nil { return "", err } + defer response.Body.Close() + responseBody, readErr := io.ReadAll(response.Body) if readErr != nil { return "", readErr } + errorResponse := parseError(responseBody) if errorResponse != nil { return "", errorResponse diff --git a/api/hostmanagement/openamt/configCIRA.go b/api/hostmanagement/openamt/configCIRA.go index def1f423c..feac5821a 100644 --- a/api/hostmanagement/openamt/configCIRA.go +++ b/api/hostmanagement/openamt/configCIRA.go @@ -128,6 +128,7 @@ func (service *Service) getCIRACertificate(configuration portainer.OpenAMTConfig if err != nil { return "", err } + defer response.Body.Close() if response.StatusCode != http.StatusOK { return "", fmt.Errorf("unexpected status code %s", response.Status) @@ -137,6 +138,8 @@ func (service *Service) getCIRACertificate(configuration portainer.OpenAMTConfig if err != nil { return "", err } + block, _ := pem.Decode(certificate) + return base64.StdEncoding.EncodeToString(block.Bytes), nil } diff --git a/api/hostmanagement/openamt/openamt.go b/api/hostmanagement/openamt/openamt.go index 590664961..c7a738fc4 100644 --- a/api/hostmanagement/openamt/openamt.go +++ b/api/hostmanagement/openamt/openamt.go @@ -103,6 +103,8 @@ func (service *Service) executeSaveRequest(method string, url string, token stri if err != nil { return nil, err } + defer response.Body.Close() + responseBody, readErr := io.ReadAll(response.Body) if readErr != nil { return nil, readErr @@ -132,6 +134,8 @@ func (service *Service) executeGetRequest(url string, token string) ([]byte, err if err != nil { return nil, err } + defer response.Body.Close() + responseBody, readErr := io.ReadAll(response.Body) if readErr != nil { return nil, readErr @@ -141,10 +145,12 @@ func (service *Service) executeGetRequest(url string, token string) ([]byte, err if response.StatusCode == http.StatusNotFound { return nil, nil } + errorResponse := parseError(responseBody) if errorResponse != nil { return nil, errorResponse } + return nil, fmt.Errorf("unexpected status code %s", response.Status) } diff --git a/api/http/handler/backup/backup_test.go b/api/http/handler/backup/backup_test.go index a35754db3..23954b9c9 100644 --- a/api/http/handler/backup/backup_test.go +++ b/api/http/handler/backup/backup_test.go @@ -53,6 +53,7 @@ func Test_backupHandlerWithoutPassword_shouldCreateATarballArchive(t *testing.T) response := w.Result() body, _ := io.ReadAll(response.Body) + response.Body.Close() tmpdir := t.TempDir() @@ -89,6 +90,7 @@ func Test_backupHandlerWithPassword_shouldCreateEncryptedATarballArchive(t *test response := w.Result() body, _ := io.ReadAll(response.Body) + response.Body.Close() tmpdir := t.TempDir() diff --git a/api/http/handler/backup/restore_test.go b/api/http/handler/backup/restore_test.go index 5c21a67d7..087179fa3 100644 --- a/api/http/handler/backup/restore_test.go +++ b/api/http/handler/backup/restore_test.go @@ -99,6 +99,8 @@ func backup(t *testing.T, h *Handler, password string) []byte { response := w.Result() archive, _ := io.ReadAll(response.Body) + response.Body.Close() + return archive } diff --git a/api/http/handler/edgegroups/edgegroup_create.go b/api/http/handler/edgegroups/edgegroup_create.go index 68340d7c0..18797f14a 100644 --- a/api/http/handler/edgegroups/edgegroup_create.go +++ b/api/http/handler/edgegroups/edgegroup_create.go @@ -6,7 +6,6 @@ import ( httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" - "github.com/portainer/libhttp/response" portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/dataservices" "github.com/portainer/portainer/api/internal/endpointutils" @@ -26,12 +25,15 @@ func (payload *edgeGroupCreatePayload) Validate(r *http.Request) error { if govalidator.IsNull(payload.Name) { return errors.New("invalid Edge group name") } + if payload.Dynamic && len(payload.TagIDs) == 0 { return errors.New("tagIDs is mandatory for a dynamic Edge group") } + if !payload.Dynamic && len(payload.Endpoints) == 0 { return errors.New("environment is mandatory for a static Edge group") } + return nil } @@ -56,7 +58,6 @@ func (handler *Handler) edgeGroupCreate(w http.ResponseWriter, r *http.Request) } var edgeGroup *portainer.EdgeGroup - err = handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error { edgeGroups, err := tx.EdgeGroup().EdgeGroups() if err != nil { @@ -101,13 +102,6 @@ func (handler *Handler) edgeGroupCreate(w http.ResponseWriter, r *http.Request) return nil }) - if err != nil { - if httpErr, ok := err.(*httperror.HandlerError); ok { - return httpErr - } - return httperror.InternalServerError("Unexpected error", err) - } - - return response.JSON(w, edgeGroup) + return txResponse(w, edgeGroup, err) } diff --git a/api/http/handler/edgegroups/edgegroup_update.go b/api/http/handler/edgegroups/edgegroup_update.go index ee1b8b3a5..0cffc1201 100644 --- a/api/http/handler/edgegroups/edgegroup_update.go +++ b/api/http/handler/edgegroups/edgegroup_update.go @@ -6,8 +6,8 @@ import ( httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" - "github.com/portainer/libhttp/response" portainer "github.com/portainer/portainer/api" + "github.com/portainer/portainer/api/dataservices" "github.com/portainer/portainer/api/internal/edge" "github.com/portainer/portainer/api/internal/endpointutils" "github.com/portainer/portainer/api/internal/slices" @@ -27,12 +27,15 @@ func (payload *edgeGroupUpdatePayload) Validate(r *http.Request) error { if govalidator.IsNull(payload.Name) { return errors.New("invalid Edge group name") } + if payload.Dynamic && len(payload.TagIDs) == 0 { return errors.New("tagIDs is mandatory for a dynamic Edge group") } + if !payload.Dynamic && len(payload.Endpoints) == 0 { return errors.New("environments is mandatory for a static Edge group") } + return nil } @@ -62,128 +65,135 @@ func (handler *Handler) edgeGroupUpdate(w http.ResponseWriter, r *http.Request) return httperror.BadRequest("Invalid request payload", err) } - edgeGroup, err := handler.DataStore.EdgeGroup().EdgeGroup(portainer.EdgeGroupID(edgeGroupID)) - if handler.DataStore.IsErrObjectNotFound(err) { - return httperror.NotFound("Unable to find an Edge group with the specified identifier inside the database", err) - } else if err != nil { - return httperror.InternalServerError("Unable to find an Edge group with the specified identifier inside the database", err) - } - - if payload.Name != "" { - edgeGroups, err := handler.DataStore.EdgeGroup().EdgeGroups() - if err != nil { - return httperror.InternalServerError("Unable to retrieve Edge groups from the database", err) - } - for _, edgeGroup := range edgeGroups { - if edgeGroup.Name == payload.Name && edgeGroup.ID != portainer.EdgeGroupID(edgeGroupID) { - return httperror.BadRequest("Edge group name must be unique", errors.New("edge group name must be unique")) - } + var edgeGroup *portainer.EdgeGroup + err = handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error { + edgeGroup, err = tx.EdgeGroup().EdgeGroup(portainer.EdgeGroupID(edgeGroupID)) + if handler.DataStore.IsErrObjectNotFound(err) { + return httperror.NotFound("Unable to find an Edge group with the specified identifier inside the database", err) + } else if err != nil { + return httperror.InternalServerError("Unable to find an Edge group with the specified identifier inside the database", err) } - edgeGroup.Name = payload.Name - } - endpoints, err := handler.DataStore.Endpoint().Endpoints() - if err != nil { - return httperror.InternalServerError("Unable to retrieve environments from database", err) - } - - endpointGroups, err := handler.DataStore.EndpointGroup().EndpointGroups() - if err != nil { - return httperror.InternalServerError("Unable to retrieve environment groups from database", err) - } - - oldRelatedEndpoints := edge.EdgeGroupRelatedEndpoints(edgeGroup, endpoints, endpointGroups) - - edgeGroup.Dynamic = payload.Dynamic - if edgeGroup.Dynamic { - edgeGroup.TagIDs = payload.TagIDs - } else { - endpointIDs := []portainer.EndpointID{} - for _, endpointID := range payload.Endpoints { - endpoint, err := handler.DataStore.Endpoint().Endpoint(endpointID) + if payload.Name != "" { + edgeGroups, err := tx.EdgeGroup().EdgeGroups() if err != nil { - return httperror.InternalServerError("Unable to retrieve environment from the database", err) + return httperror.InternalServerError("Unable to retrieve Edge groups from the database", err) } - if endpointutils.IsEdgeEndpoint(endpoint) { - endpointIDs = append(endpointIDs, endpoint.ID) + for _, edgeGroup := range edgeGroups { + if edgeGroup.Name == payload.Name && edgeGroup.ID != portainer.EdgeGroupID(edgeGroupID) { + return httperror.BadRequest("Edge group name must be unique", errors.New("edge group name must be unique")) + } } + + edgeGroup.Name = payload.Name } - edgeGroup.Endpoints = endpointIDs - } - if payload.PartialMatch != nil { - edgeGroup.PartialMatch = *payload.PartialMatch - } - - err = handler.DataStore.EdgeGroup().UpdateEdgeGroup(edgeGroup.ID, edgeGroup) - if err != nil { - return httperror.InternalServerError("Unable to persist Edge group changes inside the database", err) - } - - newRelatedEndpoints := edge.EdgeGroupRelatedEndpoints(edgeGroup, endpoints, endpointGroups) - endpointsToUpdate := append(newRelatedEndpoints, oldRelatedEndpoints...) - - edgeJobs, err := handler.DataStore.EdgeJob().EdgeJobs() - if err != nil { - return httperror.InternalServerError("Unable to fetch Edge jobs", err) - } - - for _, endpointID := range endpointsToUpdate { - err = handler.updateEndpointStacks(endpointID) + endpoints, err := tx.Endpoint().Endpoints() if err != nil { - return httperror.InternalServerError("Unable to persist Environment relation changes inside the database", err) + return httperror.InternalServerError("Unable to retrieve environments from database", err) } - endpoint, err := handler.DataStore.Endpoint().Endpoint(endpointID) + endpointGroups, err := tx.EndpointGroup().EndpointGroups() if err != nil { - return httperror.InternalServerError("Unable to get Environment from database", err) + return httperror.InternalServerError("Unable to retrieve environment groups from database", err) } - if !endpointutils.IsEdgeEndpoint(endpoint) { - continue - } + oldRelatedEndpoints := edge.EdgeGroupRelatedEndpoints(edgeGroup, endpoints, endpointGroups) - var operation string - if slices.Contains(newRelatedEndpoints, endpointID) { - operation = "add" - } else if slices.Contains(oldRelatedEndpoints, endpointID) { - operation = "remove" + edgeGroup.Dynamic = payload.Dynamic + if edgeGroup.Dynamic { + edgeGroup.TagIDs = payload.TagIDs } else { - continue + endpointIDs := []portainer.EndpointID{} + for _, endpointID := range payload.Endpoints { + endpoint, err := tx.Endpoint().Endpoint(endpointID) + if err != nil { + return httperror.InternalServerError("Unable to retrieve environment from the database", err) + } + + if endpointutils.IsEdgeEndpoint(endpoint) { + endpointIDs = append(endpointIDs, endpoint.ID) + } + } + edgeGroup.Endpoints = endpointIDs } - err = handler.updateEndpointEdgeJobs(edgeGroup.ID, endpoint, edgeJobs, operation) + if payload.PartialMatch != nil { + edgeGroup.PartialMatch = *payload.PartialMatch + } + + err = tx.EdgeGroup().UpdateEdgeGroup(edgeGroup.ID, edgeGroup) if err != nil { - return httperror.InternalServerError("Unable to persist Environment Edge Jobs changes inside the database", err) + return httperror.InternalServerError("Unable to persist Edge group changes inside the database", err) } - } - return response.JSON(w, edgeGroup) + newRelatedEndpoints := edge.EdgeGroupRelatedEndpoints(edgeGroup, endpoints, endpointGroups) + endpointsToUpdate := append(newRelatedEndpoints, oldRelatedEndpoints...) + + edgeJobs, err := tx.EdgeJob().EdgeJobs() + if err != nil { + return httperror.InternalServerError("Unable to fetch Edge jobs", err) + } + + for _, endpointID := range endpointsToUpdate { + err = handler.updateEndpointStacks(tx, endpointID) + if err != nil { + return httperror.InternalServerError("Unable to persist Environment relation changes inside the database", err) + } + + endpoint, err := tx.Endpoint().Endpoint(endpointID) + if err != nil { + return httperror.InternalServerError("Unable to get Environment from database", err) + } + + if !endpointutils.IsEdgeEndpoint(endpoint) { + continue + } + + var operation string + if slices.Contains(newRelatedEndpoints, endpointID) { + operation = "add" + } else if slices.Contains(oldRelatedEndpoints, endpointID) { + operation = "remove" + } else { + continue + } + + err = handler.updateEndpointEdgeJobs(edgeGroup.ID, endpoint, edgeJobs, operation) + if err != nil { + return httperror.InternalServerError("Unable to persist Environment Edge Jobs changes inside the database", err) + } + } + + return nil + }) + + return txResponse(w, edgeGroup, err) } -func (handler *Handler) updateEndpointStacks(endpointID portainer.EndpointID) error { - relation, err := handler.DataStore.EndpointRelation().EndpointRelation(endpointID) +func (handler *Handler) updateEndpointStacks(tx dataservices.DataStoreTx, endpointID portainer.EndpointID) error { + relation, err := tx.EndpointRelation().EndpointRelation(endpointID) if err != nil { return err } - endpoint, err := handler.DataStore.Endpoint().Endpoint(endpointID) + endpoint, err := tx.Endpoint().Endpoint(endpointID) if err != nil { return err } - endpointGroup, err := handler.DataStore.EndpointGroup().EndpointGroup(endpoint.GroupID) + endpointGroup, err := tx.EndpointGroup().EndpointGroup(endpoint.GroupID) if err != nil { return err } - edgeGroups, err := handler.DataStore.EdgeGroup().EdgeGroups() + edgeGroups, err := tx.EdgeGroup().EdgeGroups() if err != nil { return err } - edgeStacks, err := handler.DataStore.EdgeStack().EdgeStacks() + edgeStacks, err := tx.EdgeStack().EdgeStacks() if err != nil { return err } @@ -197,7 +207,7 @@ func (handler *Handler) updateEndpointStacks(endpointID portainer.EndpointID) er relation.EdgeStacks = edgeStackSet - return handler.DataStore.EndpointRelation().UpdateEndpointRelation(endpoint.ID, relation) + return tx.EndpointRelation().UpdateEndpointRelation(endpoint.ID, relation) } func (handler *Handler) updateEndpointEdgeJobs(edgeGroupID portainer.EdgeGroupID, endpoint *portainer.Endpoint, edgeJobs []portainer.EdgeJob, operation string) error { diff --git a/api/http/handler/edgegroups/handler.go b/api/http/handler/edgegroups/handler.go index 5b950a581..3e1a44e74 100644 --- a/api/http/handler/edgegroups/handler.go +++ b/api/http/handler/edgegroups/handler.go @@ -3,11 +3,13 @@ package edgegroups import ( "net/http" - "github.com/gorilla/mux" httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/response" portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/dataservices" "github.com/portainer/portainer/api/http/security" + + "github.com/gorilla/mux" ) // Handler is the HTTP handler used to handle environment(endpoint) group operations. @@ -34,3 +36,15 @@ func NewHandler(bouncer *security.RequestBouncer) *Handler { bouncer.AdminAccess(bouncer.EdgeComputeOperation(httperror.LoggerHandler(h.edgeGroupDelete)))).Methods(http.MethodDelete) return h } + +func txResponse(w http.ResponseWriter, r any, err error) *httperror.HandlerError { + if err != nil { + if httpErr, ok := err.(*httperror.HandlerError); ok { + return httpErr + } + + return httperror.InternalServerError("Unexpected error", err) + } + + return response.JSON(w, r) +} diff --git a/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go b/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go index c96437604..23d747365 100644 --- a/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go +++ b/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go @@ -81,16 +81,14 @@ func (handler *Handler) endpointEdgeStatusInspect(w http.ResponseWriter, r *http } if _, ok := handler.DataStore.Endpoint().Heartbeat(portainer.EndpointID(endpointID)); !ok { - return httperror.NotFound("Unable to find an environment with the specified identifier inside the database", nil) + // EE-5910 + return httperror.Forbidden("Permission denied to access environment", errors.New("the device has not been trusted yet")) } endpoint, err := handler.DataStore.Endpoint().Endpoint(portainer.EndpointID(endpointID)) if err != nil { - if handler.DataStore.IsErrObjectNotFound(err) { - return httperror.NotFound("Unable to find an environment with the specified identifier inside the database", err) - } - - return httperror.InternalServerError("Unable to find an environment with the specified identifier inside the database", err) + // EE-5910 + return httperror.Forbidden("Permission denied to access environment", errors.New("the device has not been trusted yet")) } err = handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint) diff --git a/api/http/handler/endpointedge/endpointedge_status_inspect_test.go b/api/http/handler/endpointedge/endpointedge_status_inspect_test.go index 442f86807..91c32a0f6 100644 --- a/api/http/handler/endpointedge/endpointedge_status_inspect_test.go +++ b/api/http/handler/endpointedge/endpointedge_status_inspect_test.go @@ -30,7 +30,7 @@ var endpointTestCases = []endpointTestCase{ { portainer.Endpoint{}, portainer.EndpointRelation{}, - http.StatusNotFound, + http.StatusForbidden, }, { portainer.Endpoint{ @@ -43,7 +43,7 @@ var endpointTestCases = []endpointTestCase{ portainer.EndpointRelation{ EndpointID: -1, }, - http.StatusNotFound, + http.StatusForbidden, }, { portainer.Endpoint{ diff --git a/api/http/handler/endpoints/endpoint_create.go b/api/http/handler/endpoints/endpoint_create.go index 94abcf113..ecf16e52e 100644 --- a/api/http/handler/endpoints/endpoint_create.go +++ b/api/http/handler/endpoints/endpoint_create.go @@ -38,7 +38,6 @@ type endpointCreatePayload struct { AzureAuthenticationKey string TagIDs []portainer.TagID EdgeCheckinInterval int - IsEdgeDevice bool } type endpointCreationEnum int @@ -381,7 +380,6 @@ func (handler *Handler) createEdgeAgentEndpoint(payload *endpointCreatePayload) EdgeKey: edgeKey, EdgeCheckinInterval: payload.EdgeCheckinInterval, Kubernetes: portainer.KubernetesDefault(), - IsEdgeDevice: payload.IsEdgeDevice, UserTrusted: true, } @@ -435,7 +433,6 @@ func (handler *Handler) createUnsecuredEndpoint(payload *endpointCreatePayload) Status: portainer.EndpointStatusUp, Snapshots: []portainer.DockerSnapshot{}, Kubernetes: portainer.KubernetesDefault(), - IsEdgeDevice: payload.IsEdgeDevice, } err := handler.snapshotAndPersistEndpoint(endpoint) @@ -501,7 +498,6 @@ func (handler *Handler) createTLSSecuredEndpoint(payload *endpointCreatePayload, Status: portainer.EndpointStatusUp, Snapshots: []portainer.DockerSnapshot{}, Kubernetes: portainer.KubernetesDefault(), - IsEdgeDevice: payload.IsEdgeDevice, } endpoint.Agent.Version = agentVersion diff --git a/api/http/handler/endpoints/endpoint_dockerhub_status.go b/api/http/handler/endpoints/endpoint_dockerhub_status.go index 1c4e05227..a102c695b 100644 --- a/api/http/handler/endpoints/endpoint_dockerhub_status.go +++ b/api/http/handler/endpoints/endpoint_dockerhub_status.go @@ -4,6 +4,7 @@ import ( "encoding/json" "errors" "fmt" + "io" "net/http" "strconv" "strings" @@ -128,7 +129,6 @@ func getDockerHubToken(httpClient *client.HTTPClient, registry *portainer.Regist } func getDockerHubLimits(httpClient *client.HTTPClient, token string) (*dockerhubStatusResponse, error) { - requestURL := "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" req, err := http.NewRequest(http.MethodHead, requestURL, nil) @@ -142,7 +142,9 @@ func getDockerHubLimits(httpClient *client.HTTPClient, token string) (*dockerhub if err != nil { return nil, err } - defer resp.Body.Close() + + io.Copy(io.Discard, resp.Body) + resp.Body.Close() if resp.StatusCode != http.StatusOK { return nil, errors.New("failed fetching dockerhub limits") diff --git a/api/http/handler/endpoints/endpoint_settings_update.go b/api/http/handler/endpoints/endpoint_settings_update.go index 68713f385..34a9abf6a 100644 --- a/api/http/handler/endpoints/endpoint_settings_update.go +++ b/api/http/handler/endpoints/endpoint_settings_update.go @@ -28,6 +28,10 @@ type endpointSettingsUpdatePayload struct { AllowSysctlSettingForRegularUsers *bool `json:"allowSysctlSettingForRegularUsers" example:"true"` // Whether host management features are enabled EnableHostManagementFeatures *bool `json:"enableHostManagementFeatures" example:"true"` + + EnableGPUManagement *bool `json:"enableGPUManagement" example:"false"` + + Gpus []portainer.Pair `json:"gpus"` } func (payload *endpointSettingsUpdatePayload) Validate(r *http.Request) error { @@ -107,6 +111,14 @@ func (handler *Handler) endpointSettingsUpdate(w http.ResponseWriter, r *http.Re securitySettings.EnableHostManagementFeatures = *payload.EnableHostManagementFeatures } + if payload.EnableGPUManagement != nil { + endpoint.EnableGPUManagement = *payload.EnableGPUManagement + } + + if payload.Gpus != nil { + endpoint.Gpus = payload.Gpus + } + endpoint.SecuritySettings = securitySettings err = handler.DataStore.Endpoint().UpdateEndpoint(portainer.EndpointID(endpointID), endpoint) diff --git a/api/http/handler/handler.go b/api/http/handler/handler.go index e79b7b9e9..50a7dc040 100644 --- a/api/http/handler/handler.go +++ b/api/http/handler/handler.go @@ -82,7 +82,7 @@ type Handler struct { } // @title PortainerCE API -// @version 2.18.0 +// @version 2.19.0 // @description.markdown api-description.md // @termsOfService diff --git a/api/http/handler/hostmanagement/fdo/profile_create.go b/api/http/handler/hostmanagement/fdo/profile_create.go index f4837618d..d83ad9b50 100644 --- a/api/http/handler/hostmanagement/fdo/profile_create.go +++ b/api/http/handler/hostmanagement/fdo/profile_create.go @@ -48,15 +48,16 @@ func (handler *Handler) createProfile(w http.ResponseWriter, r *http.Request) *h return httperror.BadRequest("Invalid query parameter: method", err) } - switch method { - case "editor": + if method == "editor" { return handler.createFDOProfileFromFileContent(w, r) } + return httperror.BadRequest("Invalid method. Value must be one of: editor", errors.New("invalid method")) } func (handler *Handler) createFDOProfileFromFileContent(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { var payload createProfileFromFileContentPayload + err := request.DecodeAndValidateJSONPayload(r, &payload) if err != nil { return httperror.BadRequest("Invalid request payload", err) @@ -66,6 +67,7 @@ func (handler *Handler) createFDOProfileFromFileContent(w http.ResponseWriter, r if err != nil { return httperror.InternalServerError(err.Error(), err) } + if !isUnique { return &httperror.HandlerError{StatusCode: http.StatusConflict, Message: fmt.Sprintf("A profile with the name '%s' already exists", payload.Name), Err: errors.New("a profile already exists with this name")} } @@ -80,6 +82,7 @@ func (handler *Handler) createFDOProfileFromFileContent(w http.ResponseWriter, r if err != nil { return httperror.InternalServerError("Unable to persist profile file on disk", err) } + profile.FilePath = filePath profile.DateCreated = time.Now().Unix() diff --git a/api/http/handler/stacks/stack_update_git_redeploy.go b/api/http/handler/stacks/stack_update_git_redeploy.go index 3eb9d3a9b..13e0bcb3f 100644 --- a/api/http/handler/stacks/stack_update_git_redeploy.go +++ b/api/http/handler/stacks/stack_update_git_redeploy.go @@ -1,7 +1,6 @@ package stacks import ( - "fmt" "net/http" "time" @@ -10,7 +9,6 @@ import ( "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" portainer "github.com/portainer/portainer/api" - "github.com/portainer/portainer/api/filesystem" "github.com/portainer/portainer/api/git" httperrors "github.com/portainer/portainer/api/http/errors" "github.com/portainer/portainer/api/http/security" @@ -137,12 +135,6 @@ func (handler *Handler) stackGitRedeploy(w http.ResponseWriter, r *http.Request) } } - backupProjectPath := fmt.Sprintf("%s-old", stack.ProjectPath) - err = filesystem.MoveDirectory(stack.ProjectPath, backupProjectPath) - if err != nil { - return httperror.InternalServerError("Unable to move git repository directory", err) - } - repositoryUsername := "" repositoryPassword := "" if payload.RepositoryAuthentication { diff --git a/api/http/handler/system/system_info.go b/api/http/handler/system/system_info.go index bd2e413a4..d39949cd4 100644 --- a/api/http/handler/system/system_info.go +++ b/api/http/handler/system/system_info.go @@ -10,10 +10,9 @@ import ( ) type systemInfoResponse struct { - Platform plf.ContainerPlatform `json:"platform"` - EdgeAgents int `json:"edgeAgents"` - EdgeDevices int `json:"edgeDevices"` - Agents int `json:"agents"` + Platform plf.ContainerPlatform `json:"platform"` + EdgeAgents int `json:"edgeAgents"` + Agents int `json:"agents"` } // @id systemInfo @@ -34,7 +33,6 @@ func (handler *Handler) systemInfo(w http.ResponseWriter, r *http.Request) *http agents := 0 edgeAgents := 0 - edgeDevices := 0 for _, environment := range environments { if endpointutils.IsAgentEndpoint(&environment) { @@ -45,9 +43,6 @@ func (handler *Handler) systemInfo(w http.ResponseWriter, r *http.Request) *http edgeAgents++ } - if environment.IsEdgeDevice { - edgeDevices++ - } } platform, err := plf.DetermineContainerPlatform() @@ -56,9 +51,8 @@ func (handler *Handler) systemInfo(w http.ResponseWriter, r *http.Request) *http } return response.JSON(w, &systemInfoResponse{ - EdgeAgents: edgeAgents, - EdgeDevices: edgeDevices, - Agents: agents, - Platform: platform, + EdgeAgents: edgeAgents, + Agents: agents, + Platform: platform, }) } diff --git a/api/http/handler/system/system_upgrade.go b/api/http/handler/system/system_upgrade.go index 66bb27852..0669a742d 100644 --- a/api/http/handler/system/system_upgrade.go +++ b/api/http/handler/system/system_upgrade.go @@ -8,6 +8,8 @@ import ( httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" + portainer "github.com/portainer/portainer/api" + "github.com/portainer/portainer/api/platform" ) type systemUpgradePayload struct { @@ -28,13 +30,19 @@ func (payload *systemUpgradePayload) Validate(r *http.Request) error { return nil } +var platformToEndpointType = map[platform.ContainerPlatform]portainer.EndpointType{ + platform.PlatformDockerStandalone: portainer.DockerEnvironment, + platform.PlatformDockerSwarm: portainer.DockerEnvironment, + platform.PlatformKubernetes: portainer.KubernetesLocalEnvironment, +} + // @id systemUpgrade // @summary Upgrade Portainer to BE // @description Upgrade Portainer to BE // @description **Access policy**: administrator // @tags system // @produce json -// @success 200 {object} status "Success" +// @success 204 {object} status "Success" // @router /system/upgrade [post] func (handler *Handler) systemUpgrade(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { payload, err := request.GetPayload[systemUpgradePayload](r) @@ -42,10 +50,40 @@ func (handler *Handler) systemUpgrade(w http.ResponseWriter, r *http.Request) *h return httperror.BadRequest("Invalid request payload", err) } - err = handler.upgradeService.Upgrade(payload.License) + environment, err := handler.guessLocalEndpoint() + if err != nil { + return httperror.InternalServerError("Failed to guess local endpoint", err) + } + + err = handler.upgradeService.Upgrade(environment, payload.License) if err != nil { return httperror.InternalServerError("Failed to upgrade Portainer", err) } return response.Empty(w) } + +func (handler *Handler) guessLocalEndpoint() (*portainer.Endpoint, error) { + platform, err := platform.DetermineContainerPlatform() + if err != nil { + return nil, errors.Wrap(err, "failed to determine container platform") + } + + endpointType, ok := platformToEndpointType[platform] + if !ok { + return nil, errors.New("failed to determine endpoint type") + } + + endpoints, err := handler.dataStore.Endpoint().Endpoints() + if err != nil { + return nil, errors.Wrap(err, "failed to retrieve endpoints") + } + + for _, endpoint := range endpoints { + if endpoint.Type == endpointType { + return &endpoint, nil + } + } + + return nil, errors.New("failed to find local endpoint") +} diff --git a/api/http/handler/templates/template_file.go b/api/http/handler/templates/template_file.go index 3299f25cd..e7e5a23a0 100644 --- a/api/http/handler/templates/template_file.go +++ b/api/http/handler/templates/template_file.go @@ -63,6 +63,7 @@ func (handler *Handler) ifRequestedTemplateExists(payload *filePayload) *httperr return nil } } + return httperror.InternalServerError("Invalid template", errors.New("requested template does not exist")) } @@ -82,6 +83,7 @@ func (handler *Handler) ifRequestedTemplateExists(payload *filePayload) *httperr // @router /templates/file [post] func (handler *Handler) templateFile(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { var payload filePayload + err := request.DecodeAndValidateJSONPayload(r, &payload) if err != nil { return httperror.BadRequest("Invalid request payload", err) @@ -112,11 +114,9 @@ func (handler *Handler) templateFile(w http.ResponseWriter, r *http.Request) *ht } -func (handler *Handler) cleanUp(projectPath string) error { +func (handler *Handler) cleanUp(projectPath string) { err := handler.FileService.RemoveDirectory(projectPath) if err != nil { log.Debug().Err(err).Msg("HTTP error: unable to cleanup stack creation") } - - return nil } diff --git a/api/http/handler/users/user_update.go b/api/http/handler/users/user_update.go index 43d8b4dab..844f38806 100644 --- a/api/http/handler/users/user_update.go +++ b/api/http/handler/users/user_update.go @@ -18,8 +18,6 @@ import ( type themePayload struct { // Color represents the color theme of the UI Color *string `json:"color" example:"dark" enums:"dark,light,highcontrast,auto"` - // SubtleUpgradeButton indicates if the upgrade banner should be displayed in a subtle way - SubtleUpgradeButton *bool `json:"subtleUpgradeButton" example:"false"` } type userUpdatePayload struct { @@ -33,11 +31,11 @@ type userUpdatePayload struct { func (payload *userUpdatePayload) Validate(r *http.Request) error { if govalidator.Contains(payload.Username, " ") { - return errors.New("Invalid username. Must not contain any whitespace") + return errors.New("invalid username. Must not contain any whitespace") } if payload.Role != 0 && payload.Role != 1 && payload.Role != 2 { - return errors.New("Invalid role value. Value must be one of: 1 (administrator) or 2 (regular user)") + return errors.New("invalid role value. Value must be one of: 1 (administrator) or 2 (regular user)") } return nil } @@ -120,10 +118,6 @@ func (handler *Handler) userUpdate(w http.ResponseWriter, r *http.Request) *http if payload.Theme.Color != nil { user.ThemeSettings.Color = *payload.Theme.Color } - - if payload.Theme.SubtleUpgradeButton != nil { - user.ThemeSettings.SubtleUpgradeButton = *payload.Theme.SubtleUpgradeButton - } } if payload.Role != 0 { diff --git a/api/http/handler/websocket/stream.go b/api/http/handler/websocket/stream.go index 131951803..77ce78566 100644 --- a/api/http/handler/websocket/stream.go +++ b/api/http/handler/websocket/stream.go @@ -14,48 +14,57 @@ func streamFromWebsocketToWriter(websocketConn *websocket.Conn, writer io.Writer _, in, err := websocketConn.ReadMessage() if err != nil { errorChan <- err + break } _, err = writer.Write(in) if err != nil { errorChan <- err + break } } } func streamFromReaderToWebsocket(websocketConn *websocket.Conn, reader io.Reader, errorChan chan error) { + out := make([]byte, readerBufferSize) + for { - out := make([]byte, readerBufferSize) - _, err := reader.Read(out) + n, err := reader.Read(out) if err != nil { errorChan <- err + break } - processedOutput := validString(string(out[:])) + processedOutput := validString(string(out[:n])) err = websocketConn.WriteMessage(websocket.TextMessage, []byte(processedOutput)) if err != nil { errorChan <- err + break } } } func validString(s string) string { - if !utf8.ValidString(s) { - v := make([]rune, 0, len(s)) - for i, r := range s { - if r == utf8.RuneError { - _, size := utf8.DecodeRuneInString(s[i:]) - if size == 1 { - continue - } - } - v = append(v, r) - } - s = string(v) + if utf8.ValidString(s) { + return s } - return s + + v := make([]rune, 0, len(s)) + + for i, r := range s { + if r == utf8.RuneError { + _, size := utf8.DecodeRuneInString(s[i:]) + if size == 1 { + continue + } + } + + v = append(v, r) + } + + return string(v) } diff --git a/api/http/proxy/factory/docker/portainer.go b/api/http/proxy/factory/docker/portainer.go index 437d0427f..be046db0d 100644 --- a/api/http/proxy/factory/docker/portainer.go +++ b/api/http/proxy/factory/docker/portainer.go @@ -26,6 +26,7 @@ func (transport *Transport) applyPortainerContainers(resources []interface{}) ([ responseObject, _ = transport.applyPortainerContainer(responseObject) decoratedResourceData = append(decoratedResourceData, responseObject) } + return decoratedResourceData, nil } @@ -34,8 +35,10 @@ func (transport *Transport) applyPortainerContainer(resourceObject map[string]in if !ok { return resourceObject, nil } + if len(resourceId) >= 12 && resourceId[0:12] == portainerContainerId { resourceObject["IsPortainer"] = true } + return resourceObject, nil } diff --git a/api/http/proxy/factory/kubernetes/transport.go b/api/http/proxy/factory/kubernetes/transport.go index 1f05092f8..aeab4d876 100644 --- a/api/http/proxy/factory/kubernetes/transport.go +++ b/api/http/proxy/factory/kubernetes/transport.go @@ -150,8 +150,7 @@ func (transport *baseTransport) getRoundTripToken(request *http.Request, tokenMa func decorateAgentRequest(r *http.Request, dataStore dataservices.DataStore) error { requestPath := strings.TrimPrefix(r.URL.Path, "/v2") - switch { - case strings.HasPrefix(requestPath, "/dockerhub"): + if strings.HasPrefix(requestPath, "/dockerhub") { return decorateAgentDockerHubRequest(r, dataStore) } diff --git a/api/internal/endpointutils/endpointutils.go b/api/internal/endpointutils/endpointutils.go index 163f785c7..918217ff3 100644 --- a/api/internal/endpointutils/endpointutils.go +++ b/api/internal/endpointutils/endpointutils.go @@ -76,6 +76,16 @@ func EndpointSet(endpointIDs []portainer.EndpointID) map[portainer.EndpointID]bo } func InitialIngressClassDetection(endpoint *portainer.Endpoint, endpointService dataservices.EndpointService, factory *cli.ClientFactory) { + if endpoint.Kubernetes.Flags.IsServerIngressClassDetected { + return + } + defer func() { + endpoint.Kubernetes.Flags.IsServerIngressClassDetected = true + endpointService.UpdateEndpoint( + portainer.EndpointID(endpoint.ID), + endpoint, + ) + }() cli, err := factory.GetKubeClient(endpoint) if err != nil { log.Debug().Err(err).Msg("unable to create kubernetes client for ingress class detection") @@ -107,6 +117,16 @@ func InitialIngressClassDetection(endpoint *portainer.Endpoint, endpointService } func InitialMetricsDetection(endpoint *portainer.Endpoint, endpointService dataservices.EndpointService, factory *cli.ClientFactory) { + if endpoint.Kubernetes.Flags.IsServerMetricsDetected { + return + } + defer func() { + endpoint.Kubernetes.Flags.IsServerMetricsDetected = true + endpointService.UpdateEndpoint( + portainer.EndpointID(endpoint.ID), + endpoint, + ) + }() cli, err := factory.GetKubeClient(endpoint) if err != nil { log.Debug().Err(err).Msg("unable to create kubernetes client for initial metrics detection") @@ -118,11 +138,6 @@ func InitialMetricsDetection(endpoint *portainer.Endpoint, endpointService datas return } endpoint.Kubernetes.Configuration.UseServerMetrics = true - endpoint.Kubernetes.Flags.IsServerMetricsDetected = true - err = endpointService.UpdateEndpoint( - portainer.EndpointID(endpoint.ID), - endpoint, - ) if err != nil { log.Debug().Err(err).Msg("unable to enable UseServerMetrics inside the database") return @@ -158,6 +173,16 @@ func storageDetect(endpoint *portainer.Endpoint, endpointService dataservices.En } func InitialStorageDetection(endpoint *portainer.Endpoint, endpointService dataservices.EndpointService, factory *cli.ClientFactory) { + if endpoint.Kubernetes.Flags.IsServerStorageDetected { + return + } + defer func() { + endpoint.Kubernetes.Flags.IsServerStorageDetected = true + endpointService.UpdateEndpoint( + portainer.EndpointID(endpoint.ID), + endpoint, + ) + }() log.Info().Msg("attempting to detect storage classes in the cluster") err := storageDetect(endpoint, endpointService, factory) if err == nil { diff --git a/api/internal/upgrade/upgrade.go b/api/internal/upgrade/upgrade.go index 73283972d..a4552fae3 100644 --- a/api/internal/upgrade/upgrade.go +++ b/api/internal/upgrade/upgrade.go @@ -1,23 +1,13 @@ package upgrade import ( - "bytes" - "context" "fmt" - "os" - "strings" - "time" - "github.com/cbroglie/mustache" - "github.com/docker/docker/api/types" - "github.com/docker/docker/api/types/filters" "github.com/pkg/errors" libstack "github.com/portainer/docker-compose-wrapper" portainer "github.com/portainer/portainer/api" - "github.com/portainer/portainer/api/docker" - "github.com/portainer/portainer/api/filesystem" + "github.com/portainer/portainer/api/kubernetes/cli" "github.com/portainer/portainer/api/platform" - "github.com/rs/zerolog/log" ) const ( @@ -36,19 +26,23 @@ const ( ) type Service interface { - Upgrade(licenseKey string) error + Upgrade(environment *portainer.Endpoint, licenseKey string) error } type service struct { - composeDeployer libstack.Deployer - isUpdating bool - platform platform.ContainerPlatform - assetsPath string + composeDeployer libstack.Deployer + kubernetesClientFactory *cli.ClientFactory + + isUpdating bool + platform platform.ContainerPlatform + + assetsPath string } func NewService( assetsPath string, composeDeployer libstack.Deployer, + kubernetesClientFactory *cli.ClientFactory, ) (Service, error) { platform, err := platform.DetermineContainerPlatform() if err != nil { @@ -56,13 +50,14 @@ func NewService( } return &service{ - assetsPath: assetsPath, - composeDeployer: composeDeployer, - platform: platform, + assetsPath: assetsPath, + composeDeployer: composeDeployer, + kubernetesClientFactory: kubernetesClientFactory, + platform: platform, }, nil } -func (service *service) Upgrade(licenseKey string) error { +func (service *service) Upgrade(environment *portainer.Endpoint, licenseKey string) error { service.isUpdating = true switch service.platform { @@ -70,113 +65,9 @@ func (service *service) Upgrade(licenseKey string) error { return service.upgradeDocker(licenseKey, portainer.APIVersion, "standalone") case platform.PlatformDockerSwarm: return service.upgradeDocker(licenseKey, portainer.APIVersion, "swarm") - // case platform.PlatformKubernetes: - // case platform.PlatformPodman: - // case platform.PlatformNomad: - // default: + case platform.PlatformKubernetes: + return service.upgradeKubernetes(environment, licenseKey, portainer.APIVersion) } return fmt.Errorf("unsupported platform %s", service.platform) } - -func (service *service) upgradeDocker(licenseKey, version, envType string) error { - ctx := context.TODO() - templateName := filesystem.JoinPaths(service.assetsPath, "mustache-templates", mustacheUpgradeDockerTemplateFile) - - portainerImagePrefix := os.Getenv(portainerImagePrefixEnvVar) - if portainerImagePrefix == "" { - portainerImagePrefix = "portainer/portainer-ee" - } - - image := fmt.Sprintf("%s:%s", portainerImagePrefix, version) - - skipPullImage := os.Getenv(skipPullImageEnvVar) - - if err := service.checkImage(ctx, image, skipPullImage != ""); err != nil { - return err - } - - composeFile, err := mustache.RenderFile(templateName, map[string]string{ - "image": image, - "skip_pull_image": skipPullImage, - "updater_image": os.Getenv(updaterImageEnvVar), - "license": licenseKey, - "envType": envType, - }) - - log.Debug(). - Str("composeFile", composeFile). - Msg("Compose file for upgrade") - - if err != nil { - return errors.Wrap(err, "failed to render upgrade template") - } - - tmpDir := os.TempDir() - timeId := time.Now().Unix() - filePath := filesystem.JoinPaths(tmpDir, fmt.Sprintf("upgrade-%d.yml", timeId)) - - r := bytes.NewReader([]byte(composeFile)) - - err = filesystem.CreateFile(filePath, r) - if err != nil { - return errors.Wrap(err, "failed to create upgrade compose file") - } - - projectName := fmt.Sprintf( - "portainer-upgrade-%d-%s", - timeId, - strings.Replace(version, ".", "-", -1)) - - err = service.composeDeployer.Deploy( - ctx, - []string{filePath}, - libstack.DeployOptions{ - ForceRecreate: true, - AbortOnContainerExit: true, - Options: libstack.Options{ - ProjectName: projectName, - }, - }, - ) - - // optimally, server was restarted by the updater, so we should not reach this point - - if err != nil { - return errors.Wrap(err, "failed to deploy upgrade stack") - } - - return errors.New("upgrade failed: server should have been restarted by the updater") -} - -func (service *service) checkImage(ctx context.Context, image string, skipPullImage bool) error { - cli, err := docker.CreateClientFromEnv() - if err != nil { - return errors.Wrap(err, "failed to create docker client") - } - - if skipPullImage { - filters := filters.NewArgs() - filters.Add("reference", image) - images, err := cli.ImageList(ctx, types.ImageListOptions{ - Filters: filters, - }) - if err != nil { - return errors.Wrap(err, "failed to list images") - } - - if len(images) == 0 { - return errors.Errorf("image %s not found locally", image) - } - - return nil - } else { - // check if available on registry - _, err := cli.DistributionInspect(ctx, image, "") - if err != nil { - return errors.Errorf("image %s not found on registry", image) - } - - return nil - } -} diff --git a/api/internal/upgrade/upgrade_docker.go b/api/internal/upgrade/upgrade_docker.go new file mode 100644 index 000000000..c4865433f --- /dev/null +++ b/api/internal/upgrade/upgrade_docker.go @@ -0,0 +1,122 @@ +package upgrade + +import ( + "bytes" + "context" + "fmt" + "os" + "strings" + "time" + + "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/client" + libstack "github.com/portainer/docker-compose-wrapper" + "github.com/portainer/portainer/api/filesystem" + + "github.com/cbroglie/mustache" + "github.com/pkg/errors" + "github.com/rs/zerolog/log" +) + +func (service *service) upgradeDocker(licenseKey, version, envType string) error { + ctx := context.TODO() + templateName := filesystem.JoinPaths(service.assetsPath, "mustache-templates", mustacheUpgradeDockerTemplateFile) + + portainerImagePrefix := os.Getenv(portainerImagePrefixEnvVar) + if portainerImagePrefix == "" { + portainerImagePrefix = "portainer/portainer-ee" + } + + image := fmt.Sprintf("%s:%s", portainerImagePrefix, version) + + skipPullImage := os.Getenv(skipPullImageEnvVar) + + if err := service.checkImageForDocker(ctx, image, skipPullImage != ""); err != nil { + return err + } + + composeFile, err := mustache.RenderFile(templateName, map[string]string{ + "image": image, + "skip_pull_image": skipPullImage, + "updater_image": os.Getenv(updaterImageEnvVar), + "license": licenseKey, + "envType": envType, + }) + + log.Debug(). + Str("composeFile", composeFile). + Msg("Compose file for upgrade") + + if err != nil { + return errors.Wrap(err, "failed to render upgrade template") + } + + tmpDir := os.TempDir() + timeId := time.Now().Unix() + filePath := filesystem.JoinPaths(tmpDir, fmt.Sprintf("upgrade-%d.yml", timeId)) + + r := bytes.NewReader([]byte(composeFile)) + + err = filesystem.CreateFile(filePath, r) + if err != nil { + return errors.Wrap(err, "failed to create upgrade compose file") + } + + projectName := fmt.Sprintf( + "portainer-upgrade-%d-%s", + timeId, + strings.ReplaceAll(version, ".", "-")) + + err = service.composeDeployer.Deploy( + ctx, + []string{filePath}, + libstack.DeployOptions{ + ForceRecreate: true, + AbortOnContainerExit: true, + Options: libstack.Options{ + ProjectName: projectName, + }, + }, + ) + + // optimally, server was restarted by the updater, so we should not reach this point + + if err != nil { + return errors.Wrap(err, "failed to deploy upgrade stack") + } + + return errors.New("upgrade failed: server should have been restarted by the updater") +} + +func (service *service) checkImageForDocker(ctx context.Context, image string, skipPullImage bool) error { + cli, err := client.NewClientWithOpts(client.FromEnv) + if err != nil { + return errors.Wrap(err, "failed to create docker client") + } + + if skipPullImage { + filters := filters.NewArgs() + filters.Add("reference", image) + images, err := cli.ImageList(ctx, types.ImageListOptions{ + Filters: filters, + }) + if err != nil { + return errors.Wrap(err, "failed to list images") + } + + if len(images) == 0 { + return errors.Errorf("image %s not found locally", image) + } + + return nil + } else { + // check if available on registry + _, err := cli.DistributionInspect(ctx, image, "") + if err != nil { + return errors.Errorf("image %s not found on registry", image) + } + + return nil + } +} diff --git a/api/internal/upgrade/upgrade_kubernetes.go b/api/internal/upgrade/upgrade_kubernetes.go new file mode 100644 index 000000000..83bca9b78 --- /dev/null +++ b/api/internal/upgrade/upgrade_kubernetes.go @@ -0,0 +1,201 @@ +package upgrade + +import ( + "context" + "fmt" + "os" + "time" + + "github.com/pkg/errors" + portainer "github.com/portainer/portainer/api" + "github.com/rs/zerolog/log" + batchv1 "k8s.io/api/batch/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" +) + +func ptr[T any](i T) *T { return &i } + +func (service *service) upgradeKubernetes(environment *portainer.Endpoint, licenseKey, version string) error { + ctx := context.TODO() + + kubeCLI, err := service.kubernetesClientFactory.CreateClient(environment) + if err != nil { + return errors.WithMessage(err, "failed to get kubernetes client") + } + + namespace := "portainer" + taskName := fmt.Sprintf("portainer-upgrade-%d", time.Now().Unix()) + + jobsCli := kubeCLI.BatchV1().Jobs(namespace) + + updaterImage := os.Getenv(updaterImageEnvVar) + if updaterImage == "" { + updaterImage = "portainer/portainer-updater:latest" + } + + portainerImagePrefix := os.Getenv(portainerImagePrefixEnvVar) + if portainerImagePrefix == "" { + portainerImagePrefix = "portainer/portainer-ee" + } + + image := fmt.Sprintf("%s:%s", portainerImagePrefix, version) + + if err := service.checkImageForKubernetes(ctx, kubeCLI, namespace, image); err != nil { + return err + } + + job, err := jobsCli.Create(ctx, &batchv1.Job{ + ObjectMeta: metav1.ObjectMeta{ + Name: taskName, + Namespace: namespace, + }, + + Spec: batchv1.JobSpec{ + TTLSecondsAfterFinished: ptr[int32](5 * 60), // cleanup after 5 minutes + BackoffLimit: ptr[int32](0), + Template: corev1.PodTemplateSpec{ + Spec: corev1.PodSpec{ + + RestartPolicy: "Never", + ServiceAccountName: "portainer-sa-clusteradmin", + Containers: []corev1.Container{ + { + Name: taskName, + Image: updaterImage, + Args: []string{ + "--pretty-log", + "--log-level", "DEBUG", + "portainer", + "--env-type", "kubernetes", + "--image", image, + "--license", licenseKey, + }, + }, + }, + }, + }, + }, + }, metav1.CreateOptions{}) + + if err != nil { + return errors.WithMessage(err, "failed to create upgrade job") + } + + watcher, err := jobsCli.Watch(ctx, metav1.ListOptions{ + FieldSelector: "metadata.name=" + taskName, + TimeoutSeconds: ptr[int64](60), + }) + if err != nil { + return errors.WithMessage(err, "failed to watch upgrade job") + } + + for event := range watcher.ResultChan() { + job, ok := event.Object.(*batchv1.Job) + if !ok { + continue + } + + for _, c := range job.Status.Conditions { + if c.Type == batchv1.JobComplete { + log.Debug(). + Str("job", job.Name). + Msg("Upgrade job completed") + return nil + } + + if c.Type == batchv1.JobFailed { + return fmt.Errorf("upgrade failed: %s", c.Message) + } + } + } + + log.Debug(). + Str("job", job.Name). + Msg("Upgrade job created") + + return errors.New("upgrade failed: server should have been restarted by the updater") + +} + +func (service *service) checkImageForKubernetes(ctx context.Context, kubeCLI *kubernetes.Clientset, namespace, image string) error { + podsCli := kubeCLI.CoreV1().Pods(namespace) + + log.Debug(). + Str("image", image). + Msg("Checking image") + + podName := fmt.Sprintf("portainer-image-check-%d", time.Now().Unix()) + _, err := podsCli.Create(ctx, &corev1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: podName, + }, + Spec: corev1.PodSpec{ + RestartPolicy: "Never", + + Containers: []corev1.Container{ + { + Name: fmt.Sprint(podName, "-container"), + Image: image, + }, + }, + }, + }, metav1.CreateOptions{}) + + if err != nil { + log.Warn().Err(err).Msg("failed to create image check pod") + return errors.WithMessage(err, "failed to create image check pod") + } + + defer func() { + log.Debug(). + Str("pod", podName). + Msg("Deleting image check pod") + + if err := podsCli.Delete(ctx, podName, metav1.DeleteOptions{}); err != nil { + log.Warn().Err(err).Msg("failed to delete image check pod") + } + }() + + i := 0 + for { + time.Sleep(2 * time.Second) + + log.Debug(). + Str("image", image). + Int("try", i). + Msg("Checking image") + + i++ + + pod, err := podsCli.Get(ctx, podName, metav1.GetOptions{}) + if err != nil { + return errors.WithMessage(err, "failed to get image check pod") + } + + for _, containerStatus := range pod.Status.ContainerStatuses { + if containerStatus.Ready { + log.Debug(). + Str("image", image). + Str("pod", podName). + Msg("Image check container ready, assuming image is available") + + return nil + } + + if containerStatus.State.Waiting != nil { + if containerStatus.State.Waiting.Reason == "ErrImagePull" || containerStatus.State.Waiting.Reason == "ImagePullBackOff" { + log.Debug(). + Str("image", image). + Str("pod", podName). + Str("reason", containerStatus.State.Waiting.Reason). + Str("message", containerStatus.State.Waiting.Message). + Str("container", containerStatus.Name). + Msg("Image check container failed because of missing image") + return fmt.Errorf("image %s not found", image) + } + } + } + } +} diff --git a/api/kubernetes/cli/access.go b/api/kubernetes/cli/access.go index 729e3c801..20a8e070e 100644 --- a/api/kubernetes/cli/access.go +++ b/api/kubernetes/cli/access.go @@ -12,8 +12,8 @@ import ( // NamespaceAccessPoliciesDeleteNamespace removes stored policies associated with a given namespace func (kcl *KubeClient) NamespaceAccessPoliciesDeleteNamespace(ns string) error { - kcl.lock.Lock() - defer kcl.lock.Unlock() + kcl.mu.Lock() + defer kcl.mu.Unlock() policies, err := kcl.GetNamespaceAccessPolicies() if err != nil { @@ -42,6 +42,7 @@ func (kcl *KubeClient) GetNamespaceAccessPolicies() (map[string]portainer.K8sNam if err != nil { return nil, err } + return policies, nil } diff --git a/api/kubernetes/cli/access_test.go b/api/kubernetes/cli/access_test.go index db250546c..09bb28d9e 100644 --- a/api/kubernetes/cli/access_test.go +++ b/api/kubernetes/cli/access_test.go @@ -2,7 +2,6 @@ package cli import ( "context" - "sync" "testing" portainer "github.com/portainer/portainer/api" @@ -40,7 +39,6 @@ func Test_NamespaceAccessPoliciesDeleteNamespace_updatesPortainerConfig_whenConf k := &KubeClient{ cli: kfake.NewSimpleClientset(), instanceID: "instance", - lock: &sync.Mutex{}, } config := &ktypes.ConfigMap{ diff --git a/api/kubernetes/cli/client.go b/api/kubernetes/cli/client.go index d15d486bb..0b2157c73 100644 --- a/api/kubernetes/cli/client.go +++ b/api/kubernetes/cli/client.go @@ -7,17 +7,20 @@ import ( "sync" "time" - cmap "github.com/orcaman/concurrent-map" "github.com/patrickmn/go-cache" "github.com/pkg/errors" portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/dataservices" - "github.com/rs/zerolog/log" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" ) +const ( + DefaultKubeClientQPS = 30 + DefaultKubeClientBurst = 100 +) + type ( // ClientFactory is used to create Kubernetes clients ClientFactory struct { @@ -25,16 +28,17 @@ type ( reverseTunnelService portainer.ReverseTunnelService signatureService portainer.DigitalSignatureService instanceID string - endpointClients cmap.ConcurrentMap + endpointClients map[string]*KubeClient endpointProxyClients *cache.Cache AddrHTTPS string + mu sync.Mutex } // KubeClient represent a service used to execute Kubernetes operations KubeClient struct { cli kubernetes.Interface instanceID string - lock *sync.Mutex + mu sync.Mutex } ) @@ -53,7 +57,7 @@ func NewClientFactory(signatureService portainer.DigitalSignatureService, revers signatureService: signatureService, reverseTunnelService: reverseTunnelService, instanceID: instanceID, - endpointClients: cmap.New(), + endpointClients: make(map[string]*KubeClient), endpointProxyClients: cache.New(timeout, timeout), AddrHTTPS: addrHTTPS, }, nil @@ -65,82 +69,87 @@ func (factory *ClientFactory) GetInstanceID() (instanceID string) { // Remove the cached kube client so a new one can be created func (factory *ClientFactory) RemoveKubeClient(endpointID portainer.EndpointID) { - factory.endpointClients.Remove(strconv.Itoa(int(endpointID))) + factory.mu.Lock() + delete(factory.endpointClients, strconv.Itoa(int(endpointID))) + factory.mu.Unlock() } // GetKubeClient checks if an existing client is already registered for the environment(endpoint) and returns it if one is found. // If no client is registered, it will create a new client, register it, and returns it. -func (factory *ClientFactory) GetKubeClient(endpoint *portainer.Endpoint) (portainer.KubeClient, error) { +func (factory *ClientFactory) GetKubeClient(endpoint *portainer.Endpoint) (*KubeClient, error) { + factory.mu.Lock() + defer factory.mu.Unlock() + key := strconv.Itoa(int(endpoint.ID)) - client, ok := factory.endpointClients.Get(key) + client, ok := factory.endpointClients[key] if !ok { - client, err := factory.createCachedAdminKubeClient(endpoint) + var err error + + client, err = factory.createCachedAdminKubeClient(endpoint) if err != nil { return nil, err } - factory.endpointClients.Set(key, client) - return client, nil + factory.endpointClients[key] = client } - return client.(portainer.KubeClient), nil + return client, nil } // GetProxyKubeClient retrieves a KubeClient from the cache. You should be // calling SetProxyKubeClient before first. It is normally, called the // kubernetes middleware. -func (factory *ClientFactory) GetProxyKubeClient(endpointID, token string) (portainer.KubeClient, bool) { +func (factory *ClientFactory) GetProxyKubeClient(endpointID, token string) (*KubeClient, bool) { client, ok := factory.endpointProxyClients.Get(endpointID + "." + token) if !ok { return nil, false } - return client.(portainer.KubeClient), true + + return client.(*KubeClient), true } // SetProxyKubeClient stores a kubeclient in the cache. -func (factory *ClientFactory) SetProxyKubeClient(endpointID, token string, cli portainer.KubeClient) { +func (factory *ClientFactory) SetProxyKubeClient(endpointID, token string, cli *KubeClient) { factory.endpointProxyClients.Set(endpointID+"."+token, cli, 0) } // CreateKubeClientFromKubeConfig creates a KubeClient from a clusterID, and // Kubernetes config. -func (factory *ClientFactory) CreateKubeClientFromKubeConfig(clusterID string, kubeConfig []byte) (portainer.KubeClient, error) { +func (factory *ClientFactory) CreateKubeClientFromKubeConfig(clusterID string, kubeConfig []byte) (*KubeClient, error) { config, err := clientcmd.NewClientConfigFromBytes([]byte(kubeConfig)) if err != nil { return nil, err } + cliConfig, err := config.ClientConfig() if err != nil { return nil, err } + cliConfig.QPS = DefaultKubeClientQPS + cliConfig.Burst = DefaultKubeClientBurst + cli, err := kubernetes.NewForConfig(cliConfig) if err != nil { return nil, err } - kubecli := &KubeClient{ + return &KubeClient{ cli: cli, instanceID: factory.instanceID, - lock: &sync.Mutex{}, - } - - return kubecli, nil + }, nil } -func (factory *ClientFactory) createCachedAdminKubeClient(endpoint *portainer.Endpoint) (portainer.KubeClient, error) { +func (factory *ClientFactory) createCachedAdminKubeClient(endpoint *portainer.Endpoint) (*KubeClient, error) { cli, err := factory.CreateClient(endpoint) if err != nil { return nil, err } - kubecli := &KubeClient{ + return &KubeClient{ cli: cli, instanceID: factory.instanceID, - lock: &sync.Mutex{}, - } - - return kubecli, nil + }, nil } // CreateClient returns a pointer to a new Clientset instance @@ -199,7 +208,10 @@ func (factory *ClientFactory) createRemoteClient(endpointURL string) (*kubernete if err != nil { return nil, err } + config.Insecure = true + config.QPS = DefaultKubeClientQPS + config.Burst = DefaultKubeClientBurst config.Wrap(func(rt http.RoundTripper) http.RoundTripper { return &agentHeaderRoundTripper{ @@ -218,30 +230,13 @@ func buildLocalClient() (*kubernetes.Clientset, error) { return nil, err } + config.QPS = DefaultKubeClientQPS + config.Burst = DefaultKubeClientBurst + return kubernetes.NewForConfig(config) } -func (factory *ClientFactory) PostInitMigrateIngresses() error { - endpoints, err := factory.dataStore.Endpoint().Endpoints() - if err != nil { - return err - } - for i := range endpoints { - // Early exit if we do not need to migrate! - if endpoints[i].PostInitMigrations.MigrateIngresses == false { - return nil - } - - err := factory.migrateEndpointIngresses(&endpoints[i]) - if err != nil { - log.Debug().Err(err).Msg("failure migrating endpoint ingresses") - } - } - - return nil -} - -func (factory *ClientFactory) migrateEndpointIngresses(e *portainer.Endpoint) error { +func (factory *ClientFactory) MigrateEndpointIngresses(e *portainer.Endpoint) error { // classes is a list of controllers which have been manually added to the // cluster setup view. These need to all be allowed globally, but then // blocked in specific namespaces which they were not previously allowed in. diff --git a/api/kubernetes/cli/namespace_test.go b/api/kubernetes/cli/namespace_test.go index 9d3647877..ea4821bab 100644 --- a/api/kubernetes/cli/namespace_test.go +++ b/api/kubernetes/cli/namespace_test.go @@ -3,7 +3,6 @@ package cli import ( "context" "strconv" - "sync" "testing" portainer "github.com/portainer/portainer/api" @@ -19,7 +18,6 @@ func Test_ToggleSystemState(t *testing.T) { kcl := &KubeClient{ cli: kfake.NewSimpleClientset(&core.Namespace{ObjectMeta: metav1.ObjectMeta{Name: nsName}}), instanceID: "instance", - lock: &sync.Mutex{}, } err := kcl.ToggleSystemState(nsName, true) @@ -37,12 +35,10 @@ func Test_ToggleSystemState(t *testing.T) { kcl := &KubeClient{ cli: kfake.NewSimpleClientset(), instanceID: "instance", - lock: &sync.Mutex{}, } err := kcl.ToggleSystemState(nsName, true) assert.Error(t, err) - }) t.Run("if called with the same state, should skip (exit without error)", func(t *testing.T) { @@ -61,7 +57,6 @@ func Test_ToggleSystemState(t *testing.T) { systemNamespaceLabel: strconv.FormatBool(test.isSystem), }}}), instanceID: "instance", - lock: &sync.Mutex{}, } err := kcl.ToggleSystemState(nsName, test.isSystem) @@ -81,7 +76,6 @@ func Test_ToggleSystemState(t *testing.T) { kcl := &KubeClient{ cli: kfake.NewSimpleClientset(&core.Namespace{ObjectMeta: metav1.ObjectMeta{Name: nsName}}), instanceID: "instance", - lock: &sync.Mutex{}, } err := kcl.ToggleSystemState(nsName, true) @@ -102,7 +96,6 @@ func Test_ToggleSystemState(t *testing.T) { kcl := &KubeClient{ cli: kfake.NewSimpleClientset(&core.Namespace{ObjectMeta: metav1.ObjectMeta{Name: nsName}}), instanceID: "instance", - lock: &sync.Mutex{}, } err := kcl.ToggleSystemState(nsName, false) @@ -125,7 +118,6 @@ func Test_ToggleSystemState(t *testing.T) { systemNamespaceLabel: "true", }}}), instanceID: "instance", - lock: &sync.Mutex{}, } err := kcl.ToggleSystemState(nsName, false) @@ -159,7 +151,6 @@ func Test_ToggleSystemState(t *testing.T) { kcl := &KubeClient{ cli: kfake.NewSimpleClientset(namespace, config), instanceID: "instance", - lock: &sync.Mutex{}, } err := kcl.ToggleSystemState(nsName, true) @@ -178,6 +169,5 @@ func Test_ToggleSystemState(t *testing.T) { actualPolicies, err := kcl.GetNamespaceAccessPolicies() assert.NoError(t, err, "failed to fetch policies") assert.Equal(t, expectedPolicies, actualPolicies) - }) } diff --git a/api/kubernetes/kubeclusteraccess_service.go b/api/kubernetes/kubeclusteraccess_service.go index 4a97885d4..a5145d585 100644 --- a/api/kubernetes/kubeclusteraccess_service.go +++ b/api/kubernetes/kubeclusteraccess_service.go @@ -98,7 +98,7 @@ func (service *kubeClusterAccessService) GetData(hostURL string, endpointID port // When the api call is internal, the baseURL should not be used. if hostURL == "localhost" { - hostURL = hostURL + service.httpsBindAddr + hostURL += service.httpsBindAddr baseURL = "/" } diff --git a/api/oauth/oauth.go b/api/oauth/oauth.go index 9843258b2..3f15f8f92 100644 --- a/api/oauth/oauth.go +++ b/api/oauth/oauth.go @@ -121,12 +121,13 @@ func getResource(token string, configuration *portainer.OAuthSettings) (map[stri client := &http.Client{} req.Header.Set("Authorization", "Bearer "+token) + resp, err := client.Do(req) if err != nil { return nil, err } - defer resp.Body.Close() + body, err := io.ReadAll(resp.Body) if err != nil { return nil, err diff --git a/api/platform/platform.go b/api/platform/platform.go index 8adee3cb3..706a844ef 100644 --- a/api/platform/platform.go +++ b/api/platform/platform.go @@ -41,10 +41,12 @@ func DetermineContainerPlatform() (ContainerPlatform, error) { if podmanModeEnvVar == "1" { return PlatformPodman, nil } + serviceHostKubernetesEnvVar := os.Getenv(KubernetesServiceHost) if serviceHostKubernetesEnvVar != "" { return PlatformKubernetes, nil } + nomadJobName := os.Getenv(NomadJobName) if nomadJobName != "" { return PlatformNomad, nil diff --git a/api/portainer.go b/api/portainer.go index 918c32aaa..f816deef1 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -225,7 +225,7 @@ type ( // It contains some information of Docker's ContainerJSON struct DockerContainerSnapshot struct { types.Container - Env []string `json:"Env"` + Env []string `json:"Env,omitempty"` // EE-5240 } // DockerSnapshotRaw represents all the information related to a snapshot as returned by the Docker API @@ -388,8 +388,7 @@ type ( LastCheckInDate int64 // QueryDate of each query with the endpoints list QueryDate int64 - // IsEdgeDevice marks if the environment was created as an EdgeDevice - IsEdgeDevice bool + // Whether the device has been trusted or not by the user UserTrusted bool @@ -402,6 +401,8 @@ type ( Version string `example:"1.0.0"` } + EnableGPUManagement bool `json:"EnableGPUManagement"` + // Deprecated fields // Deprecated in DBVersion == 4 TLS bool `json:"TLS,omitempty"` @@ -415,6 +416,9 @@ type ( // Deprecated in DBVersion == 22 Tags []string `json:"Tags"` + + // Deprecated v2.18 + IsEdgeDevice bool } EnvironmentEdgeSettings struct { @@ -502,6 +506,7 @@ type ( // EndpointPostInitMigrations EndpointPostInitMigrations struct { MigrateIngresses bool `json:"MigrateIngresses"` + MigrateGPUs bool `json:"MigrateGPUs"` } // Extension represents a deprecated Portainer extension @@ -585,9 +590,12 @@ type ( Flags KubernetesFlags `json:"Flags"` } + // KubernetesFlags are used to detect if we need to run initial cluster + // detection again. KubernetesFlags struct { - IsServerMetricsDetected bool `json:"IsServerMetricsDetected"` - IsServerStorageDetected bool `json:"IsServerStorageDetected"` + IsServerMetricsDetected bool `json:"IsServerMetricsDetected"` + IsServerIngressClassDetected bool `json:"IsServerIngressClassDetected"` + IsServerStorageDetected bool `json:"IsServerStorageDetected"` } // KubernetesSnapshot represents a snapshot of a specific Kubernetes environment(endpoint) at a specific time @@ -1283,8 +1291,6 @@ type ( UserThemeSettings struct { // Color represents the color theme of the UI Color string `json:"color" example:"dark" enums:"dark,light,highcontrast,auto"` - // SubtleUpgradeButton indicates if the upgrade banner should be displayed in a subtle way - SubtleUpgradeButton bool `json:"subtleUpgradeButton"` } // Webhook represents a url webhook that can be used to update a service @@ -1507,7 +1513,7 @@ type ( const ( // APIVersion is the version number of the Portainer API - APIVersion = "2.18.0" + APIVersion = "2.19.0" // Edition is what this edition of Portainer is called Edition = PortainerCE // ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax @@ -1554,7 +1560,9 @@ const ( ) // List of supported features -var SupportedFeatureFlags = []featureflags.Feature{} +var SupportedFeatureFlags = []featureflags.Feature{ + "fdo", +} const ( _ AuthenticationMethod = iota diff --git a/api/stacks/stackutils/util.go b/api/stacks/stackutils/util.go index bb3d82d23..b1c8f17ba 100644 --- a/api/stacks/stackutils/util.go +++ b/api/stacks/stackutils/util.go @@ -24,6 +24,7 @@ func GetStackFilePaths(stack *portainer.Stack, absolute bool) []string { for _, file := range append([]string{stack.EntryPoint}, stack.AdditionalFiles...) { filePaths = append(filePaths, filesystem.JoinPaths(stack.ProjectPath, file)) } + return filePaths } diff --git a/app/assets/css/theme.css b/app/assets/css/theme.css index a052f6b29..d4a121a7b 100644 --- a/app/assets/css/theme.css +++ b/app/assets/css/theme.css @@ -120,8 +120,6 @@ --bg-navtabs-hover-color: var(--grey-16); --bg-nav-tab-active-color: var(--ui-gray-4); --bg-table-selected-color: var(--grey-14); - --bg-codemirror-color: var(--white-color); - --bg-codemirror-gutters-color: var(--grey-17); --bg-dropdown-menu-color: var(--white-color); --bg-log-viewer-color: var(--white-color); --bg-log-line-selected-color: var(--grey-18); @@ -136,7 +134,6 @@ --bg-item-highlighted-color: var(--grey-21); --bg-item-highlighted-null-color: var(--grey-14); --bg-panel-body-color: var(--white-color); - --bg-codemirror-selected-color: var(--grey-22); --bg-tooltip-color: var(--ui-gray-11); --bg-input-sm-color: var(--white-color); --bg-app-datatable-thead: var(--grey-23); @@ -182,11 +179,7 @@ --text-navtabs-color: var(--grey-7); --text-navtabs-hover-color: var(--grey-6); --text-nav-tab-active-color: var(--grey-25); - --text-cm-default-color: var(--blue-1); - --text-cm-meta-color: var(--black-color); - --text-cm-string-color: var(--red-3); - --text-cm-number-color: var(--green-1); - --text-codemirror-color: var(--black-color); + --text-dropdown-menu-color: var(--grey-6); --text-log-viewer-color: var(--black-color); --text-json-tree-color: var(--blue-3); @@ -224,7 +217,6 @@ --border-md-checkbox-color: var(--grey-19); --border-modal-header-color: var(--grey-45); --border-navtabs-color: var(--ui-white); - --border-codemirror-cursor-color: var(--black-color); --border-pre-color: var(--grey-43); --border-pagination-span-color: var(--ui-white); --border-pagination-hover-color: var(--ui-white); @@ -281,9 +273,6 @@ --bg-card-color: var(--grey-1); --bg-checkbox-border-color: var(--grey-8); --bg-code-color: var(--grey-2); - --bg-codemirror-color: var(--grey-2); - --bg-codemirror-gutters-color: var(--grey-3); - --bg-codemirror-selected-color: var(--grey-3); --bg-dropdown-menu-color: var(--ui-gray-warm-8); --bg-main-color: var(--grey-2); --bg-sidebar-color: var(--grey-1); @@ -361,11 +350,7 @@ --text-navtabs-color: var(--grey-8); --text-navtabs-hover-color: var(--grey-9); --text-nav-tab-active-color: var(--white-color); - --text-cm-default-color: var(--blue-10); - --text-cm-meta-color: var(--white-color); - --text-cm-string-color: var(--red-5); - --text-cm-number-color: var(--green-2); - --text-codemirror-color: var(--white-color); + --text-dropdown-menu-color: var(--white-color); --text-log-viewer-color: var(--white-color); --text-json-tree-color: var(--grey-40); @@ -403,7 +388,6 @@ --border-md-checkbox-color: var(--grey-41); --border-modal-header-color: var(--grey-1); --border-navtabs-color: var(--grey-38); - --border-codemirror-cursor-color: var(--white-color); --border-pre-color: var(--grey-3); --border-blocklist: var(--ui-gray-9); --border-blocklist-item-selected-color: var(--grey-38); @@ -468,15 +452,12 @@ --bg-switch-box-color: var(--grey-53); --bg-panel-body-color: var(--black-color); --bg-dropdown-menu-color: var(--ui-gray-warm-8); - --bg-codemirror-selected-color: var(--grey-3); --bg-motd-body-color: var(--black-color); --bg-blocklist-hover-color: var(--black-color); --bg-blocklist-item-selected-color: var(--black-color); --bg-input-group-addon-color: var(--grey-3); --bg-table-color: var(--black-color); - --bg-codemirror-gutters-color: var(--ui-gray-warm-11); - --bg-codemirror-color: var(--black-color); - --bg-codemirror-selected-color: var(--grey-3); + --bg-log-viewer-color: var(--black-color); --bg-log-line-selected-color: var(--grey-3); --bg-modal-content-color: var(--black-color); @@ -536,7 +517,6 @@ --text-tooltip-color: var(--white-color); --text-blocklist-item-selected-color: var(--blue-9); --text-input-group-addon-color: var(--white-color); - --text-codemirror-color: var(--white-color); --text-dropdown-menu-color: var(--white-color); --text-log-viewer-color: var(--white-color); --text-summary-color: var(--white-color); @@ -582,7 +562,6 @@ --border-pre-next-month: var(--white-color); --border-daterangepicker-after: var(--black-color); --border-pre-color: var(--grey-3); - --border-codemirror-cursor-color: var(--white-color); --border-modal: 1px solid var(--white-color); --border-sortbutton: var(--black-color); --border-bootbox: var(--black-color); @@ -596,9 +575,7 @@ --text-input-textarea: var(--black-color); --bg-item-highlighted-null-color: var(--grey-2); - --text-cm-default-color: var(--blue-9); - --text-cm-meta-color: var(--white-color); - --text-cm-string-color: var(--red-7); + --text-progress-bar-color: var(--black-color); --user-menu-icon-color: var(--white-color); diff --git a/app/assets/css/vendor-override.css b/app/assets/css/vendor-override.css index 48bbfffc6..097b31385 100644 --- a/app/assets/css/vendor-override.css +++ b/app/assets/css/vendor-override.css @@ -36,6 +36,10 @@ border: 1px solid var(--border-input-group-addon-color); } +.input-group .form-control { + z-index: unset; +} + .text-danger { color: var(--ui-error-9); } @@ -150,50 +154,6 @@ code { background-color: var(--bg-table-selected-color); } -.CodeMirror-gutters { - background: var(--bg-codemirror-gutters-color); - border-right: 0px; -} - -.CodeMirror-linenumber { - text-align: left; -} - -.CodeMirror pre.CodeMirror-line, -.CodeMirror pre.CodeMirror-line-like { - padding: 0 20px; -} - -.CodeMirror { - background: var(--bg-codemirror-color); - color: var(--text-codemirror-color); - border-radius: 8px; -} - -.CodeMirror-selected { - background: var(--bg-codemirror-selected-color) !important; -} - -.CodeMirror-cursor { - border-left: 1px solid var(--border-codemirror-cursor-color); -} - -.cm-s-default .cm-atom { - color: var(--text-cm-default-color); -} - -.cm-s-default .cm-meta { - color: var(--text-cm-meta-color); -} - -.cm-s-default .cm-string { - color: var(--text-cm-string-color); -} - -.cm-s-default .cm-number { - color: var(--text-cm-number-color); -} - .dropdown-menu { background: var(--bg-dropdown-menu-color); border-radius: 8px; @@ -358,11 +318,6 @@ input:-webkit-autofill { } /* Overide Vendor CSS */ - -.btn-link:hover { - color: var(--text-link-hover-color) !important; -} - .multiSelect.inlineBlock button { margin: 0; } diff --git a/app/assets/ico/vendor/install-kubernetes.svg b/app/assets/ico/vendor/install-kubernetes.svg new file mode 100644 index 000000000..075065fb6 --- /dev/null +++ b/app/assets/ico/vendor/install-kubernetes.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/assets/ico/vendor/kaas-icon.svg b/app/assets/ico/vendor/kaas-icon.svg new file mode 100644 index 000000000..37d427eed --- /dev/null +++ b/app/assets/ico/vendor/kaas-icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/docker/__module.js b/app/docker/__module.js index 74e9a80dd..de09c8719 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -1,5 +1,7 @@ import angular from 'angular'; +import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models'; + import { EnvironmentStatus } from '@/react/portainer/environments/types'; import { reactModule } from './react'; @@ -16,14 +18,17 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([ abstract: true, onEnter: /* @ngInject */ function onEnter(endpoint, $async, $state, EndpointService, Notifications, StateManager, SystemService) { return $async(async () => { - if (![1, 2, 4].includes(endpoint.Type)) { + const dockerTypes = [PortainerEndpointTypes.DockerEnvironment, PortainerEndpointTypes.AgentOnDockerEnvironment, PortainerEndpointTypes.EdgeAgentOnDockerEnvironment]; + + if (!dockerTypes.includes(endpoint.Type)) { $state.go('portainer.home'); return; } + try { const status = await checkEndpointStatus(endpoint); - if (endpoint.Type !== 4) { + if (endpoint.Type !== PortainerEndpointTypes.EdgeAgentOnDockerEnvironment) { await updateEndpointStatus(endpoint, status); } endpoint.Status = status; @@ -34,16 +39,22 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([ await StateManager.updateEndpointState(endpoint); } catch (e) { - Notifications.error('Failed loading environment', e); - $state.go('portainer.home', {}, { reload: true }); + let params = {}; + + if (endpoint.Type == PortainerEndpointTypes.EdgeAgentOnDockerEnvironment) { + params = { redirect: true, environmentId: endpoint.Id, environmentName: endpoint.Name, route: 'docker.dashboard' }; + } else { + Notifications.error('Failed loading environment', e); + } + $state.go('portainer.home', params, { reload: true, inherit: false }); } async function checkEndpointStatus(endpoint) { try { await SystemService.ping(endpoint.Id); - return 1; + return EnvironmentStatus.Up; } catch (e) { - return 2; + return EnvironmentStatus.Down; } } diff --git a/app/docker/components/imageRegistry/por-image-registry.html b/app/docker/components/imageRegistry/por-image-registry.html index 142b3139a..b62036f4d 100644 --- a/app/docker/components/imageRegistry/por-image-registry.html +++ b/app/docker/components/imageRegistry/por-image-registry.html @@ -1,7 +1,7 @@
- +
@@ -37,8 +37,6 @@ model="formValues.RegistryModel" ng-if="formValues.RegistryModel.Registry" auto-complete="true" - label-class="col-sm-1" - input-class="col-sm-11" endpoint="endpoint" is-admin="isAdmin" check-rate-limits="formValues.alwaysPull" @@ -169,7 +167,7 @@
-
+
@@ -106,7 +106,12 @@
- +
diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js b/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js index 3fcc4cbb1..b6270ee57 100644 --- a/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js +++ b/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js @@ -2,10 +2,13 @@ import { FeatureId } from '@/react/portainer/feature-flags/enums'; export default class DockerFeaturesConfigurationController { /* @ngInject */ - constructor($async, $scope, EndpointService, Notifications, StateManager) { + constructor($async, $scope, $state, $analytics, EndpointService, SettingsService, Notifications, StateManager) { this.$async = $async; this.$scope = $scope; + this.$state = $state; + this.$analytics = $analytics; this.EndpointService = EndpointService; + this.SettingsService = SettingsService; this.Notifications = Notifications; this.StateManager = StateManager; @@ -35,6 +38,8 @@ export default class DockerFeaturesConfigurationController { this.save = this.save.bind(this); this.onChangeField = this.onChangeField.bind(this); this.onToggleAutoUpdate = this.onToggleAutoUpdate.bind(this); + this.onToggleGPUManagement = this.onToggleGPUManagement.bind(this); + this.onGpusChange = this.onGpusChange.bind(this); this.onChangeEnableHostManagementFeatures = this.onChangeField('enableHostManagementFeatures'); this.onChangeAllowVolumeBrowserForRegularUsers = this.onChangeField('allowVolumeBrowserForRegularUsers'); this.onChangeDisableBindMountsForRegularUsers = this.onChangeField('disableBindMountsForRegularUsers'); @@ -52,6 +57,12 @@ export default class DockerFeaturesConfigurationController { }); } + onToggleGPUManagement(checked) { + this.$scope.$evalAsync(() => { + this.state.enableGPUManagement = checked; + }); + } + onChange(values) { return this.$scope.$evalAsync(() => { this.formValues = { @@ -69,6 +80,12 @@ export default class DockerFeaturesConfigurationController { }; } + onGpusChange(value) { + return this.$async(async () => { + this.endpoint.Gpus = value; + }); + } + isContainerEditDisabled() { const { disableBindMountsForRegularUsers, @@ -92,7 +109,11 @@ export default class DockerFeaturesConfigurationController { return this.$async(async () => { try { this.state.actionInProgress = true; - const securitySettings = { + + const validGpus = this.endpoint.Gpus.filter((gpu) => gpu.name && gpu.value); + const gpus = this.state.enableGPUManagement ? validGpus : []; + + const settings = { enableHostManagementFeatures: this.formValues.enableHostManagementFeatures, allowBindMountsForRegularUsers: !this.formValues.disableBindMountsForRegularUsers, allowPrivilegedModeForRegularUsers: !this.formValues.disablePrivilegedModeForRegularUsers, @@ -102,33 +123,53 @@ export default class DockerFeaturesConfigurationController { allowStackManagementForRegularUsers: !this.formValues.disableStackManagementForRegularUsers, allowContainerCapabilitiesForRegularUsers: !this.formValues.disableContainerCapabilitiesForRegularUsers, allowSysctlSettingForRegularUsers: !this.formValues.disableSysctlSettingForRegularUsers, + enableGPUManagement: this.state.enableGPUManagement, + gpus, }; - await this.EndpointService.updateSecuritySettings(this.endpoint.Id, securitySettings); + const publicSettings = await this.SettingsService.publicSettings(); + const analyticsAllowed = publicSettings.EnableTelemetry; + if (analyticsAllowed) { + // send analytics if GPU management is changed (with the new state) + if (this.initialEnableGPUManagement !== this.state.enableGPUManagement) { + this.$analytics.eventTrack('enable-gpu-management-updated', { category: 'portainer', metadata: { enableGPUManagementState: this.state.enableGPUManagement } }); + } + // send analytics if the number of GPUs is changed (with a list of the names) + if (gpus.length > this.initialGPUs.length) { + const numberOfGPUSAdded = this.endpoint.Gpus.length - this.initialGPUs.length; + this.$analytics.eventTrack('gpus-added', { category: 'portainer', metadata: { gpus: gpus.map((gpu) => gpu.name), numberOfGPUSAdded } }); + } + if (gpus.length < this.initialGPUs.length) { + const numberOfGPUSRemoved = this.initialGPUs.length - this.endpoint.Gpus.length; + this.$analytics.eventTrack('gpus-removed', { category: 'portainer', metadata: { gpus: gpus.map((gpu) => gpu.name), numberOfGPUSRemoved } }); + } + this.initialGPUs = gpus; + this.initialEnableGPUManagement = this.state.enableGPUManagement; + } - this.endpoint.SecuritySettings = securitySettings; + await this.EndpointService.updateSecuritySettings(this.endpoint.Id, settings); + + this.endpoint.SecuritySettings = settings; this.Notifications.success('Success', 'Saved settings successfully'); } catch (e) { this.Notifications.error('Failure', e, 'Failed saving settings'); } this.state.actionInProgress = false; + this.$state.reload(); }); } - checkAgent() { - const applicationState = this.StateManager.getState(); - return applicationState.endpoint.mode.agentProxy; - } - $onInit() { const securitySettings = this.endpoint.SecuritySettings; - const isAgent = this.checkAgent(); - this.isAgent = isAgent; + const applicationState = this.StateManager.getState(); + this.isAgent = applicationState.endpoint.mode.agentProxy; + + this.isDockerStandaloneEnv = applicationState.endpoint.mode.provider === 'DOCKER_STANDALONE'; this.formValues = { - enableHostManagementFeatures: isAgent && securitySettings.enableHostManagementFeatures, - allowVolumeBrowserForRegularUsers: isAgent && securitySettings.allowVolumeBrowserForRegularUsers, + enableHostManagementFeatures: this.isAgent && securitySettings.enableHostManagementFeatures, + allowVolumeBrowserForRegularUsers: this.isAgent && securitySettings.allowVolumeBrowserForRegularUsers, disableBindMountsForRegularUsers: !securitySettings.allowBindMountsForRegularUsers, disablePrivilegedModeForRegularUsers: !securitySettings.allowPrivilegedModeForRegularUsers, disableHostNamespaceForRegularUsers: !securitySettings.allowHostNamespaceForRegularUsers, @@ -137,5 +178,11 @@ export default class DockerFeaturesConfigurationController { disableContainerCapabilitiesForRegularUsers: !securitySettings.allowContainerCapabilitiesForRegularUsers, disableSysctlSettingForRegularUsers: !securitySettings.allowSysctlSettingForRegularUsers, }; + + // this.endpoint.Gpus could be null as it is Gpus: []Pair in the API + this.endpoint.Gpus = this.endpoint.Gpus || []; + this.state.enableGPUManagement = this.isDockerStandaloneEnv && (this.endpoint.EnableGPUManagement || this.endpoint.Gpus.length > 0); + this.initialGPUs = this.endpoint.Gpus; + this.initialEnableGPUManagement = this.endpoint.EnableGPUManagement; } } diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.html b/app/docker/views/docker-features-configuration/docker-features-configuration.html index 3e93ac720..db3c6d697 100644 --- a/app/docker/views/docker-features-configuration/docker-features-configuration.html +++ b/app/docker/views/docker-features-configuration/docker-features-configuration.html @@ -150,9 +150,28 @@
Other
+
+ +
+
+
+
+ +
+
+
+ Actions
- diff --git a/app/docker/views/images/imagesController.js b/app/docker/views/images/imagesController.js index 5862059cb..c07cf90ed 100644 --- a/app/docker/views/images/imagesController.js +++ b/app/docker/views/images/imagesController.js @@ -167,6 +167,6 @@ function confirmImageForceRemoval() { title: 'Are you sure?', modalType: ModalType.Destructive, message: 'Forcing the removal of the image will remove the image even if it has multiple tags or if it is used by stopped containers.', - confirmButton: buildConfirmButton('Remote the image', 'danger'), + confirmButton: buildConfirmButton('Remove the image', 'danger'), }); } diff --git a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html b/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html index 942babdce..436f393c7 100644 --- a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html +++ b/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html @@ -1,19 +1,5 @@
-
Edge Groups
-
-
- -
- -

- There are no available deployment types when there is more than one type of environment in your edge group - selection (e.g. Kubernetes and Docker environments). Please select edge groups that have environments of the same type. -

-

- Edge groups with kubernetes environments no longer support compose deployment types in Portainer. Please select - edge groups that only have docker environments when using compose deployment types. -

-
+ +
diff --git a/app/edge/components/group-form/groupFormController.js b/app/edge/components/group-form/groupFormController.js index 253c7ea66..7086570a7 100644 --- a/app/edge/components/group-form/groupFormController.js +++ b/app/edge/components/group-form/groupFormController.js @@ -37,6 +37,7 @@ export class EdgeGroupFormController { this.onChangeDynamic = this.onChangeDynamic.bind(this); this.onChangeModel = this.onChangeModel.bind(this); this.onChangePartialMatch = this.onChangePartialMatch.bind(this); + this.handleSubmit = this.handleSubmit.bind(this); $scope.$watch( () => this.model, @@ -118,6 +119,10 @@ export class EdgeGroupFormController { }); } + handleSubmit() { + this.formAction(this.model); + } + $onInit() { this.getTags(); } diff --git a/app/edge/react/components/index.ts b/app/edge/react/components/index.ts index 3eee3f259..1fe7e475b 100644 --- a/app/edge/react/components/index.ts +++ b/app/edge/react/components/index.ts @@ -7,12 +7,19 @@ import { EdgeCheckinIntervalField } from '@/react/edge/components/EdgeCheckInInt import { EdgeScriptForm } from '@/react/edge/components/EdgeScriptForm'; import { EdgeAsyncIntervalsForm } from '@/react/edge/components/EdgeAsyncIntervalsForm'; import { EdgeStackDeploymentTypeSelector } from '@/react/edge/edge-stacks/components/EdgeStackDeploymentTypeSelector'; +import { withUIRouter } from '@/react-tools/withUIRouter'; export const componentsModule = angular .module('portainer.edge.react.components', []) .component( 'edgeGroupsSelector', - r2a(EdgeGroupsSelector, ['items', 'onChange', 'value']) + r2a(withUIRouter(withReactQuery(EdgeGroupsSelector)), [ + 'onChange', + 'value', + 'error', + 'horizontal', + 'isGroupVisible', + ]) ) .component( 'edgeScriptForm', @@ -21,6 +28,7 @@ export const componentsModule = angular 'commands', 'isNomadTokenVisible', 'asyncMode', + 'showMetaFields', ]) ) .component( diff --git a/app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupViewController.js b/app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupViewController.js index a1172b836..c82a63f1d 100644 --- a/app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupViewController.js +++ b/app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupViewController.js @@ -21,7 +21,6 @@ export class CreateEdgeGroupController { }; this.createGroup = this.createGroup.bind(this); - this.createGroupAsync = this.createGroupAsync.bind(this); } async $onInit() { @@ -31,20 +30,18 @@ export class CreateEdgeGroupController { this.state.loaded = true; } - createGroup() { - return this.$async(this.createGroupAsync); - } - - async createGroupAsync() { - this.state.actionInProgress = true; - try { - await this.EdgeGroupService.create(this.model); - this.Notifications.success('Success', 'Edge group successfully created'); - this.$state.go('edge.groups'); - } catch (err) { - this.Notifications.error('Failure', err, 'Unable to create edge group'); - } finally { - this.state.actionInProgress = false; - } + async createGroup(model) { + return this.$async(async () => { + this.state.actionInProgress = true; + try { + await this.EdgeGroupService.create(model); + this.Notifications.success('Success', 'Edge group successfully created'); + this.$state.go('edge.groups'); + } catch (err) { + this.Notifications.error('Failure', err, 'Unable to create edge group'); + } finally { + this.state.actionInProgress = false; + } + }); } } diff --git a/app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js b/app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js index feb06b2c2..3838206ca 100644 --- a/app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js +++ b/app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js @@ -13,7 +13,6 @@ export class EditEdgeGroupController { }; this.updateGroup = this.updateGroup.bind(this); - this.updateGroupAsync = this.updateGroupAsync.bind(this); } async $onInit() { @@ -28,20 +27,18 @@ export class EditEdgeGroupController { this.state.loaded = true; } - updateGroup() { - return this.$async(this.updateGroupAsync); - } - - async updateGroupAsync() { - this.state.actionInProgress = true; - try { - await this.EdgeGroupService.update(this.model); - this.Notifications.success('Success', 'Edge group successfully updated'); - this.$state.go('edge.groups'); - } catch (err) { - this.Notifications.error('Failure', err, 'Unable to update edge group'); - } finally { - this.state.actionInProgress = false; - } + updateGroup(group) { + return this.$async(async () => { + this.state.actionInProgress = true; + try { + await this.EdgeGroupService.update(group); + this.Notifications.success('Success', 'Edge group successfully updated'); + this.$state.go('edge.groups'); + } catch (err) { + this.Notifications.error('Failure', err, 'Unable to update edge group'); + } finally { + this.state.actionInProgress = false; + } + }); } } diff --git a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js index 1eae9715d..c30ece1a8 100644 --- a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js +++ b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js @@ -86,7 +86,6 @@ export default class CreateEdgeStackViewController { async $onInit() { try { this.edgeGroups = await this.EdgeGroupService.groups(); - this.noGroups = this.edgeGroups.length === 0; } catch (err) { this.Notifications.error('Failure', err, 'Unable to retrieve Edge groups'); } diff --git a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html index ecfa4dc84..0c406ad96 100644 --- a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html +++ b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html @@ -39,19 +39,7 @@
-
Edge Groups
-
-
- -
-
- No Edge groups are available. Head over to the Edge groups view to create one. -
-

- There are no available deployment types when there is more than one type of environment in your edge - group selection (e.g. Kubernetes and Docker environments). Please select edge groups that have environments of the same type. -

-
+ { - if (![5, 6, 7].includes(endpoint.Type)) { + const kubeTypes = [ + PortainerEndpointTypes.KubernetesLocalEnvironment, + PortainerEndpointTypes.AgentOnKubernetesEnvironment, + PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment, + ]; + + if (!kubeTypes.includes(endpoint.Type)) { $state.go('portainer.home'); return; } try { - if (endpoint.Type === 7) { + if (endpoint.Type === PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment) { //edge try { await KubernetesHealthService.ping(endpoint.Id); - endpoint.Status = 1; + endpoint.Status = EnvironmentStatus.Up; } catch (e) { - endpoint.Status = 2; + endpoint.Status = EnvironmentStatus.Down; } } await StateManager.updateEndpointState(endpoint); - if (endpoint.Type === 7 && endpoint.Status === 2) { + if (endpoint.Type === PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment && endpoint.Status === EnvironmentStatus.Down) { throw new Error('Unable to contact Edge agent, please ensure that the agent is properly running on the remote environment.'); } - await KubernetesNamespaceService.get(); + // use selfsubject access review to check if we can connect to the kubernetes environment + // because it's gets a fast response, and is accessible to all users + try { + await getSelfSubjectAccessReview(endpoint.Id, 'default'); + } catch (e) { + throw new Error('Environment is unreachable.'); + } } catch (e) { - Notifications.error('Failed loading environment', e); - $state.go('portainer.home', {}, { reload: true }); + let params = {}; + + if (endpoint.Type == PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment) { + params = { redirect: true, environmentId: endpoint.Id, environmentName: endpoint.Name, route: 'kubernetes.dashboard' }; + } else { + Notifications.error('Failed loading environment', e); + } + $state.go('portainer.home', params, { reload: true, inherit: false }); } }); }, diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html index f41c7dfaa..d5465a6db 100644 --- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html +++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html @@ -1,116 +1,144 @@
-
-
+
+
Applications
-
- - -
-
- - - -
-
- - - - -
-
-
Table settings
-
-
-
- - -
-
- - -
-
- - - - - + +
+
+ + + + +
+
+
Table settings
+
+
+
+ + +
+
+ + +
+
+ + + + + +
-
-
- Close +
+ Close +
+ +
+ +
+ + + +
+ +
+ + +
+ +
+
+ + + Namespace + +
- +
- + System resources are hidden, this can be changed in the table settings.
+
+
+ +
+
diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js index 375440396..6a278c6c6 100644 --- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js +++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js @@ -15,5 +15,10 @@ angular.module('portainer.kubernetes').component('kubernetesApplicationsDatatabl refreshCallback: '<', onPublishingModeClick: '<', isPrimary: '<', + namespaces: '<', + namespace: '<', + onChangeNamespaceDropdown: '<', + isSystemResources: '<', + setSystemResources: '<', }, }); diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js index 877030326..386b495ce 100644 --- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js +++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js @@ -21,6 +21,8 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo this.state = Object.assign(this.state, { expandAll: false, expandedItems: [], + namespace: '', + namespaces: [], }); this.filters = { @@ -70,6 +72,8 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo }; this.onSettingsShowSystemChange = function () { + this.updateNamespace(); + this.setSystemResources(this.settings.showSystem); DatatableService.setDataTableSettings(this.tableKey, this.settings); }; @@ -135,6 +139,45 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo this.filters.state.values = _.uniqBy(availableTypeFilters, 'type'); }; + this.onChangeNamespace = function () { + this.onChangeNamespaceDropdown(this.state.namespace); + }; + + this.updateNamespace = function () { + if (this.namespaces && this.settingsLoaded) { + const allNamespacesOption = { Name: 'All namespaces', Value: '', IsSystem: false }; + const visibleNamespaceOptions = this.namespaces + .filter((ns) => { + if (!this.settings.showSystem && ns.IsSystem) { + return false; + } + return true; + }) + .map((ns) => ({ Name: ns.Name, Value: ns.Name, IsSystem: ns.IsSystem })); + this.state.namespaces = [allNamespacesOption, ...visibleNamespaceOptions]; + + if (this.state.namespace && !this.state.namespaces.find((ns) => ns.Name === this.state.namespace)) { + if (this.state.namespaces.length > 1) { + let defaultNS = this.state.namespaces.find((ns) => ns.Name === 'default'); + defaultNS = defaultNS || this.state.namespaces[1]; + this.state.namespace = defaultNS.Value; + } else { + this.state.namespace = this.state.namespaces[0].Value; + } + } + } + }; + + this.$onChanges = function () { + if (typeof this.isSystemResources !== 'undefined') { + this.settings.showSystem = this.isSystemResources; + DatatableService.setDataTableSettings(this.settingsKey, this.settings); + } + this.state.namespace = this.namespace; + this.updateNamespace(); + this.prepareTableFromDataset(); + }; + this.$onInit = function () { this.isAdmin = Authentication.isAdmin(); this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes; @@ -172,7 +215,16 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo if (storedSettings !== null) { this.settings = storedSettings; this.settings.open = false; + + this.setSystemResources && this.setSystemResources(this.settings.showSystem); } + this.settingsLoaded = true; + // Set the default selected namespace + if (!this.state.namespace) { + this.state.namespace = this.namespace; + } + + this.updateNamespace(); this.onSettingsRepeaterChange(); }; }, diff --git a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html index 7731d16d0..da4920b0d 100644 --- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html +++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html @@ -1,99 +1,122 @@
-
-
- +
+
Stacks
- -
- - -
-
- -
- - - - -
-
-
Table settings
-
-
-
- - -
-
- - -
-
- - - - - + +
+
+ +
+ + + + +
+
+
Table settings
+
+
+
+ + +
+
+ + +
+
+ + + + + +
-
-
- Close +
+ Close +
-
- + +
+
+
+ + +
+ +
+
+ + + Namespace + + +
-
- +
+ System resources are hidden, this can be changed in the table settings.
+
+
+ +
+
diff --git a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js index 3826ba62b..908b01a8b 100644 --- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js +++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js @@ -10,5 +10,10 @@ angular.module('portainer.kubernetes').component('kubernetesApplicationsStacksDa reverseOrder: '<', refreshCallback: '<', removeAction: '<', + namespaces: '<', + namespace: '<', + onChangeNamespaceDropdown: '<', + isSystemResources: '<', + setSystemResources: '<', }, }); diff --git a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatableController.js b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatableController.js index ba5c40879..27bef3600 100644 --- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatableController.js +++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatableController.js @@ -13,6 +13,8 @@ angular.module('portainer.kubernetes').controller('KubernetesApplicationsStacksD this.state = Object.assign(this.state, { expandedItems: [], expandAll: false, + namespace: '', + namespaces: [], }); var ctrl = this; @@ -22,6 +24,8 @@ angular.module('portainer.kubernetes').controller('KubernetesApplicationsStacksD }); this.onSettingsShowSystemChange = function () { + this.updateNamespace(); + this.setSystemResources(this.settings.showSystem); DatatableService.setDataTableSettings(this.tableKey, this.settings); }; @@ -76,6 +80,44 @@ angular.module('portainer.kubernetes').controller('KubernetesApplicationsStacksD }); }; + this.onChangeNamespace = function () { + this.onChangeNamespaceDropdown(this.state.namespace); + }; + + this.updateNamespace = function () { + if (this.namespaces) { + const namespaces = [{ Name: 'All namespaces', Value: '', IsSystem: false }]; + this.namespaces.find((ns) => { + if (!this.settings.showSystem && ns.IsSystem) { + return false; + } + namespaces.push({ Name: ns.Name, Value: ns.Name, IsSystem: ns.IsSystem }); + }); + this.state.namespaces = namespaces; + + if (this.state.namespace && !this.state.namespaces.find((ns) => ns.Name === this.state.namespace)) { + if (this.state.namespaces.length > 1) { + let defaultNS = this.state.namespaces.find((ns) => ns.Name === 'default'); + defaultNS = defaultNS || this.state.namespaces[1]; + this.state.namespace = defaultNS.Value; + } else { + this.state.namespace = this.state.namespaces[0].Value; + } + this.onChangeNamespaceDropdown(this.state.namespace); + } + } + }; + + this.$onChanges = function () { + if (typeof this.isSystemResources !== 'undefined') { + this.settings.showSystem = this.isSystemResources; + DatatableService.setDataTableSettings(this.settingsKey, this.settings); + } + this.state.namespace = this.namespace; + this.updateNamespace(); + this.prepareTableFromDataset(); + }; + this.$onInit = function () { this.isAdmin = Authentication.isAdmin(); this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes; @@ -103,11 +145,20 @@ angular.module('portainer.kubernetes').controller('KubernetesApplicationsStacksD this.filters.state.open = false; } - var storedSettings = DatatableService.getDataTableSettings(this.tableKey); + var storedSettings = DatatableService.getDataTableSettings(this.settingsKey); if (storedSettings !== null) { this.settings = storedSettings; this.settings.open = false; + + this.setSystemResources && this.setSystemResources(this.settings.showSystem); } + + // Set the default selected namespace + if (!this.state.namespace) { + this.state.namespace = this.namespace; + } + + this.updateNamespace(); this.onSettingsRepeaterChange(); }; }, diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js b/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js index 957dcc911..7af3f3436 100644 --- a/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js +++ b/app/kubernetes/components/helm/helm-templates/helm-templates.controller.js @@ -141,7 +141,9 @@ export default class HelmTemplatesController { try { const resourcePools = await this.KubernetesResourcePoolService.get(); - const nonSystemNamespaces = resourcePools.filter((resourcePool) => !KubernetesNamespaceHelper.isSystemNamespace(resourcePool.Namespace.Name)); + const nonSystemNamespaces = resourcePools.filter( + (resourcePool) => !KubernetesNamespaceHelper.isSystemNamespace(resourcePool.Namespace.Name) && resourcePool.Namespace.Status === 'Active' + ); this.state.resourcePools = _.sortBy(nonSystemNamespaces, ({ Namespace }) => (Namespace.Name === 'default' ? 0 : 1)); this.state.resourcePool = this.state.resourcePools[0]; } catch (err) { diff --git a/app/kubernetes/components/yaml-inspector/yamlInspector.html b/app/kubernetes/components/yaml-inspector/yamlInspector.html index f424819f0..e33114ace 100644 --- a/app/kubernetes/components/yaml-inspector/yamlInspector.html +++ b/app/kubernetes/components/yaml-inspector/yamlInspector.html @@ -6,6 +6,7 @@ placeholder="# Define or paste the content of your manifest here" read-only="true" hide-title="true" + height="{{ $ctrl.expanded ? '800px' : '500px' }}" >
diff --git a/app/kubernetes/components/yaml-inspector/yamlInspectorController.js b/app/kubernetes/components/yaml-inspector/yamlInspectorController.js index dd5986e10..cd2bf00c8 100644 --- a/app/kubernetes/components/yaml-inspector/yamlInspectorController.js +++ b/app/kubernetes/components/yaml-inspector/yamlInspectorController.js @@ -33,9 +33,6 @@ class KubernetesYamlInspectorController { } toggleYAMLInspectorExpansion() { - let selector = 'kubernetes-yaml-inspector code-editor > div.CodeMirror'; - let height = this.expanded ? '500px' : '80vh'; - $(selector).css({ height: height }); this.expanded = !this.expanded; } diff --git a/app/kubernetes/react/views/index.ts b/app/kubernetes/react/views/index.ts index ac2509366..3d5a8b8d8 100644 --- a/app/kubernetes/react/views/index.ts +++ b/app/kubernetes/react/views/index.ts @@ -6,6 +6,7 @@ import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; import { IngressesDatatableView } from '@/react/kubernetes/ingresses/IngressDatatable'; import { CreateIngressView } from '@/react/kubernetes/ingresses/CreateIngressView'; +import { DashboardView } from '@/react/kubernetes/DashboardView'; import { ServicesView } from '@/react/kubernetes/ServicesView'; export const viewsModule = angular @@ -24,4 +25,8 @@ export const viewsModule = angular .component( 'kubernetesIngressesCreateView', r2a(withUIRouter(withReactQuery(withCurrentUser(CreateIngressView))), []) + ) + .component( + 'kubernetesDashboardView', + r2a(withUIRouter(withReactQuery(withCurrentUser(DashboardView))), []) ).name; diff --git a/app/kubernetes/services/namespaceService.js b/app/kubernetes/services/namespaceService.js index 3e25ae636..6d82c3e3c 100644 --- a/app/kubernetes/services/namespaceService.js +++ b/app/kubernetes/services/namespaceService.js @@ -7,9 +7,10 @@ import $allSettled from 'Portainer/services/allSettled'; class KubernetesNamespaceService { /* @ngInject */ - constructor($async, KubernetesNamespaces) { + constructor($async, KubernetesNamespaces, LocalStorage) { this.$async = $async; this.KubernetesNamespaces = KubernetesNamespaces; + this.LocalStorage = LocalStorage; this.getAsync = this.getAsync.bind(this); this.getAllAsync = this.getAllAsync.bind(this); @@ -17,6 +18,7 @@ class KubernetesNamespaceService { this.deleteAsync = this.deleteAsync.bind(this); this.getJSONAsync = this.getJSONAsync.bind(this); this.updateFinalizeAsync = this.updateFinalizeAsync.bind(this); + this.refreshCacheAsync = this.refreshCacheAsync.bind(this); } /** @@ -79,11 +81,20 @@ class KubernetesNamespaceService { } } - get(name) { + async get(name, refreshCache = false) { if (name) { return this.$async(this.getAsync, name); } - return this.$async(this.getAllAsync); + const cachedAllowedNamespaces = this.LocalStorage.getAllowedNamespaces(); + if (!cachedAllowedNamespaces || refreshCache) { + const allowedNamespaces = await this.getAllAsync(); + this.LocalStorage.storeAllowedNamespaces(allowedNamespaces); + updateNamespaces(allowedNamespaces); + return allowedNamespaces; + } else { + updateNamespaces(cachedAllowedNamespaces); + return cachedAllowedNamespaces; + } } /** @@ -94,6 +105,7 @@ class KubernetesNamespaceService { const payload = KubernetesNamespaceConverter.createPayload(namespace); const params = {}; const data = await this.KubernetesNamespaces().create(params, payload).$promise; + await this.refreshCacheAsync(); return data; } catch (err) { throw new PortainerError('Unable to create namespace', err); @@ -104,6 +116,14 @@ class KubernetesNamespaceService { return this.$async(this.createAsync, namespace); } + async refreshCacheAsync() { + this.LocalStorage.deleteAllowedNamespaces(); + const allowedNamespaces = await this.getAllAsync(); + this.LocalStorage.storeAllowedNamespaces(allowedNamespaces); + updateNamespaces(allowedNamespaces); + return allowedNamespaces; + } + /** * DELETE */ diff --git a/app/kubernetes/services/resourcePoolService.js b/app/kubernetes/services/resourcePoolService.js index 639c44db1..1b0f03b26 100644 --- a/app/kubernetes/services/resourcePoolService.js +++ b/app/kubernetes/services/resourcePoolService.js @@ -36,8 +36,8 @@ export function KubernetesResourcePoolService( } // getting the quota for all namespaces is costly by default, so disable getting it by default - async function getAll({ getQuota = false }) { - const namespaces = await KubernetesNamespaceService.get(); + async function getAll({ getQuota = false, refreshCache = false }) { + const namespaces = await KubernetesNamespaceService.get('', refreshCache); const pools = await Promise.all( _.map(namespaces, async (namespace) => { const name = namespace.Name; diff --git a/app/kubernetes/views/applications/applications.html b/app/kubernetes/views/applications/applications.html index f36252acf..c36899adf 100644 --- a/app/kubernetes/views/applications/applications.html +++ b/app/kubernetes/views/applications/applications.html @@ -19,6 +19,11 @@ refresh-callback="ctrl.getApplications" on-publishing-mode-click="(ctrl.onPublishingModeClick)" is-primary="true" + namespaces="ctrl.state.namespaces" + namespace="ctrl.state.namespaceName" + on-change-namespace-dropdown="(ctrl.onChangeNamespaceDropdown)" + is-system-resources="ctrl.state.isSystemResources" + set-system-resources="(ctrl.setSystemResources)" > @@ -30,6 +35,11 @@ order-by="Name" refresh-callback="ctrl.getApplications" remove-action="ctrl.removeStacksAction" + namespaces="ctrl.state.namespaces" + namespace="ctrl.state.namespaceName" + on-change-namespace-dropdown="(ctrl.onChangeNamespaceDropdown)" + is-system-resources="ctrl.state.isSystemResources" + set-system-resources="(ctrl.setSystemResources)" > diff --git a/app/kubernetes/views/applications/applicationsController.js b/app/kubernetes/views/applications/applicationsController.js index a339ee2fd..424f47622 100644 --- a/app/kubernetes/views/applications/applicationsController.js +++ b/app/kubernetes/views/applications/applicationsController.js @@ -9,9 +9,23 @@ import { confirmDelete } from '@@/modals/confirm'; class KubernetesApplicationsController { /* @ngInject */ - constructor($async, $state, Notifications, KubernetesApplicationService, HelmService, KubernetesConfigurationService, Authentication, LocalStorage, StackService) { + constructor( + $async, + $state, + $scope, + Authentication, + Notifications, + KubernetesApplicationService, + HelmService, + KubernetesConfigurationService, + LocalStorage, + StackService, + KubernetesNamespaceService + ) { this.$async = $async; this.$state = $state; + this.$scope = $scope; + this.Authentication = Authentication; this.Notifications = Notifications; this.KubernetesApplicationService = KubernetesApplicationService; this.HelmService = HelmService; @@ -19,6 +33,7 @@ class KubernetesApplicationsController { this.Authentication = Authentication; this.LocalStorage = LocalStorage; this.StackService = StackService; + this.KubernetesNamespaceService = KubernetesNamespaceService; this.onInit = this.onInit.bind(this); this.getApplications = this.getApplications.bind(this); @@ -28,6 +43,8 @@ class KubernetesApplicationsController { this.removeStacksAction = this.removeStacksAction.bind(this); this.removeStacksActionAsync = this.removeStacksActionAsync.bind(this); this.onPublishingModeClick = this.onPublishingModeClick.bind(this); + this.onChangeNamespaceDropdown = this.onChangeNamespaceDropdown.bind(this); + this.setSystemResources = this.setSystemResources.bind(this); } selectTab(index) { @@ -126,20 +143,36 @@ class KubernetesApplicationsController { }); } + onChangeNamespaceDropdown(namespaceName) { + this.state.namespaceName = namespaceName; + // save the selected namespaceName in local storage with the key 'kubernetes_namespace_filter_${environmentId}_${userID}' + this.LocalStorage.storeNamespaceFilter(this.endpoint.Id, this.user.ID, namespaceName); + this.getApplicationsAsync(); + } + async getApplicationsAsync() { try { - const [applications, configurations] = await Promise.all([this.KubernetesApplicationService.get(), this.KubernetesConfigurationService.get()]); + const [applications, configurations] = await Promise.all([ + this.KubernetesApplicationService.get(this.state.namespaceName), + this.KubernetesConfigurationService.get(this.state.namespaceName), + ]); const configuredApplications = KubernetesConfigurationHelper.getApplicationConfigurations(applications, configurations); const { helmApplications, nonHelmApplications } = KubernetesApplicationHelper.getNestedApplications(configuredApplications); this.state.applications = [...helmApplications, ...nonHelmApplications]; this.state.stacks = KubernetesStackHelper.stacksFromApplications(applications); this.state.ports = KubernetesApplicationHelper.portMappingsFromApplications(applications); + + this.$scope.$apply(); } catch (err) { this.Notifications.error('Failure', err, 'Unable to retrieve applications'); } } + setSystemResources(flag) { + this.state.isSystemResources = flag; + } + getApplications() { return this.$async(this.getApplicationsAsync); } @@ -153,7 +186,27 @@ class KubernetesApplicationsController { applications: [], stacks: [], ports: [], + namespaces: [], + namespaceName: '', + isSystemResources: undefined, }; + + this.user = this.Authentication.getUserDetails(); + this.state.namespaces = await this.KubernetesNamespaceService.get(); + + const savedNamespace = this.LocalStorage.getNamespaceFilter(this.endpoint.Id, this.user.ID); // could be null if not found, and '' if all namepsaces is selected + const preferredNamespace = savedNamespace === null ? 'default' : savedNamespace; + + this.state.namespaces = this.state.namespaces.filter((n) => n.Status === 'Active'); + this.state.namespaces = _.sortBy(this.state.namespaces, 'Name'); + // set all namespaces ('') if there are no namespaces, or if all namespaces is selected + if (!this.state.namespaces.length || preferredNamespace === '') { + this.state.namespaceName = ''; + } else { + // otherwise, set the preferred namespaceName if it exists, otherwise set the first namespaceName + this.state.namespaceName = this.state.namespaces.find((n) => n.Name === preferredNamespace) ? preferredNamespace : this.state.namespaces[0].Name; + } + await this.getApplications(); this.state.viewReady = true; diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html index 452b6d5a0..79179ac3c 100644 --- a/app/kubernetes/views/applications/create/createApplication.html +++ b/app/kubernetes/views/applications/create/createApplication.html @@ -212,7 +212,7 @@
-
+
@@ -336,7 +336,7 @@
-
+
-
+
diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js index 34f9413dc..8fcff5d04 100644 --- a/app/kubernetes/views/applications/create/createApplicationController.js +++ b/app/kubernetes/views/applications/create/createApplicationController.js @@ -1208,22 +1208,31 @@ class KubernetesCreateApplicationController { ]); this.nodesLimits = nodesLimits; - const nonSystemNamespaces = _.filter(resourcePools, (resourcePool) => !KubernetesNamespaceHelper.isSystemNamespace(resourcePool.Namespace.Name)); + const nonSystemNamespaces = _.filter( + resourcePools, + (resourcePool) => !KubernetesNamespaceHelper.isSystemNamespace(resourcePool.Namespace.Name) && resourcePool.Namespace.Status === 'Active' + ); this.allNamespaces = resourcePools.map(({ Namespace }) => Namespace.Name); this.resourcePools = _.sortBy(nonSystemNamespaces, ({ Namespace }) => (Namespace.Name === 'default' ? 0 : 1)); - const namespaceWithQuota = await this.KubernetesResourcePoolService.get(this.resourcePools[0].Namespace.Name); - this.formValues.ResourcePool = this.resourcePools[0]; - this.formValues.ResourcePool.Quota = namespaceWithQuota.Quota; - if (!this.formValues.ResourcePool) { - return; - } - + // this.state.nodes.memory and this.state.nodes.cpu are used to calculate the slider limits, so set them before calling updateSliders() _.forEach(nodes, (item) => { this.state.nodes.memory += filesizeParser(item.Memory); this.state.nodes.cpu += item.CPU; }); + + if (this.resourcePools.length) { + const namespaceWithQuota = await this.KubernetesResourcePoolService.get(this.resourcePools[0].Namespace.Name); + this.formValues.ResourcePool.Quota = namespaceWithQuota.Quota; + this.updateNamespaceLimits(namespaceWithQuota); + this.updateSliders(namespaceWithQuota); + } + this.formValues.ResourcePool = this.resourcePools[0]; + if (!this.formValues.ResourcePool) { + return; + } + this.nodesLabels = KubernetesNodeHelper.generateNodeLabelsFromNodes(nodes); this.nodeNumber = nodes.length; @@ -1281,9 +1290,6 @@ class KubernetesCreateApplicationController { this.formValues.IsPublishingService = this.formValues.PublishedPorts.length > 0; this.oldFormValues = angular.copy(this.formValues); - - this.updateNamespaceLimits(namespaceWithQuota); - this.updateSliders(namespaceWithQuota); } catch (err) { this.Notifications.error('Failure', err, 'Unable to load view data'); } finally { diff --git a/app/kubernetes/views/configurations/create/createConfiguration.html b/app/kubernetes/views/configurations/create/createConfiguration.html index 8d905b2a1..d4a9fba40 100644 --- a/app/kubernetes/views/configurations/create/createConfiguration.html +++ b/app/kubernetes/views/configurations/create/createConfiguration.html @@ -15,7 +15,7 @@
- +
- - - - - - - - - - - - - - -
Environment - {{ ctrl.endpoint.Name }} -
URL{{ ctrl.endpoint.URL | stripprotocol }}
Tags{{ ctrl.endpointTags }}
- - -
-
- -
-
- - - -
- -
- - - -
-
- - - -
-
- - - -
-
-
diff --git a/app/kubernetes/views/dashboard/dashboard.js b/app/kubernetes/views/dashboard/dashboard.js deleted file mode 100644 index c2ada72c2..000000000 --- a/app/kubernetes/views/dashboard/dashboard.js +++ /dev/null @@ -1,8 +0,0 @@ -angular.module('portainer.kubernetes').component('kubernetesDashboardView', { - templateUrl: './dashboard.html', - controller: 'KubernetesDashboardController', - controllerAs: 'ctrl', - bindings: { - endpoint: '<', - }, -}); diff --git a/app/kubernetes/views/dashboard/dashboardController.js b/app/kubernetes/views/dashboard/dashboardController.js deleted file mode 100644 index f080f949c..000000000 --- a/app/kubernetes/views/dashboard/dashboardController.js +++ /dev/null @@ -1,96 +0,0 @@ -import angular from 'angular'; -import _ from 'lodash-es'; -import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelper'; -import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; -import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models'; - -class KubernetesDashboardController { - /* @ngInject */ - constructor( - $async, - Notifications, - EndpointService, - KubernetesResourcePoolService, - KubernetesApplicationService, - KubernetesConfigurationService, - KubernetesVolumeService, - Authentication, - TagService - ) { - this.$async = $async; - this.Notifications = Notifications; - this.EndpointService = EndpointService; - this.KubernetesResourcePoolService = KubernetesResourcePoolService; - this.KubernetesApplicationService = KubernetesApplicationService; - this.KubernetesConfigurationService = KubernetesConfigurationService; - this.KubernetesVolumeService = KubernetesVolumeService; - this.Authentication = Authentication; - this.TagService = TagService; - - this.onInit = this.onInit.bind(this); - this.getAll = this.getAll.bind(this); - this.getAllAsync = this.getAllAsync.bind(this); - } - - async getAllAsync() { - const isAdmin = this.Authentication.isAdmin(); - const storageClasses = this.endpoint.Kubernetes.Configuration.StorageClasses; - this.showEnvUrl = this.endpoint.Type !== PortainerEndpointTypes.EdgeAgentOnDockerEnvironment && this.endpoint.Type !== PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment; - - try { - const [pools, applications, configurations, volumes, tags] = await Promise.all([ - this.KubernetesResourcePoolService.get(), - this.KubernetesApplicationService.get(), - this.KubernetesConfigurationService.get(), - this.KubernetesVolumeService.get(undefined, storageClasses), - this.TagService.tags(), - ]); - this.applications = applications; - this.volumes = volumes; - - this.endpointTags = this.endpoint.TagIds.length - ? _.join( - _.filter( - _.map(this.endpoint.TagIds, (id) => { - const tag = tags.find((tag) => tag.Id === id); - return tag ? tag.Name : ''; - }), - Boolean - ), - ', ' - ) - : '-'; - - if (!isAdmin) { - this.pools = _.filter(pools, (pool) => !KubernetesNamespaceHelper.isSystemNamespace(pool.Namespace.Name)); - this.configurations = _.filter(configurations, (config) => !KubernetesConfigurationHelper.isSystemToken(config)); - } else { - this.pools = pools; - this.configurations = configurations; - } - } catch (err) { - this.Notifications.error('Failure', err, 'Unable to load dashboard data'); - } - } - - getAll() { - return this.$async(this.getAllAsync); - } - - async onInit() { - this.state = { - viewReady: false, - }; - - await this.getAll(); - - this.state.viewReady = true; - } - - $onInit() { - return this.$async(this.onInit); - } -} - -export default KubernetesDashboardController; -angular.module('portainer.kubernetes').controller('KubernetesDashboardController', KubernetesDashboardController); diff --git a/app/kubernetes/views/deploy/deploy.html b/app/kubernetes/views/deploy/deploy.html index b22a7f91c..cfa13c8f6 100644 --- a/app/kubernetes/views/deploy/deploy.html +++ b/app/kubernetes/views/deploy/deploy.html @@ -12,19 +12,7 @@ Deploy -
Namespace
- -
- -
- -
-
+
+
+ +
+ +
+
+
diff --git a/app/kubernetes/views/deploy/deployController.js b/app/kubernetes/views/deploy/deployController.js index 096c52be5..5d6147907 100644 --- a/app/kubernetes/views/deploy/deployController.js +++ b/app/kubernetes/views/deploy/deployController.js @@ -290,7 +290,8 @@ class KubernetesDeployController { async getNamespacesAsync() { try { const pools = await this.KubernetesResourcePoolService.get(); - const namespaces = _.map(pools, 'Namespace').sort((a, b) => { + let namespaces = pools.filter((pool) => pool.Namespace.Status === 'Active'); + namespaces = _.map(namespaces, 'Namespace').sort((a, b) => { if (a.Name === 'default') { return -1; } diff --git a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js index 583e055e7..fd2224730 100644 --- a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js +++ b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js @@ -35,7 +35,8 @@ class KubernetesResourcePoolController { KubernetesPodService, KubernetesApplicationService, KubernetesIngressService, - KubernetesVolumeService + KubernetesVolumeService, + KubernetesNamespaceService ) { Object.assign(this, { $async, @@ -54,6 +55,7 @@ class KubernetesResourcePoolController { KubernetesApplicationService, KubernetesIngressService, KubernetesVolumeService, + KubernetesNamespaceService, }); this.IngressClassTypes = KubernetesIngressClassTypes; @@ -219,6 +221,7 @@ class KubernetesResourcePoolController { return; } await this.KubernetesResourcePoolService.toggleSystem(this.endpoint.Id, namespaceName, !this.isSystem); + await this.KubernetesNamespaceService.refreshCacheAsync(); this.Notifications.success('Namespace successfully updated', namespaceName); this.$state.reload(this.$state.current); diff --git a/app/kubernetes/views/resource-pools/resourcePools.html b/app/kubernetes/views/resource-pools/resourcePools.html index c63736563..9b8b56230 100644 --- a/app/kubernetes/views/resource-pools/resourcePools.html +++ b/app/kubernetes/views/resource-pools/resourcePools.html @@ -1,4 +1,4 @@ - + diff --git a/app/kubernetes/views/resource-pools/resourcePoolsController.js b/app/kubernetes/views/resource-pools/resourcePoolsController.js index 3aacad7f1..b487bb7c7 100644 --- a/app/kubernetes/views/resource-pools/resourcePoolsController.js +++ b/app/kubernetes/views/resource-pools/resourcePoolsController.js @@ -17,6 +17,12 @@ class KubernetesResourcePoolsController { this.getResourcePoolsAsync = this.getResourcePoolsAsync.bind(this); this.removeAction = this.removeAction.bind(this); this.removeActionAsync = this.removeActionAsync.bind(this); + this.onReload = this.onReload.bind(this); + } + + async onReload() { + await this.KubernetesNamespaceService.refreshCacheAsync(); + this.$state.reload(this.$state.current); } async removeActionAsync(selectedItems) { @@ -44,6 +50,7 @@ class KubernetesResourcePoolsController { } finally { --actionCount; if (actionCount === 0) { + await this.KubernetesNamespaceService.refreshCacheAsync(); this.$state.reload(this.$state.current); } } @@ -70,7 +77,7 @@ class KubernetesResourcePoolsController { async getResourcePoolsAsync() { try { - this.resourcePools = await this.KubernetesResourcePoolService.get('', { getQuota: true }); + this.resourcePools = await this.KubernetesResourcePoolService.get('', { getQuota: true, refreshCache: true }); } catch (err) { this.Notifications.error('Failure', err, 'Unable to retreive namespaces'); } diff --git a/app/portainer/__module.js b/app/portainer/__module.js index 98d6f21af..b43401dd5 100644 --- a/app/portainer/__module.js +++ b/app/portainer/__module.js @@ -300,7 +300,7 @@ angular var home = { name: 'portainer.home', - url: '/home', + url: '/home?redirect&environmentId&environmentName&route', views: { 'content@': { component: 'homeView', diff --git a/app/portainer/components/BoxSelector/index.ts b/app/portainer/components/BoxSelector/index.ts index 14115ea3d..95caaa132 100644 --- a/app/portainer/components/BoxSelector/index.ts +++ b/app/portainer/components/BoxSelector/index.ts @@ -14,6 +14,7 @@ const BoxSelectorReact = react2angular(BoxSelector, [ 'options', 'radioName', 'slim', + 'hiddenSpacingCount', ]); export const boxSelectorModule = angular diff --git a/app/portainer/components/code-editor/code-editor.html b/app/portainer/components/code-editor/code-editor.html index 33d43931b..9347d7c8f 100644 --- a/app/portainer/components/code-editor/code-editor.html +++ b/app/portainer/components/code-editor/code-editor.html @@ -5,4 +5,5 @@ readonly="$ctrl.readOnly" on-change="($ctrl.handleChange)" value="$ctrl.value" + height="$ctrl.height || undefined" > diff --git a/app/portainer/components/code-editor/code-editor.js b/app/portainer/components/code-editor/code-editor.js index 788aede3a..a4347a0a6 100644 --- a/app/portainer/components/code-editor/code-editor.js +++ b/app/portainer/components/code-editor/code-editor.js @@ -10,5 +10,6 @@ angular.module('portainer.app').component('codeEditor', { readOnly: '<', onChange: '<', value: '<', + height: '@', }, }); diff --git a/app/portainer/components/datatables/datatable.css b/app/portainer/components/datatables/datatable.css index 83ad9f01e..84ca06d88 100644 --- a/app/portainer/components/datatables/datatable.css +++ b/app/portainer/components/datatables/datatable.css @@ -66,7 +66,12 @@ .toolBar .searchBar { margin-right: 10px; display: inline-flex; - min-height: 30px; + flex-basis: 7rem; + flex-grow: 1; + flex-shrink: 1; + align-items: center; + min-width: 7rem; + max-width: 14rem; } .datatable .searchBar input[type='text'] { diff --git a/app/portainer/components/form-components/web-editor-form/index.js b/app/portainer/components/form-components/web-editor-form/index.js index b82a7f9ac..5fa476e61 100644 --- a/app/portainer/components/form-components/web-editor-form/index.js +++ b/app/portainer/components/form-components/web-editor-form/index.js @@ -12,6 +12,7 @@ export const webEditorForm = { readOnly: '<', onChange: '<', hideTitle: '<', + height: '@', }, transclude: { diff --git a/app/portainer/components/form-components/web-editor-form/web-editor-form.html b/app/portainer/components/form-components/web-editor-form/web-editor-form.html index b694a5f77..9dd875abf 100644 --- a/app/portainer/components/form-components/web-editor-form/web-editor-form.html +++ b/app/portainer/components/form-components/web-editor-form/web-editor-form.html @@ -47,6 +47,7 @@ yml="$ctrl.yml" value="$ctrl.value" on-change="($ctrl.onChange)" + height="{{ $ctrl.height }}" >
diff --git a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js index 3f90e5c13..262d278e8 100644 --- a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js +++ b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js @@ -7,7 +7,7 @@ import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhoo class StackRedeployGitFormController { /* @ngInject */ - constructor($async, $state, $compile, $scope, StackService, ModalService, Notifications, FormHelper) { + constructor($async, $state, $compile, $scope, StackService, Notifications, FormHelper) { this.$async = $async; this.$state = $state; this.$compile = $compile; @@ -182,7 +182,7 @@ class StackRedeployGitFormController { this.formValues.AutoUpdate = parseAutoUpdateResponse(this.stack.AutoUpdate); - if (this.stack.AutoUpdate.Webhook) { + if (this.stack.AutoUpdate && this.stack.AutoUpdate.Webhook) { this.state.webhookId = this.stack.AutoUpdate.Webhook; } diff --git a/app/portainer/components/theme/theme-settings.controller.js b/app/portainer/components/theme/theme-settings.controller.js index 3c6bb47eb..c0d5b9922 100644 --- a/app/portainer/components/theme/theme-settings.controller.js +++ b/app/portainer/components/theme/theme-settings.controller.js @@ -13,7 +13,6 @@ export default class ThemeSettingsController { this.UserService = UserService; this.setThemeColor = this.setThemeColor.bind(this); - this.setSubtleUpgradeButton = this.setSubtleUpgradeButton.bind(this); } async setThemeColor(color) { @@ -29,13 +28,6 @@ export default class ThemeSettingsController { }); } - async setSubtleUpgradeButton(value) { - return this.$async(async () => { - this.state.subtleUpgradeButton = value; - this.updateThemeSettings({ subtleUpgradeButton: value }); - }); - } - async updateThemeSettings(theme) { try { if (!this.state.isDemo) { @@ -57,7 +49,6 @@ export default class ThemeSettingsController { userId: null, themeColor: 'auto', isDemo: state.application.demoEnvironment.enabled, - subtleUpgradeButton: false, }; this.state.availableThemes = options; @@ -67,7 +58,6 @@ export default class ThemeSettingsController { const user = await this.UserService.user(this.state.userId); this.state.themeColor = user.ThemeSettings.color || this.state.themeColor; - this.state.subtleUpgradeButton = !!user.ThemeSettings.subtleUpgradeButton; } catch (err) { notifyError('Failure', err, 'Unable to get user details'); } diff --git a/app/portainer/components/theme/theme-settings.html b/app/portainer/components/theme/theme-settings.html index e3fa245e8..58f2dc752 100644 --- a/app/portainer/components/theme/theme-settings.html +++ b/app/portainer/components/theme/theme-settings.html @@ -9,16 +9,6 @@ Dark and High-contrast theme are experimental. Some UI components might not display properly.

- -
- -
diff --git a/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js b/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js index 52d2e4867..dd2fbde56 100644 --- a/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js +++ b/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js @@ -87,7 +87,7 @@ export default class OAuthSettingsController { const confirmed = await confirm({ title: 'Hide internal authentication prompt', message: 'By hiding internal authentication prompt, you will only be able to login via SSO. Are you sure?', - confirmButton: buildConfirmButton('Confirm', 'btn-warning'), + confirmButton: buildConfirmButton('Confirm', 'danger'), modalType: ModalType.Warn, }); diff --git a/app/portainer/react/components/enviroments-list-view-components.ts b/app/portainer/react/components/environments-list-view-components.ts similarity index 100% rename from app/portainer/react/components/enviroments-list-view-components.ts rename to app/portainer/react/components/environments-list-view-components.ts diff --git a/app/portainer/react/components/envronments.ts b/app/portainer/react/components/environments.ts similarity index 56% rename from app/portainer/react/components/envronments.ts rename to app/portainer/react/components/environments.ts index 4e7f9ae68..057f4ce42 100644 --- a/app/portainer/react/components/envronments.ts +++ b/app/portainer/react/components/environments.ts @@ -1,16 +1,13 @@ import angular from 'angular'; import { r2a } from '@/react-tools/react2angular'; -import { withControlledInput } from '@/react-tools/withControlledInput'; import { EdgeKeyDisplay } from '@/react/portainer/environments/ItemView/EdgeKeyDisplay'; import { KVMControl } from '@/react/portainer/environments/KvmView/KVMControl'; -import { GpusList } from '@/react/portainer/environments/wizard/EnvironmentsCreationView/shared/Hardware/GpusList'; export const environmentsModule = angular .module('portainer.app.react.components.environments', []) .component('edgeKeyDisplay', r2a(EdgeKeyDisplay, ['edgeKey'])) - .component('kvmControl', r2a(KVMControl, ['deviceId', 'server', 'token'])) .component( - 'gpusList', - r2a(withControlledInput(GpusList), ['value', 'onChange']) + 'kvmControl', + r2a(KVMControl, ['deviceId', 'server', 'token']) ).name; diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts index 2bab4d0c8..5256a0130 100644 --- a/app/portainer/react/components/index.ts +++ b/app/portainer/react/components/index.ts @@ -4,6 +4,7 @@ import { r2a } from '@/react-tools/react2angular'; import { withCurrentUser } from '@/react-tools/withCurrentUser'; import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; +import { AnnotationsBeTeaser } from '@/react/kubernetes/annotations/AnnotationsBeTeaser'; import { Icon } from '@@/Icon'; import { ReactQueryDevtoolsWrapper } from '@@/ReactQueryDevtoolsWrapper'; @@ -32,15 +33,19 @@ import { customTemplatesModule } from './custom-templates'; import { gitFormModule } from './git-form'; import { settingsModule } from './settings'; import { accessControlModule } from './access-control'; -import { envListModule } from './enviroments-list-view-components'; +import { environmentsModule } from './environments'; +import { envListModule } from './environments-list-view-components'; +import { registriesModule } from './registries'; export const componentsModule = angular .module('portainer.app.react.components', [ - customTemplatesModule, - gitFormModule, - settingsModule, accessControlModule, + customTemplatesModule, envListModule, + environmentsModule, + gitFormModule, + registriesModule, + settingsModule, ]) .component( 'tagSelector', @@ -111,7 +116,17 @@ export const componentsModule = angular .component('reactQueryDevTools', r2a(ReactQueryDevtoolsWrapper, [])) .component( 'dashboardItem', - r2a(DashboardItem, ['icon', 'type', 'value', 'children']) + r2a(DashboardItem, [ + 'icon', + 'type', + 'value', + 'to', + 'children', + 'pluralType', + 'isLoading', + 'isRefetching', + 'dataCy', + ]) ) .component( 'datatableSearchbar', @@ -152,6 +167,7 @@ export const componentsModule = angular 'options', 'isMulti', 'isClearable', + 'components', ]) ) .component( @@ -178,4 +194,5 @@ export const componentsModule = angular 'value', 'height', ]) - ).name; + ) + .component('annotationsBeTeaser', r2a(AnnotationsBeTeaser, [])).name; diff --git a/app/portainer/react/views/wizard.ts b/app/portainer/react/views/wizard.ts index efb8c057e..82635e105 100644 --- a/app/portainer/react/views/wizard.ts +++ b/app/portainer/react/views/wizard.ts @@ -46,7 +46,7 @@ function config($stateRegistryProvider: StateRegistry) { $stateRegistryProvider.register({ name: 'portainer.wizard.endpoints', - url: '/endpoints?edgeDevice', + url: '/endpoints', views: { 'content@': { component: 'wizardEnvironmentTypeSelectView', diff --git a/app/portainer/services/api/endpointService.js b/app/portainer/services/api/endpointService.js index 22b1b45a4..9c726b402 100644 --- a/app/portainer/services/api/endpointService.js +++ b/app/portainer/services/api/endpointService.js @@ -90,8 +90,7 @@ angular.module('portainer.app').factory('EndpointService', [ TLSCAFile, TLSCertFile, TLSKeyFile, - checkinInterval, - isEdgeDevice + checkinInterval ) { var deferred = $q.defer(); @@ -113,8 +112,7 @@ angular.module('portainer.app').factory('EndpointService', [ TLSCAFile, TLSCertFile, TLSKeyFile, - checkinInterval, - isEdgeDevice + checkinInterval ) .then(function success(response) { deferred.resolve(response.data); diff --git a/app/portainer/services/authentication.js b/app/portainer/services/authentication.js index 1ffc9b1a1..02f85654d 100644 --- a/app/portainer/services/authentication.js +++ b/app/portainer/services/authentication.js @@ -36,7 +36,6 @@ angular.module('portainer.app').factory('Authentication', [ await setUser(jwt); return true; } catch (error) { - console.log('Unable to initialize authentication service', error); return tryAutoLoginExtension(); } } diff --git a/app/portainer/services/fileUpload.js b/app/portainer/services/fileUpload.js index 0eba97333..914efaea0 100644 --- a/app/portainer/services/fileUpload.js +++ b/app/portainer/services/fileUpload.js @@ -153,8 +153,7 @@ angular.module('portainer.app').factory('FileUploadService', [ TLSCAFile, TLSCertFile, TLSKeyFile, - checkinInterval, - isEdgeDevice + checkinInterval ) { return Upload.upload({ url: 'api/endpoints', @@ -172,7 +171,6 @@ angular.module('portainer.app').factory('FileUploadService', [ TLSCertFile: TLSCertFile, TLSKeyFile: TLSKeyFile, CheckinInterval: checkinInterval, - IsEdgeDevice: isEdgeDevice, }, ignoreLoadingBar: true, }); diff --git a/app/portainer/services/localStorage.js b/app/portainer/services/localStorage.js index 632dfff18..10ada0cdc 100644 --- a/app/portainer/services/localStorage.js +++ b/app/portainer/services/localStorage.js @@ -105,6 +105,13 @@ angular.module('portainer.app').factory('LocalStorage', [ const activeTab = localStorageService.get('active_tab_' + key); return activeTab === null ? 0 : activeTab; }, + storeNamespaceFilter: function (environmentId, userID, data) { + // store one filter per environment + localStorageService.set(`kubernetes_namespace_filter_${environmentId}_${userID}`, data); + }, + getNamespaceFilter: function (environmentId, userID) { + return localStorageService.get(`kubernetes_namespace_filter_${environmentId}_${userID}`); + }, storeLogoutReason: (reason) => localStorageService.set('logout_reason', reason), getLogoutReason: () => localStorageService.get('logout_reason'), cleanLogoutReason: () => localStorageService.remove('logout_reason'), @@ -112,7 +119,7 @@ angular.module('portainer.app').factory('LocalStorage', [ localStorageService.clearAll(); }, cleanAuthData() { - localStorageService.remove('JWT', 'APPLICATION_STATE', 'LOGIN_STATE_UUID'); + localStorageService.remove('JWT', 'APPLICATION_STATE', 'LOGIN_STATE_UUID', 'ALLOWED_NAMESPACES'); }, storeKubernetesSummaryToggle(value) { localStorageService.set('kubernetes_summary_expanded', value); @@ -120,6 +127,15 @@ angular.module('portainer.app').factory('LocalStorage', [ getKubernetesSummaryToggle() { return localStorageService.get('kubernetes_summary_expanded'); }, + storeAllowedNamespaces: function (namespaces) { + localStorageService.set('ALLOWED_NAMESPACES', namespaces); + }, + getAllowedNamespaces: function () { + return localStorageService.get('ALLOWED_NAMESPACES'); + }, + deleteAllowedNamespaces: function () { + localStorageService.remove('ALLOWED_NAMESPACES'); + }, }; }, ]); diff --git a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html index 95416ac92..d6b889385 100644 --- a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html +++ b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html @@ -14,6 +14,7 @@ value="$ctrl.settings.ServerType" options="$ctrl.boxSelectorOptions" on-change="($ctrl.onChangeServerType)" + slim="true" > [...tagKeys.all, id] as const, }; -export function useTags(select?: (tags: Tag[]) => T[]) { - const { data, isLoading } = useQuery(tagKeys.all, () => getTags(), { +export function useTags({ + select, +}: { select?: (tags: Tag[]) => T } = {}) { + return useQuery(tagKeys.all, () => getTags(), { staleTime: 50, select, ...withError('Failed to retrieve tags'), }); +} - return { tags: data, isLoading }; +export function useTagsForEnvironment(environmentId: EnvironmentId) { + const { data: tags, isLoading } = useTags({ + select: (tags) => tags.filter((tag) => tag.Endpoints[environmentId]), + }); + + return { tags, isLoading }; } export function useCreateTagMutation() { diff --git a/app/portainer/tags/types.ts b/app/portainer/tags/types.ts index f7c0de9a0..3440871e4 100644 --- a/app/portainer/tags/types.ts +++ b/app/portainer/tags/types.ts @@ -3,4 +3,5 @@ export type TagId = number; export interface Tag { ID: TagId; Name: string; + Endpoints: Record; } diff --git a/app/portainer/users/types.ts b/app/portainer/users/types.ts index 5b5a9ecf4..4b47362b8 100644 --- a/app/portainer/users/types.ts +++ b/app/portainer/users/types.ts @@ -22,6 +22,5 @@ export type User = { }; ThemeSettings: { color: 'dark' | 'light' | 'highcontrast' | 'auto'; - subtleUpgradeButton: boolean; }; }; diff --git a/app/portainer/views/auth/authController.js b/app/portainer/views/auth/authController.js index da92669ae..a03e19109 100644 --- a/app/portainer/views/auth/authController.js +++ b/app/portainer/views/auth/authController.js @@ -130,7 +130,7 @@ class AuthenticationController { async checkForEndpointsAsync() { try { const isAdmin = this.Authentication.isAdmin(); - const endpoints = await getEnvironments({ limit: 1 }); + const endpoints = await getEnvironments({ limit: 1, query: { excludeSnapshots: true } }); if (this.Authentication.getUserDetails().forceChangePassword) { return this.$state.go('portainer.account'); diff --git a/app/portainer/views/devices/import/importDeviceController.js b/app/portainer/views/devices/import/importDeviceController.js index bc526bd1e..6770196f1 100644 --- a/app/portainer/views/devices/import/importDeviceController.js +++ b/app/portainer/views/devices/import/importDeviceController.js @@ -82,8 +82,7 @@ angular null, null, null, - null, - true + null ); } catch (err) { Notifications.error('Failure', err, 'Unable to create the environment'); diff --git a/app/portainer/views/endpoints/edit/endpoint.html b/app/portainer/views/endpoints/edit/endpoint.html index 7d57c1406..5ca27478a 100644 --- a/app/portainer/views/endpoints/edit/endpoint.html +++ b/app/portainer/views/endpoints/edit/endpoint.html @@ -210,14 +210,15 @@
-
Hardware acceleration
- +
+ +
diff --git a/app/react/components/BoxSelector/BoxSelectorItem.tsx b/app/react/components/BoxSelector/BoxSelectorItem.tsx index bb5ae97c3..890440f81 100644 --- a/app/react/components/BoxSelector/BoxSelectorItem.tsx +++ b/app/react/components/BoxSelector/BoxSelectorItem.tsx @@ -2,10 +2,10 @@ import clsx from 'clsx'; import { Icon as ReactFeatherComponentType, Check } from 'lucide-react'; import { Fragment } from 'react'; -import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service'; import { Icon } from '@/react/components/Icon'; import { BadgeIcon } from '@@/BadgeIcon'; +import { getFeatureDetails } from '@@/BEFeatureIndicator/utils'; import styles from './BoxSelectorItem.module.css'; import { BoxSelectorOption, Value } from './types'; @@ -36,7 +36,9 @@ export function BoxSelectorItem({ slim = false, checkIcon = Check, }: Props) { - const limitedToBE = isLimitedToBE(option.feature); + const { limitedToBE = false, url: featureUrl } = getFeatureDetails( + option.feature + ); const beIndicatorTooltipId = `box-selector-item-${radioName}-${option.id}-limited`; @@ -57,7 +59,12 @@ export function BoxSelectorItem({ type={type} checkIcon={checkIcon} > - {limitedToBE && } + {limitedToBE && ( + + )}
({ return ; } - if (option.iconType === 'logo') { - return ; + if (option.iconType === 'raw') { + return ( + + ); } - return ( - - ); + return ; } } diff --git a/app/react/components/BoxSelector/LimitedToBeIndicator.tsx b/app/react/components/BoxSelector/LimitedToBeIndicator.tsx index f0b850272..ad992a5e7 100644 --- a/app/react/components/BoxSelector/LimitedToBeIndicator.tsx +++ b/app/react/components/BoxSelector/LimitedToBeIndicator.tsx @@ -1,24 +1,24 @@ import { HelpCircle } from 'lucide-react'; import clsx from 'clsx'; -import { FeatureId } from '@/react/portainer/feature-flags/enums'; - import { TooltipWithChildren } from '@@/Tip/TooltipWithChildren'; -import { getFeatureDetails } from '@@/BEFeatureIndicator/utils'; interface Props { tooltipId: string; - featureId?: FeatureId; + url?: string; } -export function LimitedToBeIndicator({ featureId, tooltipId }: Props) { - const { url } = getFeatureDetails(featureId); - +export function LimitedToBeIndicator({ tooltipId, url }: Props) { return (
- - BE Feature + + BE Feature = { label: 'Kubernetes', description: 'Kubernetes manifest format', value: 'kubernetes', + iconType: 'logo', }; export const compose: BoxSelectorOption<'compose'> = { @@ -17,4 +18,5 @@ export const compose: BoxSelectorOption<'compose'> = { label: 'Compose', description: 'docker-compose format', value: 'compose', + iconType: 'logo', }; diff --git a/app/react/components/CodeEditor.module.css b/app/react/components/CodeEditor.module.css new file mode 100644 index 000000000..3cb2df907 --- /dev/null +++ b/app/react/components/CodeEditor.module.css @@ -0,0 +1,72 @@ +.root { + --text-cm-default-color: var(--blue-1); + --text-cm-meta-color: var(--black-color); + --text-cm-string-color: var(--red-3); + --text-cm-number-color: var(--green-1); + --text-cm-keyword-color: var(--ui-blue-dark-9); + --text-codemirror-color: var(--black-color); + --bg-codemirror-color: var(--white-color); + --bg-codemirror-gutters-color: var(--grey-17); + --bg-codemirror-selected-color: var(--grey-22); + --border-codemirror-cursor-color: var(--black-color); +} + +:global([theme='dark']) .root { + --text-cm-default-color: var(--blue-10); + --text-cm-meta-color: var(--white-color); + --text-cm-string-color: var(--red-5); + --text-cm-number-color: var(--green-2); + --text-cm-keyword-color: var(--ui-purple-6); + --text-codemirror-color: var(--white-color); + --bg-codemirror-color: var(--grey-2); + --bg-codemirror-gutters-color: var(--grey-3); + --bg-codemirror-selected-color: var(--grey-3); + --border-codemirror-cursor-color: var(--white-color); +} + +:global([theme='highcontrast']) .root { + --text-cm-default-color: var(--blue-9); + --text-cm-meta-color: var(--white-color); + --text-cm-string-color: var(--red-7); + --text-cm-number-color: var(--green-2); + --text-cm-keyword-color: var(--ui-purple-6); + --text-codemirror-color: var(--white-color); + --bg-codemirror-color: var(--black-color); + --bg-codemirror-gutters-color: var(--ui-gray-warm-11); + --bg-codemirror-selected-color: var(--grey-3); + --border-codemirror-cursor-color: var(--white-color); +} + +.root :global(.cm-editor .cm-gutters) { + border-right: 0px; +} + +.root :global(.cm-editor .cm-gutters .cm-lineNumbers .cm-gutterElement) { + text-align: left; +} + +.root :global(.cm-editor), +.root :global(.cm-editor .cm-scroller) { + border-radius: 8px; +} + +/* Search Panel */ +/* Ideally we would use a react component for that, but this is the easy solution for onw */ + +.root :global(.cm-panels.cm-panels-bottom) { + background-color: var(--bg-codemirror-gutters-color); + border-top-color: transparent; + color: var(--text-codemirror-color); +} + +.root :global(.cm-button) { + @apply bg-blue-8; + color: var(--text-codemirror-color); + background-image: none; +} + +.root :global(.cm-textfield) { + border: 1px solid var(--border-form-control-color); + background-color: var(--bg-inputbox); + color: var(--text-form-control-color); +} diff --git a/app/react/components/CodeEditor.tsx b/app/react/components/CodeEditor.tsx index f0ad8255c..8d77845aa 100644 --- a/app/react/components/CodeEditor.tsx +++ b/app/react/components/CodeEditor.tsx @@ -1,7 +1,11 @@ import CodeMirror from '@uiw/react-codemirror'; -import { StreamLanguage } from '@codemirror/language'; +import { StreamLanguage, LanguageSupport } from '@codemirror/language'; import { yaml } from '@codemirror/legacy-modes/mode/yaml'; import { useMemo } from 'react'; +import { createTheme } from '@uiw/codemirror-themes'; +import { tags as highlightTags } from '@lezer/highlight'; + +import styles from './CodeEditor.module.css'; interface Props { id: string; @@ -13,6 +17,30 @@ interface Props { height?: string; } +const theme = createTheme({ + theme: 'light', + settings: { + background: 'var(--bg-codemirror-color)', + foreground: 'var(--text-codemirror-color)', + caret: 'var(--border-codemirror-cursor-color)', + selection: 'var(--bg-codemirror-selected-color)', + selectionMatch: 'var(--bg-codemirror-selected-color)', + gutterBackground: 'var(--bg-codemirror-gutters-color)', + }, + styles: [ + { tag: highlightTags.atom, color: 'var(--text-cm-default-color)' }, + { tag: highlightTags.meta, color: 'var(--text-cm-meta-color)' }, + { + tag: [highlightTags.string, highlightTags.special(highlightTags.brace)], + color: 'var(--text-cm-string-color)', + }, + { tag: highlightTags.number, color: 'var(--text-cm-number-color)' }, + { tag: highlightTags.keyword, color: 'var(--text-cm-keyword-color)' }, + ], +}); + +const yamlLanguage = new LanguageSupport(StreamLanguage.define(yaml)); + export function CodeEditor({ id, onChange, @@ -22,13 +50,12 @@ export function CodeEditor({ height = '500px', yaml: isYaml, }: Props) { - const extensions = useMemo( - () => (isYaml ? [StreamLanguage.define(yaml)] : []), - [isYaml] - ); + const extensions = useMemo(() => (isYaml ? [yamlLanguage] : []), [isYaml]); return ( ) { - return
{children}
; + return
{children}
; } diff --git a/app/react/components/DashboardItem/DashboardItem.tsx b/app/react/components/DashboardItem/DashboardItem.tsx index 5a2492bbe..bf2107b3c 100644 --- a/app/react/components/DashboardItem/DashboardItem.tsx +++ b/app/react/components/DashboardItem/DashboardItem.tsx @@ -1,25 +1,62 @@ import { ReactNode } from 'react'; import clsx from 'clsx'; +import { Loader2 } from 'lucide-react'; import { Icon, IconProps } from '@/react/components/Icon'; import { pluralize } from '@/portainer/helpers/strings'; +import { Link } from '@@/Link'; + interface Props extends IconProps { - value?: number; type: string; + pluralType?: string; // in case the pluralise function isn't suitable + isLoading?: boolean; + isRefetching?: boolean; + value?: number; + to?: string; children?: ReactNode; + dataCy?: string; } -export function DashboardItem({ value, icon, type, children }: Props) { - return ( +export function DashboardItem({ + icon, + type, + pluralType, + isLoading, + isRefetching, + value, + to, + children, + dataCy, +}: Props) { + const Item = (
+
+ Refreshing total + +
+
+ Loading total + +
- {typeof value !== 'undefined' ? value : '-'} + {typeof value === 'undefined' ? '-' : value}
- {pluralize(value || 0, type)} + {pluralize(value || 0, type, pluralType)}
@@ -61,4 +98,13 @@ export function DashboardItem({ value, icon, type, children }: Props) {
); + + if (to) { + return ( + + {Item} + + ); + } + return Item; } diff --git a/app/react/components/InsightsBox/InsightsBox.stories.tsx b/app/react/components/InsightsBox/InsightsBox.stories.tsx new file mode 100644 index 000000000..b98bbd712 --- /dev/null +++ b/app/react/components/InsightsBox/InsightsBox.stories.tsx @@ -0,0 +1,18 @@ +import { Meta, Story } from '@storybook/react'; + +import { InsightsBox, Props } from './InsightsBox'; + +export default { + component: InsightsBox, + header: 'Components/InsightsBox', +} as Meta; + +function Template({ header, content }: Props) { + return ; +} + +export const Primary: Story = Template.bind({}); +Primary.args = { + header: 'Insights box header', + content: 'This is the content of the insights box', +}; diff --git a/app/react/components/InsightsBox/InsightsBox.test.tsx b/app/react/components/InsightsBox/InsightsBox.test.tsx new file mode 100644 index 000000000..5fbc9bb23 --- /dev/null +++ b/app/react/components/InsightsBox/InsightsBox.test.tsx @@ -0,0 +1,16 @@ +import { render } from '@testing-library/react'; + +import { InsightsBox } from './InsightsBox'; + +test('should display a InsightsBox with a header and content', async () => { + const header = 'test header'; + const content = 'test content'; + const { findByText } = render( + + ); + + const headerFound = await findByText(header); + expect(headerFound).toBeTruthy(); + const contentFound = await findByText(content); + expect(contentFound).toBeTruthy(); +}); diff --git a/app/react/components/InsightsBox/InsightsBox.tsx b/app/react/components/InsightsBox/InsightsBox.tsx new file mode 100644 index 000000000..b294b9815 --- /dev/null +++ b/app/react/components/InsightsBox/InsightsBox.tsx @@ -0,0 +1,78 @@ +import clsx from 'clsx'; +import { Lightbulb, X } from 'lucide-react'; +import { ReactNode } from 'react'; +import { useStore } from 'zustand'; + +import { Button } from '@@/buttons'; + +import { insightStore } from './insights-store'; + +export type Props = { + header?: string; + content?: ReactNode; + setHtmlContent?: boolean; + insightCloseId?: string; // set if you want to be able to close the box and not show it again + type?: 'default' | 'slim'; + className?: string; +}; + +export function InsightsBox({ + header, + content, + insightCloseId, + type = 'default', + className, +}: Props) { + // allow to close the box and not show it again in local storage with zustand + const { addInsightIDClosed, isClosed } = useStore(insightStore); + const isInsightClosed = isClosed(insightCloseId); + + if (isInsightClosed) { + return null; + } + + return ( +
+
+ +
+
+ {header && ( +

+ {header} +

+ )} + {content && ( +
+ {content} +
+ )} +
+ {insightCloseId && ( +
+ ); +} diff --git a/app/react/components/InsightsBox/index.ts b/app/react/components/InsightsBox/index.ts new file mode 100644 index 000000000..c02dcafa9 --- /dev/null +++ b/app/react/components/InsightsBox/index.ts @@ -0,0 +1 @@ +export { InsightsBox } from './InsightsBox'; diff --git a/app/react/components/InsightsBox/insights-store.ts b/app/react/components/InsightsBox/insights-store.ts new file mode 100644 index 000000000..a35881158 --- /dev/null +++ b/app/react/components/InsightsBox/insights-store.ts @@ -0,0 +1,35 @@ +import { createStore } from 'zustand'; +import { persist } from 'zustand/middleware'; + +import { keyBuilder } from '@/react/hooks/useLocalStorage'; + +interface InsightsStore { + insightIDsClosed: string[]; + addInsightIDClosed: (insightIDClosed: string) => void; + isClosed: (insightID?: string) => boolean; +} + +export const insightStore = createStore()( + persist( + (set, get) => ({ + insightIDsClosed: [], + addInsightIDClosed: (insightIDClosed: string) => { + set((state) => { + const currentIDsClosed = state.insightIDsClosed || []; + return { insightIDsClosed: [...currentIDsClosed, insightIDClosed] }; + }); + }, + isClosed: (insightID?: string) => { + if (!insightID) { + return false; + } + const currentIDsClosed = get().insightIDsClosed || []; + return currentIDsClosed.includes(insightID); + }, + }), + { + name: keyBuilder('insightIDsClosed'), + getStorage: () => localStorage, + } + ) +); diff --git a/app/react/components/PageHeader/NotificationsMenu.tsx b/app/react/components/PageHeader/NotificationsMenu.tsx index 69b0f35e7..e9639ddfe 100644 --- a/app/react/components/PageHeader/NotificationsMenu.tsx +++ b/app/react/components/PageHeader/NotificationsMenu.tsx @@ -33,6 +33,7 @@ export function NotificationsMenu() { notificationsStore, (state) => state.userNotifications[user.Id] ); + const reducedNotifications = userNotifications?.slice(0, 50); return ( @@ -55,7 +56,7 @@ export function NotificationsMenu() { 0 ? notificationStyles.badge : '' + reducedNotifications?.length > 0 ? notificationStyles.badge : '' } />
@@ -77,7 +78,7 @@ export function NotificationsMenu() {

Notifications

- {userNotifications?.length > 0 && ( + {reducedNotifications?.length > 0 && (
- {userNotifications?.length > 0 ? ( + {reducedNotifications?.length > 0 ? ( <>
- {userNotifications.map((notification) => ( + {reducedNotifications.map((notification) => ( diff --git a/app/react/components/PageHeader/UserMenu.tsx b/app/react/components/PageHeader/UserMenu.tsx index b6e1de2a5..0e7fe48ef 100644 --- a/app/react/components/PageHeader/UserMenu.tsx +++ b/app/react/components/PageHeader/UserMenu.tsx @@ -8,6 +8,7 @@ import { UISrefProps, useSref } from '@uirouter/react'; import clsx from 'clsx'; import { User, ChevronDown } from 'lucide-react'; +import { queryClient } from '@/react-tools/react-query'; import { AutomationTestingProps } from '@/types'; import { useUser } from '@/react/hooks/useUser'; @@ -78,7 +79,10 @@ function MenuLink({ return ( { + queryClient.clear(); + anchorProps.onClick(e); + }} className={styles.menuLink} aria-label={label} data-cy={dataCy} diff --git a/app/react/components/TagSelector/TagSelector.test.tsx b/app/react/components/TagSelector/TagSelector.test.tsx index a547ae973..c5eb3d157 100644 --- a/app/react/components/TagSelector/TagSelector.test.tsx +++ b/app/react/components/TagSelector/TagSelector.test.tsx @@ -19,10 +19,12 @@ test('should show the selected tags', async () => { { ID: 1, Name: 'tag1', + Endpoints: {}, }, { ID: 2, Name: 'tag2', + Endpoints: {}, }, ]; diff --git a/app/react/components/TagSelector/TagSelector.tsx b/app/react/components/TagSelector/TagSelector.tsx index 79ee52fca..2c48e2908 100644 --- a/app/react/components/TagSelector/TagSelector.tsx +++ b/app/react/components/TagSelector/TagSelector.tsx @@ -22,17 +22,17 @@ interface Option { export function TagSelector({ value, allowCreate = false, onChange }: Props) { // change the struct because react-select has a bug with Creatable (https://github.com/JedWatson/react-select/issues/3417#issuecomment-461868989) - const tagsQuery = useTags((tags) => - tags.map((opt) => ({ label: opt.Name, value: opt.ID })) - ); + const tagsQuery = useTags({ + select: (tags) => tags?.map((opt) => ({ label: opt.Name, value: opt.ID })), + }); const createTagMutation = useCreateTagMutation(); - if (!tagsQuery.tags) { + if (!tagsQuery.data) { return null; } - const { tags } = tagsQuery; + const { data: tags } = tagsQuery; const selectedTags = _.compact( value.map((id) => tags.find((tag) => tag.value === id)) diff --git a/app/react/components/Tip/TextTip/TextTip.tsx b/app/react/components/Tip/TextTip/TextTip.tsx index 628241895..aff8a40e0 100644 --- a/app/react/components/Tip/TextTip/TextTip.tsx +++ b/app/react/components/Tip/TextTip/TextTip.tsx @@ -19,10 +19,10 @@ export function TextTip({ children, }: PropsWithChildren) { return ( -

+

{children} -

+
); } diff --git a/app/react/components/UsersSelector/UsersSelector.mocks.ts b/app/react/components/UsersSelector/UsersSelector.mocks.ts index 2ebc35b7f..a245054e3 100644 --- a/app/react/components/UsersSelector/UsersSelector.mocks.ts +++ b/app/react/components/UsersSelector/UsersSelector.mocks.ts @@ -26,7 +26,6 @@ export function createMockUser(id: number, username: string): UserViewModel { AuthenticationMethod: '', ThemeSettings: { color: 'auto', - subtleUpgradeButton: false, }, }; } diff --git a/app/react/components/buttons/Button.tsx b/app/react/components/buttons/Button.tsx index f45d8b0e3..acd9d4f61 100644 --- a/app/react/components/buttons/Button.tsx +++ b/app/react/components/buttons/Button.tsx @@ -63,7 +63,11 @@ export function Button({ type={type} disabled={disabled} className={clsx(`btn btn-${color}`, sizeClass(size), className)} - onClick={onClick} + onClick={(e) => { + if (!disabled) { + onClick?.(e); + } + }} title={title} // eslint-disable-next-line react/jsx-props-no-spreading {...ariaProps} diff --git a/app/react/components/form-components/InputList/InputList.module.css b/app/react/components/form-components/InputList/InputList.module.css index b1c67ea6c..fe03fb917 100644 --- a/app/react/components/form-components/InputList/InputList.module.css +++ b/app/react/components/form-components/InputList/InputList.module.css @@ -1,7 +1,3 @@ -.items { - margin-top: 10px; -} - .items > * + * { margin-top: 2px; } @@ -24,11 +20,6 @@ margin-bottom: 20px; } -.item-actions { - display: flex; - margin-left: 2px; -} - .default-item { width: 100% !important; } diff --git a/app/react/components/form-components/InputList/InputList.tsx b/app/react/components/form-components/InputList/InputList.tsx index a2a5f9c04..89540d5d5 100644 --- a/app/react/components/form-components/InputList/InputList.tsx +++ b/app/react/components/form-components/InputList/InputList.tsx @@ -1,9 +1,9 @@ import { ComponentType } from 'react'; import clsx from 'clsx'; import { FormikErrors } from 'formik'; -import { ArrowDown, ArrowUp, Trash2 } from 'lucide-react'; +import { ArrowDown, ArrowUp, Plus, Trash2 } from 'lucide-react'; -import { AddButton, Button } from '@@/buttons'; +import { Button } from '@@/buttons'; import { Tooltip } from '@@/Tip/Tooltip'; import { TextTip } from '@@/Tip/TextTip'; @@ -79,18 +79,10 @@ export function InputList({ return (
-
+ {label} {tooltip && } -
- {!(isAddButtonHidden || readOnly) && ( - - )} +
{textTip && ( @@ -99,68 +91,86 @@ export function InputList({
)} -
- {value.map((item, index) => { - const key = itemKeyGetter(item, index); - const error = typeof errors === 'object' ? errors[index] : undefined; + {value.length > 0 && ( +
+ {value.map((item, index) => { + const key = itemKeyGetter(item, index); + const error = + typeof errors === 'object' ? errors[index] : undefined; - return ( -
- {Item ? ( - handleChangeItem(key, value)} - error={error} - disabled={disabled} - readOnly={readOnly} - /> - ) : ( - renderItem( - item, - (value: T) => handleChangeItem(key, value), - error - ) - )} -
- {!readOnly && movable && ( - <> -
-
- ); - })} + ); + })} +
+ )} +
+ {!(isAddButtonHidden || readOnly) && ( + + )}
); diff --git a/app/react/components/form-components/PortainerSelect.tsx b/app/react/components/form-components/PortainerSelect.tsx index fc02a700c..fa4e1128c 100644 --- a/app/react/components/form-components/PortainerSelect.tsx +++ b/app/react/components/form-components/PortainerSelect.tsx @@ -1,4 +1,8 @@ -import { OptionsOrGroups } from 'react-select'; +import { + GroupBase, + OptionsOrGroups, + SelectComponentsConfig, +} from 'react-select'; import _ from 'lodash'; import { AutomationTestingProps } from '@/types'; @@ -10,9 +14,10 @@ export interface Option { label: string; } -type Group = { label: string; options: Option[] }; - -type Options = OptionsOrGroups, Group>; +type Options = OptionsOrGroups< + Option, + GroupBase> +>; interface SharedProps extends AutomationTestingProps { name?: string; @@ -28,6 +33,11 @@ interface MultiProps extends SharedProps { onChange(value: readonly TValue[]): void; options: Options; isMulti: true; + components?: SelectComponentsConfig< + Option, + true, + GroupBase> + >; } interface SingleProps extends SharedProps { @@ -35,6 +45,11 @@ interface SingleProps extends SharedProps { onChange(value: TValue | null): void; options: Options; isMulti?: never; + components?: SelectComponentsConfig< + Option, + false, + GroupBase> + >; } type Props = MultiProps | SingleProps; @@ -66,6 +81,7 @@ export function SingleSelect({ placeholder, isClearable, bindToBody, + components, }: SingleProps) { const selectedValue = value || (typeof value === 'number' && value === 0) @@ -86,6 +102,7 @@ export function SingleSelect({ placeholder={placeholder} isDisabled={disabled} menuPortalTarget={bindToBody ? document.body : undefined} + components={components} /> ); } @@ -124,6 +141,7 @@ export function MultiSelect({ disabled, isClearable, bindToBody, + components, }: Omit, 'isMulti'>) { const selectedOptions = findSelectedOptions(options, value); return ( @@ -142,12 +160,13 @@ export function MultiSelect({ placeholder={placeholder} isDisabled={disabled} menuPortalTarget={bindToBody ? document.body : undefined} + components={components} /> ); } function isGroup( - option: Option | Group -): option is Group { + option: Option | GroupBase> +): option is GroupBase> { return 'options' in option; } diff --git a/app/react/components/modals/Dialog.tsx b/app/react/components/modals/Dialog.tsx index c46cdc7c1..39c5e033e 100644 --- a/app/react/components/modals/Dialog.tsx +++ b/app/react/components/modals/Dialog.tsx @@ -1,4 +1,4 @@ -import { ReactNode } from 'react'; +import { ReactNode, useEffect, useState, useRef } from 'react'; import { Button } from '@@/buttons'; @@ -26,6 +26,37 @@ export function Dialog({ }: Props) { const ariaLabel = requireString(title) || requireString(message) || 'Dialog'; + const [count, setCount] = useState(0); + const countRef = useRef(count); + countRef.current = count; + + useEffect(() => { + let retFn; + + // only countdown the first button with non-zero timeout + for (let i = 0; i < buttons.length; i++) { + const button = buttons[i]; + if (button.timeout) { + setCount(button.timeout as number); + + const intervalID = setInterval(() => { + const count = countRef.current; + + setCount(count - 1); + if (count === 1) { + onSubmit(button.value); + } + }, 1000); + + retFn = () => clearInterval(intervalID); + + break; + } + } + + return retFn; + }, [buttons, onSubmit]); + return ( onSubmit()} aria-label={ariaLabel}> {title && } @@ -39,7 +70,7 @@ export function Dialog({ key={index} size="medium" > - {button.label} + {button.label} {button.timeout && count ? `(${count})` : null} ))} diff --git a/app/react/components/modals/types.ts b/app/react/components/modals/types.ts index 6720d8622..b56a3a352 100644 --- a/app/react/components/modals/types.ts +++ b/app/react/components/modals/types.ts @@ -7,6 +7,7 @@ export interface ButtonOptions { className?: string; color?: ComponentProps['color']; value?: TValue; + timeout?: number; } export interface ButtonsOptions { diff --git a/app/react/components/modals/utils.ts b/app/react/components/modals/utils.ts index 62de850e0..ec0f7d5c7 100644 --- a/app/react/components/modals/utils.ts +++ b/app/react/components/modals/utils.ts @@ -6,9 +6,10 @@ import { ButtonOptions } from './types'; export function buildConfirmButton( label = 'Confirm', - color: ComponentProps['color'] = 'primary' + color: ComponentProps['color'] = 'primary', + timeout = 0 ): ButtonOptions { - return { label, color, value: true }; + return { label, color, value: true, timeout }; } export function buildCancelButton(label = 'Cancel'): ButtonOptions { diff --git a/app/react/docker/containers/CreateView/Gpu.tsx b/app/react/docker/containers/CreateView/Gpu.tsx index e26114097..fc72f5582 100644 --- a/app/react/docker/containers/CreateView/Gpu.tsx +++ b/app/react/docker/containers/CreateView/Gpu.tsx @@ -10,6 +10,7 @@ import { OptionProps } from 'react-select/dist/declarations/src/components/Optio import { Select } from '@@/form-components/ReactSelect'; import { Switch } from '@@/form-components/SwitchField/Switch'; import { Tooltip } from '@@/Tip/Tooltip'; +import { TextTip } from '@@/Tip/TextTip'; interface Values { enabled: boolean; @@ -35,6 +36,7 @@ export interface Props { gpus: GPU[]; usedGpus: string[]; usedAllGpus: boolean; + enableGpuManagement?: boolean; } const NvidiaCapabilitiesOptions = [ @@ -103,6 +105,7 @@ export function Gpu({ gpus = [], usedGpus = [], usedAllGpus, + enableGpuManagement, }: Props) { const options = useMemo(() => { const options = (gpus || []).map((gpu) => ({ @@ -181,30 +184,38 @@ export function Gpu({ return (
+ {!enableGpuManagement && ( + + GPU in the UI is not currently enabled for this environment. + + )}
Enable GPU
-
- - isMulti - closeMenuOnSelect - value={gpuValue} - isClearable={false} - backspaceRemovesValue={false} - isDisabled={!values.enabled} - onChange={onChangeSelectedGpus} - options={options} - components={{ MultiValueRemove }} - /> -
+ {enableGpuManagement && values.enabled && ( +
+ + isMulti + closeMenuOnSelect + value={gpuValue} + isClearable={false} + backspaceRemovesValue={false} + isDisabled={!values.enabled} + onChange={onChangeSelectedGpus} + options={options} + components={{ MultiValueRemove }} + /> +
+ )}
{values.enabled && ( diff --git a/app/react/docker/containers/ItemView/HealthStatus.tsx b/app/react/docker/containers/ItemView/HealthStatus.tsx index 3c3f0119c..86705a888 100644 --- a/app/react/docker/containers/ItemView/HealthStatus.tsx +++ b/app/react/docker/containers/ItemView/HealthStatus.tsx @@ -38,7 +38,7 @@ export function HealthStatus({ health }: Props) { - {health.FailingStreak} +
{health.FailingStreak}
 diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx index a645e6216..d1a0ba854 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx @@ -15,7 +15,7 @@ import { gpus } from './gpus'; export function useColumns( isHostColumnVisible: boolean, - isGPUsColumnVisible: boolean + isGPUsColumnVisible?: boolean ) { return useMemo( () => diff --git a/app/react/docker/containers/utils.ts b/app/react/docker/containers/utils.ts index 54c785bb2..6bb0ee242 100644 --- a/app/react/docker/containers/utils.ts +++ b/app/react/docker/containers/utils.ts @@ -1,8 +1,9 @@ import _ from 'lodash'; -import { useInfo } from '@/docker/services/system.service'; -import { EnvironmentId } from '@/react/portainer/environments/types'; import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { useInfo } from '@/docker/services/system.service'; +import { useEnvironment } from '@/react/portainer/environments/queries'; import { DockerContainer, ContainerStatus } from './types'; import { DockerContainerResponse } from './types/response'; @@ -95,10 +96,13 @@ function createStatus(statusText = ''): ContainerStatus { } export function useShowGPUsColumn(environmentID: EnvironmentId) { - const envInfoQuery = useInfo( + const isDockerStandaloneQuery = useInfo( environmentID, - (info) => !!info.Swarm?.NodeID && !!info.Swarm?.ControlAvailable + (info) => !(!!info.Swarm?.NodeID && !!info.Swarm?.ControlAvailable) // is not a swarm environment, therefore docker standalone ); - - return envInfoQuery.data !== true && !envInfoQuery.isLoading; + const enableGPUManagementQuery = useEnvironment( + environmentID, + (env) => env?.EnableGPUManagement + ); + return isDockerStandaloneQuery.data && enableGPUManagementQuery.data; } diff --git a/app/react/docker/host/SetupView/GpusInsights.tsx b/app/react/docker/host/SetupView/GpusInsights.tsx new file mode 100644 index 000000000..d4492bdd3 --- /dev/null +++ b/app/react/docker/host/SetupView/GpusInsights.tsx @@ -0,0 +1,29 @@ +import { InsightsBox } from '@@/InsightsBox'; + +export function GpusInsights() { + return ( + +

+ From 2.18 on, the set-up of available GPUs for a Docker Standalone + environment has been shifted from Add environment and Environment + details to Host -> Setup, so as to align with other settings. +

+

+ A toggle has been introduced for enabling/disabling management of + GPU settings in the Portainer UI - to alleviate the performance + impact of showing those settings. +

+

+ The UI has been updated to clarify that GPU settings support is only + for Docker Standalone (and not Docker Swarm, which was never + supported in the UI). +

+ + } + header="GPU settings update" + insightCloseId="gpu-settings-update-closed" + /> + ); +} diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/Hardware/GpusList.tsx b/app/react/docker/host/SetupView/GpusList.tsx similarity index 90% rename from app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/Hardware/GpusList.tsx rename to app/react/docker/host/SetupView/GpusList.tsx index 738d9e3ca..1f3397cb7 100644 --- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/Hardware/GpusList.tsx +++ b/app/react/docker/host/SetupView/GpusList.tsx @@ -48,11 +48,12 @@ function Item({ item, onChange }: ItemProps) { export function GpusList({ value, onChange }: Props) { return ( - label="GPU" + label="GPUs" + tooltip="You may optionally set up the GPUs that will be selectable against containers, although 'All GPUs' will always be available." value={value} onChange={onChange} itemBuilder={() => ({ value: '', name: '' })} - addLabel="add" + addLabel="Add GPU" item={Item} /> ); diff --git a/app/react/edge/components/EdgeScriptForm/EdgeScriptForm.tsx b/app/react/edge/components/EdgeScriptForm/EdgeScriptForm.tsx index d143951e7..cc8e2bc77 100644 --- a/app/react/edge/components/EdgeScriptForm/EdgeScriptForm.tsx +++ b/app/react/edge/components/EdgeScriptForm/EdgeScriptForm.tsx @@ -16,6 +16,9 @@ const edgePropertiesFormInitialValues: ScriptFormValues = { nomadToken: '', authEnabled: true, tlsEnabled: false, + edgeGroupsIds: [], + group: 0, + tagsIds: [], }; interface Props { @@ -23,6 +26,7 @@ interface Props { commands: CommandTab[] | Partial>; isNomadTokenVisible?: boolean; asyncMode?: boolean; + showMetaFields?: boolean; } export function EdgeScriptForm({ @@ -30,6 +34,7 @@ export function EdgeScriptForm({ commands, isNomadTokenVisible, asyncMode, + showMetaFields, children, }: PropsWithChildren) { const showOsSelector = !(commands instanceof Array); @@ -50,6 +55,7 @@ export function EdgeScriptForm({ isNomadTokenVisible && values.platform === 'nomad' } hideIdGetter={edgeInfo.id !== undefined} + showMetaFields={showMetaFields} />
{showOsSelector && ( diff --git a/app/react/edge/components/EdgeScriptForm/EdgeScriptSettingsFieldset.tsx b/app/react/edge/components/EdgeScriptForm/EdgeScriptSettingsFieldset.tsx index ceee5c746..1b1c3adbe 100644 --- a/app/react/edge/components/EdgeScriptForm/EdgeScriptSettingsFieldset.tsx +++ b/app/react/edge/components/EdgeScriptForm/EdgeScriptSettingsFieldset.tsx @@ -1,9 +1,14 @@ import { useFormikContext, Field } from 'formik'; +import { GroupField } from '@/react/portainer/environments/wizard/EnvironmentsCreationView/shared/MetadataFieldset/GroupsField'; + import { FormControl } from '@@/form-components/FormControl'; import { Input } from '@@/form-components/Input'; import { SwitchField } from '@@/form-components/SwitchField'; import { TextTip } from '@@/Tip/TextTip'; +import { TagSelector } from '@@/TagSelector'; + +import { EdgeGroupsSelector } from '../../edge-stacks/components/EdgeGroupsSelector'; import { NomadTokenField } from './NomadTokenField'; import { ScriptFormValues } from './types'; @@ -11,16 +16,36 @@ import { ScriptFormValues } from './types'; interface Props { isNomadTokenVisible?: boolean; hideIdGetter?: boolean; + showMetaFields?: boolean; } export function EdgeScriptSettingsFieldset({ isNomadTokenVisible, hideIdGetter, + showMetaFields, }: Props) { const { values, setFieldValue } = useFormikContext(); return ( <> + {showMetaFields && ( + <> + + + setFieldValue('edgeGroupsIds', value)} + isGroupVisible={(group) => !group.Dynamic} + horizontal + /> + + setFieldValue('tagsIds', value)} + /> + + )} + {!hideIdGetter && ( <> = { }, } as const; -function buildDockerEnvVars(envVars: string, defaultVars: string[]) { - const vars = defaultVars.concat( - envVars.split(',').filter((s) => s.length > 0) - ); - - return vars.map((s) => `-e ${s}`).join(' \\\n '); -} - export function buildLinuxStandaloneCommand( agentVersion: string, edgeKey: string, @@ -70,16 +62,16 @@ export function buildLinuxStandaloneCommand( ) { const { allowSelfSignedCertificates, edgeIdGenerator, envVars } = properties; - const env = buildDockerEnvVars( - envVars, - buildDefaultEnvVars( + const env = buildDockerEnvVars(envVars, [ + ...buildDefaultDockerEnvVars( edgeKey, allowSelfSignedCertificates, !edgeIdGenerator ? edgeId : undefined, agentSecret, useAsyncMode - ) - ); + ), + ...metaEnvVars(properties), + ]); return `${ edgeIdGenerator ? `PORTAINER_EDGE_ID=$(${edgeIdGenerator}) \n\n` : '' @@ -106,16 +98,16 @@ export function buildWindowsStandaloneCommand( ) { const { allowSelfSignedCertificates, edgeIdGenerator, envVars } = properties; - const env = buildDockerEnvVars( - envVars, - buildDefaultEnvVars( + const env = buildDockerEnvVars(envVars, [ + ...buildDefaultDockerEnvVars( edgeKey, allowSelfSignedCertificates, edgeIdGenerator ? '$Env:PORTAINER_EDGE_ID' : edgeId, agentSecret, useAsyncMode - ) - ); + ), + ...metaEnvVars(properties), + ]); return `${ edgeIdGenerator @@ -144,7 +136,7 @@ export function buildLinuxSwarmCommand( const { allowSelfSignedCertificates, edgeIdGenerator, envVars } = properties; const env = buildDockerEnvVars(envVars, [ - ...buildDefaultEnvVars( + ...buildDefaultDockerEnvVars( edgeKey, allowSelfSignedCertificates, !edgeIdGenerator ? edgeId : undefined, @@ -152,6 +144,7 @@ export function buildLinuxSwarmCommand( useAsyncMode ), 'AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent', + ...metaEnvVars(properties), ]); return `${ @@ -186,7 +179,7 @@ export function buildWindowsSwarmCommand( const { allowSelfSignedCertificates, edgeIdGenerator, envVars } = properties; const env = buildDockerEnvVars(envVars, [ - ...buildDefaultEnvVars( + ...buildDefaultDockerEnvVars( edgeKey, allowSelfSignedCertificates, edgeIdGenerator ? '$Env:PORTAINER_EDGE_ID' : edgeId, @@ -194,6 +187,7 @@ export function buildWindowsSwarmCommand( useAsyncMode ), 'AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent', + ...metaEnvVars(properties), ]); return `${ @@ -229,17 +223,18 @@ export function buildLinuxKubernetesCommand( const { allowSelfSignedCertificates, edgeIdGenerator, envVars } = properties; const agentShortVersion = getAgentShortVersion(agentVersion); - let envVarsTrimmed = envVars.trim(); - if (useAsyncMode) { - envVarsTrimmed += `EDGE_ASYNC=1`; - } + const allEnvVars = buildEnvVars( + envVars, + _.compact([useAsyncMode && 'EDGE_ASYNC=1', ...metaEnvVars(properties)]) + ); + const idEnvVar = edgeIdGenerator ? `PORTAINER_EDGE_ID=$(${edgeIdGenerator}) \n\n` : ''; const edgeIdVar = !edgeIdGenerator && edgeId ? edgeId : '$PORTAINER_EDGE_ID'; const selfSigned = allowSelfSignedCertificates ? '1' : '0'; - return `${idEnvVar}curl https://downloads.portainer.io/ee${agentShortVersion}/portainer-edge-agent-setup.sh | bash -s -- "${edgeIdVar}" "${edgeKey}" "${selfSigned}" "${agentSecret}" "${envVarsTrimmed}"`; + return `${idEnvVar}curl https://downloads.portainer.io/ee${agentShortVersion}/portainer-edge-agent-setup.sh | bash -s -- "${edgeIdVar}" "${edgeKey}" "${selfSigned}" "${agentSecret}" "${allEnvVars}"`; } export function buildLinuxNomadCommand( @@ -259,10 +254,11 @@ export function buildLinuxNomadCommand( } = properties; const agentShortVersion = getAgentShortVersion(agentVersion); - let envVarsTrimmed = envVars.trim(); - if (useAsyncMode) { - envVarsTrimmed += `EDGE_ASYNC=1`; - } + + const allEnvVars = buildEnvVars( + envVars, + _.compact([useAsyncMode && 'EDGE_ASYNC=1', ...metaEnvVars(properties)]) + ); const selfSigned = allowSelfSignedCertificates ? '1' : '0'; const idEnvVar = edgeIdGenerator @@ -270,10 +266,16 @@ export function buildLinuxNomadCommand( : ''; const edgeIdVar = !edgeIdGenerator && edgeId ? edgeId : '$PORTAINER_EDGE_ID'; - return `${idEnvVar}curl https://downloads.portainer.io/ee${agentShortVersion}/portainer-edge-agent-nomad-setup.sh | bash -s -- "${nomadToken}" "${edgeIdVar}" "${edgeKey}" "${selfSigned}" "${envVarsTrimmed}" "${agentSecret}" "${tlsEnabled}"`; + return `${idEnvVar}curl https://downloads.portainer.io/ee${agentShortVersion}/portainer-edge-agent-nomad-setup.sh | bash -s -- "${nomadToken}" "${edgeIdVar}" "${edgeKey}" "${selfSigned}" "${allEnvVars}" "${agentSecret}" "${tlsEnabled}"`; } -function buildDefaultEnvVars( +function buildDockerEnvVars(envVars: string, moreVars: string[]) { + const vars = moreVars.concat(envVars.split(',').filter((s) => s.length > 0)); + + return vars.map((s) => `-e ${s}`).join(' \\\n '); +} + +function buildDefaultDockerEnvVars( edgeKey: string, allowSelfSignedCerts: boolean, edgeId = '$PORTAINER_EDGE_ID', @@ -289,3 +291,22 @@ function buildDefaultEnvVars( useAsyncMode ? 'EDGE_ASYNC=1' : '', ]); } + +const ENV_VAR_SEPARATOR = ','; +const VAR_LIST_SEPARATOR = ':'; +function buildEnvVars(envVars: string, moreVars: string[]) { + return _.compact([envVars.trim(), ...moreVars]).join(ENV_VAR_SEPARATOR); +} + +function metaEnvVars({ + edgeGroupsIds, + group, + tagsIds, +}: Pick) { + return _.compact([ + edgeGroupsIds.length && + `EDGE_GROUPS=${edgeGroupsIds.join(VAR_LIST_SEPARATOR)}`, + group && `PORTAINER_GROUP=${group}`, + tagsIds.length && `PORTAINER_TAGS=${tagsIds.join(VAR_LIST_SEPARATOR)}`, + ]); +} diff --git a/app/react/edge/components/EdgeScriptForm/types.ts b/app/react/edge/components/EdgeScriptForm/types.ts index 2d6817922..f7c8f86a2 100644 --- a/app/react/edge/components/EdgeScriptForm/types.ts +++ b/app/react/edge/components/EdgeScriptForm/types.ts @@ -1,3 +1,8 @@ +import { TagId } from '@/portainer/tags/types'; +import { EnvironmentGroupId } from '@/react/portainer/environments/environment-groups/types'; + +import { EdgeGroup } from '../../edge-groups/types'; + export type Platform = 'standalone' | 'swarm' | 'k8s' | 'nomad'; export type OS = 'win' | 'linux'; @@ -13,6 +18,10 @@ export interface ScriptFormValues { platform: Platform; edgeIdGenerator?: string; + + group: EnvironmentGroupId; + edgeGroupsIds: Array; + tagsIds: Array; } export interface EdgeInfo { diff --git a/app/react/edge/components/edge-agent-async.svg b/app/react/edge/components/edge-agent-async.svg index fa1a0b9ee..5ac438b92 100644 --- a/app/react/edge/components/edge-agent-async.svg +++ b/app/react/edge/components/edge-agent-async.svg @@ -1,6 +1,6 @@ - + diff --git a/app/react/edge/components/edge-agent-standard.svg b/app/react/edge/components/edge-agent-standard.svg index 8590d5130..adb1baca0 100644 --- a/app/react/edge/components/edge-agent-standard.svg +++ b/app/react/edge/components/edge-agent-standard.svg @@ -1,6 +1,6 @@ - + diff --git a/app/react/edge/edge-devices/WaitingRoomView/Datatable/Datatable.tsx b/app/react/edge/edge-devices/WaitingRoomView/Datatable/Datatable.tsx index db5daa52e..d622de079 100644 --- a/app/react/edge/edge-devices/WaitingRoomView/Datatable/Datatable.tsx +++ b/app/react/edge/edge-devices/WaitingRoomView/Datatable/Datatable.tsx @@ -12,27 +12,24 @@ import { useSearchBarState } from '@@/datatables/SearchBar'; import { useAssociateDeviceMutation, useLicenseOverused } from '../queries'; import { columns } from './columns'; +import { Filter } from './Filter'; +import { useEnvironments } from './useEnvironments'; const storageKey = 'edge-devices-waiting-room'; const settingsStore = createPersistedStore(storageKey, 'Name'); -interface Props { - devices: Environment[]; - isLoading: boolean; - totalCount: number; -} - -export function Datatable({ devices, isLoading, totalCount }: Props) { +export function Datatable() { const associateMutation = useAssociateDeviceMutation(); const licenseOverused = useLicenseOverused(); const settings = useStore(settingsStore); const [search, setSearch] = useSearchBarState(storageKey); + const { data: environments, totalCount, isLoading } = useEnvironments(); return ( } /> ); diff --git a/app/react/edge/edge-devices/WaitingRoomView/Datatable/Filter.tsx b/app/react/edge/edge-devices/WaitingRoomView/Datatable/Filter.tsx new file mode 100644 index 000000000..1ba91a723 --- /dev/null +++ b/app/react/edge/edge-devices/WaitingRoomView/Datatable/Filter.tsx @@ -0,0 +1,50 @@ +import { HomepageFilter } from '@/react/portainer/HomeView/EnvironmentList/HomepageFilter'; +import { useGroups } from '@/react/portainer/environments/environment-groups/queries'; +import { useEdgeGroups } from '@/react/edge/edge-groups/queries/useEdgeGroups'; +import { useTags } from '@/portainer/tags/queries'; + +import { useFilterStore } from './filter-store'; + +export function Filter() { + const edgeGroupsQuery = useEdgeGroups(); + const groupsQuery = useGroups(); + const tagsQuery = useTags(); + + const filterStore = useFilterStore(); + + if (!edgeGroupsQuery.data || !groupsQuery.data || !tagsQuery.data) { + return null; + } + + return ( +
+ filterStore.setEdgeGroups(f)} + placeHolder="Edge groups" + value={filterStore.edgeGroups} + filterOptions={edgeGroupsQuery.data.map((g) => ({ + label: g.Name, + value: g.Id, + }))} + /> + filterStore.setGroups(f)} + placeHolder="Group" + value={filterStore.groups} + filterOptions={groupsQuery.data.map((g) => ({ + label: g.Name, + value: g.Id, + }))} + /> + filterStore.setTags(f)} + placeHolder="Tags" + value={filterStore.tags} + filterOptions={tagsQuery.data.map((g) => ({ + label: g.Name, + value: g.ID, + }))} + /> +
+ ); +} diff --git a/app/react/edge/edge-devices/WaitingRoomView/Datatable/columns.ts b/app/react/edge/edge-devices/WaitingRoomView/Datatable/columns.ts index 8a5078247..0c2722761 100644 --- a/app/react/edge/edge-devices/WaitingRoomView/Datatable/columns.ts +++ b/app/react/edge/edge-devices/WaitingRoomView/Datatable/columns.ts @@ -1,8 +1,8 @@ -import { Column } from 'react-table'; +import { CellProps, Column } from 'react-table'; -import { Environment } from '@/react/portainer/environments/types'; +import { WaitingRoomEnvironment } from '../types'; -export const columns: readonly Column[] = [ +export const columns: readonly Column[] = [ { Header: 'Name', accessor: (row) => row.Name, @@ -21,4 +21,35 @@ export const columns: readonly Column[] = [ canHide: false, sortType: 'string', }, + { + Header: 'Edge Groups', + accessor: (row) => row.EdgeGroups || [], + Cell: ({ value }: CellProps) => + value.join(', ') || '-', + id: 'edge-groups', + disableFilters: true, + Filter: () => null, + canHide: false, + sortType: 'string', + }, + { + Header: 'Group', + accessor: (row) => row.Group || '-', + id: 'group', + disableFilters: true, + Filter: () => null, + canHide: false, + sortType: 'string', + }, + { + Header: 'Tags', + accessor: (row) => row.Tags || [], + Cell: ({ value }: CellProps) => + value.join(', ') || '-', + id: 'tags', + disableFilters: true, + Filter: () => null, + canHide: false, + sortType: 'string', + }, ] as const; diff --git a/app/react/edge/edge-devices/WaitingRoomView/Datatable/filter-store.ts b/app/react/edge/edge-devices/WaitingRoomView/Datatable/filter-store.ts new file mode 100644 index 000000000..feeeae6d7 --- /dev/null +++ b/app/react/edge/edge-devices/WaitingRoomView/Datatable/filter-store.ts @@ -0,0 +1,35 @@ +import createStore from 'zustand'; +import { persist } from 'zustand/middleware'; + +import { keyBuilder } from '@/react/hooks/useLocalStorage'; + +interface TableFiltersStore { + groups: number[]; + setGroups(value: number[]): void; + edgeGroups: number[]; + setEdgeGroups(value: number[]): void; + tags: number[]; + setTags(value: number[]): void; +} + +export const useFilterStore = createStore()( + persist( + (set) => ({ + edgeGroups: [], + setEdgeGroups(edgeGroups: number[]) { + set({ edgeGroups }); + }, + groups: [], + setGroups(groups: number[]) { + set({ groups }); + }, + tags: [], + setTags(tags: number[]) { + set({ tags }); + }, + }), + { + name: keyBuilder('edge-devices-meta-filters'), + } + ) +); diff --git a/app/react/edge/edge-devices/WaitingRoomView/Datatable/useEnvironments.ts b/app/react/edge/edge-devices/WaitingRoomView/Datatable/useEnvironments.ts new file mode 100644 index 000000000..6d899fc2b --- /dev/null +++ b/app/react/edge/edge-devices/WaitingRoomView/Datatable/useEnvironments.ts @@ -0,0 +1,74 @@ +import _ from 'lodash'; + +import { useTags } from '@/portainer/tags/queries'; +import { useEdgeGroups } from '@/react/edge/edge-groups/queries/useEdgeGroups'; +import { useGroups } from '@/react/portainer/environments/environment-groups/queries'; +import { useEnvironmentList } from '@/react/portainer/environments/queries'; +import { EdgeTypes } from '@/react/portainer/environments/types'; + +import { WaitingRoomEnvironment } from '../types'; + +import { useFilterStore } from './filter-store'; + +export function useEnvironments() { + const filterStore = useFilterStore(); + const edgeGroupsQuery = useEdgeGroups(); + + const filterByEnvironmentsIds = filterStore.edgeGroups.length + ? _.compact( + filterStore.edgeGroups.flatMap( + (groupId) => + edgeGroupsQuery.data?.find((g) => g.Id === groupId)?.Endpoints + ) + ) + : undefined; + + const environmentsQuery = useEnvironmentList({ + edgeDeviceUntrusted: true, + excludeSnapshots: true, + types: EdgeTypes, + tagIds: filterStore.tags.length ? filterStore.tags : undefined, + groupIds: filterStore.groups.length ? filterStore.groups : undefined, + endpointIds: filterByEnvironmentsIds, + }); + + const groupsQuery = useGroups({ + select: (groups) => + Object.fromEntries(groups.map((g) => [g.Id, g.Name] as const)), + }); + const environmentEdgeGroupsQuery = useEdgeGroups({ + select: (groups) => + _.groupBy( + groups.flatMap((group) => { + const envs = group.Endpoints; + return envs.map((id) => ({ id, group: group.Name })); + }), + (env) => env.id + ), + }); + const tagsQuery = useTags({ + select: (tags) => + Object.fromEntries(tags.map((tag) => [tag.ID, tag.Name] as const)), + }); + + const envs: Array = + environmentsQuery.environments.map((env) => ({ + ...env, + Group: groupsQuery.data?.[env.GroupId] || '', + EdgeGroups: + environmentEdgeGroupsQuery.data?.[env.Id]?.map((env) => env.group) || + [], + Tags: + _.compact(env.TagIds?.map((tagId) => tagsQuery.data?.[tagId])) || [], + })); + + return { + data: envs, + isLoading: + environmentsQuery.isLoading || + groupsQuery.isLoading || + environmentEdgeGroupsQuery.isLoading || + tagsQuery.isLoading, + totalCount: environmentsQuery.totalCount, + }; +} diff --git a/app/react/edge/edge-devices/WaitingRoomView/WaitingRoomView.tsx b/app/react/edge/edge-devices/WaitingRoomView/WaitingRoomView.tsx index cce80f494..396fb0a3a 100644 --- a/app/react/edge/edge-devices/WaitingRoomView/WaitingRoomView.tsx +++ b/app/react/edge/edge-devices/WaitingRoomView/WaitingRoomView.tsx @@ -1,5 +1,3 @@ -import { useEnvironmentList } from '@/react/portainer/environments/queries/useEnvironmentList'; -import { EdgeTypes } from '@/react/portainer/environments/types'; import { withLimitToBE } from '@/react/hooks/useLimitToBE'; import { InformationPanel } from '@@/InformationPanel'; @@ -11,12 +9,6 @@ import { Datatable } from './Datatable'; export default withLimitToBE(WaitingRoomView); function WaitingRoomView() { - const { environments, isLoading, totalCount } = useEnvironmentList({ - edgeDeviceUntrusted: true, - excludeSnapshots: true, - types: EdgeTypes, - }); - return ( <> - + ); } diff --git a/app/react/edge/edge-devices/WaitingRoomView/types.ts b/app/react/edge/edge-devices/WaitingRoomView/types.ts new file mode 100644 index 000000000..484313732 --- /dev/null +++ b/app/react/edge/edge-devices/WaitingRoomView/types.ts @@ -0,0 +1,7 @@ +import { Environment } from '@/react/portainer/environments/types'; + +export type WaitingRoomEnvironment = Environment & { + EdgeGroups: string[]; + Tags: string[]; + Group: string; +}; diff --git a/app/react/edge/edge-groups/queries/useEdgeGroups.ts b/app/react/edge/edge-groups/queries/useEdgeGroups.ts index 8bc1548c6..d2a256309 100644 --- a/app/react/edge/edge-groups/queries/useEdgeGroups.ts +++ b/app/react/edge/edge-groups/queries/useEdgeGroups.ts @@ -1,22 +1,29 @@ import { useQuery } from 'react-query'; import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentType } from '@/react/portainer/environments/types'; import { EdgeGroup } from '../types'; +interface EdgeGroupListItemResponse extends EdgeGroup { + EndpointTypes: Array; +} + async function getEdgeGroups() { try { - const { data } = await axios.get('/edge_groups'); + const { data } = await axios.get( + '/edge_groups' + ); return data; } catch (err) { throw parseAxiosError(err as Error, 'Failed fetching edge groups'); } } -export function useEdgeGroups({ +export function useEdgeGroups({ select, }: { - select?: (groups: EdgeGroup[]) => T; + select?: (groups: EdgeGroupListItemResponse[]) => T; } = {}) { return useQuery(['edge', 'groups'], getEdgeGroups, { select }); } diff --git a/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx b/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx index 5f1147822..a8fcacccd 100644 --- a/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx +++ b/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx @@ -3,21 +3,74 @@ import _ from 'lodash'; import { EdgeGroup } from '@/react/edge/edge-groups/types'; import { Select } from '@@/form-components/ReactSelect'; +import { FormSection } from '@@/form-components/FormSection'; +import { FormError } from '@@/form-components/FormError'; +import { Link } from '@@/Link'; +import { FormControl } from '@@/form-components/FormControl'; + +import { useEdgeGroups } from '../../edge-groups/queries/useEdgeGroups'; type SingleValue = EdgeGroup['Id']; interface Props { - items: EdgeGroup[]; value: SingleValue[]; onChange: (value: SingleValue[]) => void; + error?: string | string[]; + horizontal?: boolean; + isGroupVisible?(group: EdgeGroup): boolean; } -export function EdgeGroupsSelector({ items, value, onChange }: Props) { +export function EdgeGroupsSelector({ + value, + onChange, + error, + horizontal, + isGroupVisible = () => true, +}: Props) { + const selector = ( + + ); + + return horizontal ? ( + + {selector} + + ) : ( + +
+
{selector}
+ {error && ( +
+ {error} +
+ )} +
+ + ); +} + +function InnerSelector({ + value, + onChange, + isGroupVisible, +}: { + isGroupVisible(group: EdgeGroup): boolean; + value: SingleValue[]; + onChange: (value: SingleValue[]) => void; +}) { + const edgeGroupsQuery = useEdgeGroups(); + + const items = (edgeGroupsQuery.data || []).filter(isGroupVisible); + const valueGroups = _.compact( value.map((id) => items.find((item) => item.Id === id)) ); - return ( + return items.length ? ( { const namespaces = await getNamespaces(environmentId); - const settledNamespacesPromise = await Promise.allSettled( - Object.keys(namespaces).map((namespace) => - getIngresses(environmentId, namespace).then(() => namespace) + const namespaceNames = Object.keys(namespaces); + // use seflsubjectaccess reviews to avoid forbidden requests + const allNamespaceAccessReviews = await Promise.all( + namespaceNames.map((namespaceName) => + getSelfSubjectAccessReview(environmentId, namespaceName) ) ); - const ns: Namespaces = {}; - settledNamespacesPromise.forEach((namespace) => { - if (namespace.status === 'fulfilled') { - ns[namespace.value] = namespaces[namespace.value]; + const allowedNamespacesNames = allNamespaceAccessReviews + .filter((accessReview) => accessReview.status.allowed) + .map((accessReview) => accessReview.spec.resourceAttributes.namespace); + const allowedNamespaces = namespaceNames.reduce((acc, namespaceName) => { + if (allowedNamespacesNames.includes(namespaceName)) { + acc[namespaceName] = namespaces[namespaceName]; } - }); - return ns; + return acc; + }, {} as Namespaces); + return allowedNamespaces; }, { onError: (err) => { diff --git a/app/react/kubernetes/namespaces/service.ts b/app/react/kubernetes/namespaces/service.ts index 57e91689d..405eed82a 100644 --- a/app/react/kubernetes/namespaces/service.ts +++ b/app/react/kubernetes/namespaces/service.ts @@ -1,8 +1,9 @@ import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import { Namespaces } from './types'; +import { Namespaces, SelfSubjectAccessReviewResponse } from './types'; +// getNamespace is used to retrieve a namespace using the Portainer backend export async function getNamespace( environmentId: EnvironmentId, namespace: string @@ -17,6 +18,7 @@ export async function getNamespace( } } +// getNamespaces is used to retrieve namespaces using the Portainer backend with caching export async function getNamespaces(environmentId: EnvironmentId) { try { const { data: namespaces } = await axios.get( @@ -28,6 +30,39 @@ export async function getNamespaces(environmentId: EnvironmentId) { } } +export async function getSelfSubjectAccessReview( + environmentId: EnvironmentId, + namespaceName: string, + verb = 'list', + resource = 'deployments', + group = 'apps' +) { + try { + const { data: accessReview } = + await axios.post( + `endpoints/${environmentId}/kubernetes/apis/authorization.k8s.io/v1/selfsubjectaccessreviews`, + { + spec: { + resourceAttributes: { + group, + resource, + verb, + namespace: namespaceName, + }, + }, + apiVersion: 'authorization.k8s.io/v1', + kind: 'SelfSubjectAccessReview', + } + ); + return accessReview; + } catch (e) { + throw parseAxiosError( + e as Error, + 'Unable to retrieve self subject access review' + ); + } +} + function buildUrl(environmentId: EnvironmentId, namespace?: string) { let url = `kubernetes/${environmentId}/namespaces`; diff --git a/app/react/kubernetes/namespaces/types.ts b/app/react/kubernetes/namespaces/types.ts index 20436c306..86aae0c48 100644 --- a/app/react/kubernetes/namespaces/types.ts +++ b/app/react/kubernetes/namespaces/types.ts @@ -4,3 +4,14 @@ export interface Namespaces { IsSystem: boolean; }; } + +export interface SelfSubjectAccessReviewResponse { + status: { + allowed: boolean; + }; + spec: { + resourceAttributes: { + namespace: string; + }; + }; +} diff --git a/app/react/kubernetes/volumes/queries.ts b/app/react/kubernetes/volumes/queries.ts new file mode 100644 index 000000000..c03856416 --- /dev/null +++ b/app/react/kubernetes/volumes/queries.ts @@ -0,0 +1,21 @@ +import { useQuery } from 'react-query'; + +import { withError } from '@/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; + +import { getPVCsForCluster } from './service'; + +// useQuery to get a list of all applications from an array of namespaces +export function usePVCsForCluster( + environemtId: EnvironmentId, + namespaces?: string[] +) { + return useQuery( + ['environments', environemtId, 'kubernetes', 'pvcs'], + () => namespaces && getPVCsForCluster(environemtId, namespaces), + { + ...withError('Unable to retrieve applications'), + enabled: !!namespaces, + } + ); +} diff --git a/app/react/kubernetes/volumes/service.ts b/app/react/kubernetes/volumes/service.ts new file mode 100644 index 000000000..3f79e7014 --- /dev/null +++ b/app/react/kubernetes/volumes/service.ts @@ -0,0 +1,33 @@ +import { PersistentVolumeClaimList } from 'kubernetes-types/core/v1'; + +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; + +export async function getPVCsForCluster( + environmentId: EnvironmentId, + namespaces: string[] +) { + try { + const pvcs = await Promise.all( + namespaces.map((namespace) => getPVCs(environmentId, namespace)) + ); + return pvcs.flat(); + } catch (e) { + throw parseAxiosError( + e as Error, + 'Unable to retrieve persistent volume claims for cluster' + ); + } +} + +// get all persistent volume claims for a namespace +export async function getPVCs(environmentId: EnvironmentId, namespace: string) { + try { + const { data } = await axios.get( + `/endpoints/${environmentId}/kubernetes/api/v1/namespaces/${namespace}/persistentvolumeclaims` + ); + return data.items; + } catch (e) { + throw parseAxiosError(e as Error, 'Unable to retrieve deployments'); + } +} diff --git a/app/react/portainer/HomeView/EdgeLoadingSpinner.module.css b/app/react/portainer/HomeView/EdgeLoadingSpinner.module.css index 82dc7f30c..d6ec1181c 100644 --- a/app/react/portainer/HomeView/EdgeLoadingSpinner.module.css +++ b/app/react/portainer/HomeView/EdgeLoadingSpinner.module.css @@ -3,7 +3,7 @@ height: 100%; text-align: center; display: flex; - flex-direction: column; + flex-direction: row; align-items: center; justify-content: center; } diff --git a/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx b/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx index 53d838f95..5638423bc 100644 --- a/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx +++ b/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx @@ -130,17 +130,21 @@ export function EnvironmentItem({ } function useEnvironmentTagNames(tagIds?: TagId[]) { - const { tags, isLoading } = useTags((tags) => { - if (!tagIds) { - return []; - } - return _.compact( - tagIds - .map((id) => tags.find((tag) => tag.ID === id)) - .map((tag) => tag?.Name) - ); + const tagsQuery = useTags({ + select: (tags) => { + if (!tagIds) { + return []; + } + return _.compact( + tagIds + .map((id) => tags.find((tag) => tag.ID === id)) + .map((tag) => tag?.Name) + ); + }, }); + const { data: tags, isLoading } = tagsQuery; + if (tags && tags.length > 0) { return tags.join(', '); } diff --git a/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentTypeTag.tsx b/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentTypeTag.tsx index bbae9aee2..59dad2f35 100644 --- a/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentTypeTag.tsx +++ b/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EnvironmentTypeTag.tsx @@ -32,11 +32,9 @@ export function EnvironmentTypeTag({ function getTypeLabel(environment: Environment) { if (isEdgeEnvironment(environment.Type)) { - if (environment.Edge.AsyncMode) { - return 'Edge Agent Async'; - } - - return 'Edge Agent Standard'; + return environment.Edge.AsyncMode + ? 'Edge Agent Async' + : 'Edge Agent Standard'; } if (isLocalEnvironment(environment)) { diff --git a/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx b/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx index 94e3e7eb0..655ae0116 100644 --- a/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx +++ b/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx @@ -29,7 +29,7 @@ import { PaginationControls } from '@@/PaginationControls'; import { SearchBar, useSearchBarState } from '@@/datatables/SearchBar'; import { useHomePageFilter } from './HomepageFilter'; -import { ConnectionType, Filter } from './types'; +import { ConnectionType } from './types'; import { EnvironmentItem } from './EnvironmentItem'; import { KubeconfigButton } from './KubeconfigButton'; import { NoEnvironmentsInfoPanel } from './NoEnvironmentsInfoPanel'; @@ -48,15 +48,16 @@ export function EnvironmentList({ onClickBrowse, onRefresh }: Props) { const { isAdmin } = useUser(); const currentEnvStore = useStore(environmentStore); - const [platformTypes, setPlatformTypes] = useHomePageFilter< - Filter[] - >('platformType', []); + const [platformTypes, setPlatformTypes] = useHomePageFilter( + 'platformType', + [] + ); const [searchBarValue, setSearchBarValue] = useSearchBarState(storageKey); const [pageLimit, setPageLimit] = usePaginationLimitState(storageKey); const [page, setPage] = useState(1); const [connectionTypes, setConnectionTypes] = useHomePageFilter< - Filter[] + ConnectionType[] >('connectionTypes', []); const [statusFilter, setStatusFilter] = useHomePageFilter< @@ -77,20 +78,17 @@ export function EnvironmentList({ onClickBrowse, onRefresh }: Props) { false ); - const [statusState, setStatusState] = useHomePageFilter( + const [statusState, setStatusState] = useHomePageFilter( 'status_state', [] ); - const [tagState, setTagState] = useHomePageFilter('tag_state', []); - const [groupState, setGroupState] = useHomePageFilter( + const [tagState, setTagState] = useHomePageFilter('tag_state', []); + const [groupState, setGroupState] = useHomePageFilter( 'group_state', [] ); - const [sortByState, setSortByState] = useHomePageFilter( - 'sort_by_state', - undefined - ); - const [agentVersions, setAgentVersions] = useHomePageFilter[]>( + + const [agentVersions, setAgentVersions] = useHomePageFilter( 'agentVersions', [] ); @@ -98,17 +96,14 @@ export function EnvironmentList({ onClickBrowse, onRefresh }: Props) { const groupsQuery = useGroups(); const environmentsQueryParams: EnvironmentsQueryParams = { - types: getTypes( - platformTypes.map((p) => p.value), - connectionTypes.map((p) => p.value) - ), + types: getTypes(platformTypes, connectionTypes), search: searchBarValue, status: statusFilter, tagIds: tagFilter?.length ? tagFilter : undefined, groupIds: groupFilter, provisioned: true, tagsPartialMatch: true, - agentVersions: agentVersions.map((a) => a.value), + agentVersions, updateInformation: isBE, edgeAsync: getEdgeAsyncValue(connectionTypes), }; @@ -202,11 +197,11 @@ export function EnvironmentList({ onClickBrowse, onRefresh }: Props) { setAgentVersions={setAgentVersions} agentVersions={agentVersions} clearFilter={clearFilter} - sortOnchange={sortOnchange} + sortOnChange={sortOnchange} sortOnDescending={sortOnDescending} sortByDescending={sortByDescending} sortByButton={sortByButton} - sortByState={sortByState} + sortByState={sortByFilter} />
filterOptions.value - ) - ), - ]; + const filteredStatus = [...new Set(value)]; setStatusFilter(filteredStatus); } } - function groupOnChange(filterOptions: Filter[]) { - setGroupState(filterOptions); - if (filterOptions.length === 0) { + function groupOnChange(value: number[]) { + setGroupState(value); + if (value.length === 0) { setGroupFilter([]); } else { - const filteredGroups = [ - ...new Set( - filterOptions.map( - (filterOptions: { value: number }) => filterOptions.value - ) - ), - ]; + const filteredGroups = [...new Set(value)]; setGroupFilter(filteredGroups); } } - function tagOnChange(filterOptions: Filter[]) { - setTagState(filterOptions); - if (filterOptions.length === 0) { + function tagOnChange(value: number[]) { + setTagState(value); + if (value.length === 0) { setTagFilter([]); } else { - const filteredTags = [ - ...new Set( - filterOptions.map( - (filterOptions: { value: number }) => filterOptions.value - ) - ), - ]; + const filteredTags = [...new Set(value)]; setTagFilter(filteredTags); } } @@ -365,16 +342,9 @@ export function EnvironmentList({ onClickBrowse, onRefresh }: Props) { setConnectionTypes([]); } - function sortOnchange(filterOptions: Filter) { - if (filterOptions !== null) { - setSortByFilter(filterOptions.label); - setSortByButton(true); - setSortByState(filterOptions); - } else { - setSortByFilter(''); - setSortByButton(true); - setSortByState(undefined); - } + function sortOnchange(value: string) { + setSortByFilter(value); + setSortByButton(!!value); } function sortOnDescending() { @@ -407,14 +377,13 @@ function renderItems( return items; } -function getEdgeAsyncValue(connectionTypes: Filter[]) { +function getEdgeAsyncValue(connectionTypes: ConnectionType[]) { const hasEdgeAsync = connectionTypes.some( - (connectionType) => connectionType.value === ConnectionType.EdgeAgentAsync + (connectionType) => connectionType === ConnectionType.EdgeAgentAsync ); const hasEdgeStandard = connectionTypes.some( - (connectionType) => - connectionType.value === ConnectionType.EdgeAgentStandard + (connectionType) => connectionType === ConnectionType.EdgeAgentStandard ); // If both are selected, we don't want to filter on either, and same for if both are not selected diff --git a/app/react/portainer/HomeView/EnvironmentList/EnvironmentListFilters.tsx b/app/react/portainer/HomeView/EnvironmentList/EnvironmentListFilters.tsx index 8f20ddcd6..8123c6f55 100644 --- a/app/react/portainer/HomeView/EnvironmentList/EnvironmentListFilters.tsx +++ b/app/react/portainer/HomeView/EnvironmentList/EnvironmentListFilters.tsx @@ -9,7 +9,7 @@ import { useGroups } from '../../environments/environment-groups/queries'; import { HomepageFilter } from './HomepageFilter'; import { SortbySelector } from './SortbySelector'; -import { ConnectionType, Filter } from './types'; +import { ConnectionType } from './types'; import styles from './EnvironmentList.module.css'; const status = [ @@ -17,11 +17,10 @@ const status = [ { value: EnvironmentStatus.Down, label: 'Down' }, ]; -const sortByOptions = [ - { value: 1, label: 'Name' }, - { value: 2, label: 'Group' }, - { value: 3, label: 'Status' }, -]; +const sortByOptions = ['Name', 'Group', 'Status'].map((v) => ({ + value: v, + label: v, +})); export function EnvironmentListFilters({ agentVersions, @@ -37,32 +36,32 @@ export function EnvironmentListFilters({ sortByDescending, sortByState, sortOnDescending, - sortOnchange, + sortOnChange, statusOnChange, statusState, tagOnChange, tagState, }: { - platformTypes: Filter[]; - setPlatformTypes: (value: Filter[]) => void; + platformTypes: PlatformType[]; + setPlatformTypes: (value: PlatformType[]) => void; - connectionTypes: Filter[]; - setConnectionTypes: (value: Filter[]) => void; + connectionTypes: ConnectionType[]; + setConnectionTypes: (value: ConnectionType[]) => void; - statusState: Filter[]; - statusOnChange: (filterOptions: Filter[]) => void; + statusState: number[]; + statusOnChange: (value: number[]) => void; - tagOnChange: (filterOptions: Filter[]) => void; - tagState: Filter[]; + tagOnChange: (value: number[]) => void; + tagState: number[]; - groupOnChange: (filterOptions: Filter[]) => void; - groupState: Filter[]; + groupOnChange: (value: number[]) => void; + groupState: number[]; - setAgentVersions: (value: Filter[]) => void; - agentVersions: Filter[]; + setAgentVersions: (value: string[]) => void; + agentVersions: string[]; - sortByState: Filter | undefined; - sortOnchange: (filterOptions: Filter) => void; + sortByState: string; + sortOnChange: (value: string) => void; sortOnDescending: () => void; sortByDescending: boolean; @@ -85,7 +84,7 @@ export function EnvironmentListFilters({ })); const tagsQuery = useTags(); - const tagOptions = [...(tagsQuery.tags || [])]; + const tagOptions = [...(tagsQuery.data || [])]; const uniqueTag = [ ...new Map(tagOptions.map((item) => [item.ID, item])).values(), ].map(({ ID: value, Name: label }) => ({ @@ -136,7 +135,7 @@ export function EnvironmentListFilters({ />
- + ({ label: v, @@ -159,7 +158,7 @@ export function EnvironmentListFilters({
[]) { +function getConnectionTypeOptions(platformTypes: PlatformType[]) { const platformTypeConnectionType = { [PlatformType.Docker]: [ ConnectionType.API, @@ -204,12 +203,12 @@ function getConnectionTypeOptions(platformTypes: Filter[]) { return _.compact( _.intersection( - ...platformTypes.map((p) => platformTypeConnectionType[p.value]) + ...platformTypes.map((p) => platformTypeConnectionType[p]) ).map((c) => connectionTypesDefaultOptions.find((o) => o.value === c)) ); } -function getPlatformTypeOptions(connectionTypes: Filter[]) { +function getPlatformTypeOptions(connectionTypes: ConnectionType[]) { const platformDefaultOptions = [ { value: PlatformType.Docker, label: 'Docker' }, { value: PlatformType.Azure, label: 'Azure' }, @@ -244,7 +243,7 @@ function getPlatformTypeOptions(connectionTypes: Filter[]) { return _.compact( _.intersection( - ...connectionTypes.map((p) => connectionTypePlatformType[p.value]) + ...connectionTypes.map((p) => connectionTypePlatformType[p]) ).map((c) => platformDefaultOptions.find((o) => o.value === c)) ); } diff --git a/app/react/portainer/HomeView/EnvironmentList/HomepageFilter.tsx b/app/react/portainer/HomeView/EnvironmentList/HomepageFilter.tsx index 779b0a0a6..b9094a648 100644 --- a/app/react/portainer/HomeView/EnvironmentList/HomepageFilter.tsx +++ b/app/react/portainer/HomeView/EnvironmentList/HomepageFilter.tsx @@ -2,18 +2,19 @@ import { components, OptionProps } from 'react-select'; import { useLocalStorage } from '@/react/hooks/useLocalStorage'; -import { Select } from '@@/form-components/ReactSelect'; - -import { Filter } from './types'; +import { + type Option as OptionType, + PortainerSelect, +} from '@@/form-components/PortainerSelect'; interface Props { - filterOptions?: Filter[]; - onChange: (filterOptions: Filter[]) => void; + filterOptions?: OptionType[]; + onChange: (value: TValue[]) => void; placeHolder: string; - value: Filter[]; + value: TValue[]; } -function Option(props: OptionProps, true>) { +function Option(props: OptionProps, true>) { const { isSelected, label } = props; return (
@@ -21,8 +22,10 @@ function Option(props: OptionProps, true>) { // eslint-disable-next-line react/jsx-props-no-spreading {...props} > - null} />{' '} - +
+ null} /> + +
); @@ -35,14 +38,14 @@ export function HomepageFilter({ value, }: Props) { return ( - onChange(option as Filter)} + onChange={(option) => onChange(option || '')} isClearable value={value} /> diff --git a/app/react/portainer/HomeView/HomeView.tsx b/app/react/portainer/HomeView/HomeView.tsx index 8961ecbf3..6e5e83ad6 100644 --- a/app/react/portainer/HomeView/HomeView.tsx +++ b/app/react/portainer/HomeView/HomeView.tsx @@ -1,5 +1,5 @@ -import { useRouter } from '@uirouter/react'; -import { useState } from 'react'; +import { useCurrentStateAndParams, useRouter } from '@uirouter/react'; +import { useEffect, useState } from 'react'; import { Environment } from '@/react/portainer/environments/types'; import { snapshotEndpoints } from '@/react/portainer/environments/environment.service'; @@ -9,6 +9,7 @@ import * as notifications from '@/portainer/services/notifications'; import { confirm } from '@@/modals/confirm'; import { PageHeader } from '@@/PageHeader'; import { ModalType } from '@@/modals'; +import { buildConfirmButton } from '@@/modals/utils'; import { EnvironmentList } from './EnvironmentList'; import { EdgeLoadingSpinner } from './EdgeLoadingSpinner'; @@ -17,10 +18,37 @@ import { LicenseNodePanel } from './LicenseNodePanel'; import { BackupFailedPanel } from './BackupFailedPanel'; export function HomeView() { - const [connectingToEdgeEndpoint, setConnectingToEdgeEndpoint] = - useState(false); + const { params } = useCurrentStateAndParams(); + const [connectingToEdgeEndpoint, setConnectingToEdgeEndpoint] = useState( + !!params.redirect + ); const router = useRouter(); + + useEffect(() => { + async function redirect() { + const options = { + title: `Failed connecting to ${params.environmentName}`, + message: `There was an issue connecting to edge agent via tunnel. Click 'Retry' below to retry now, or wait 10 seconds to automatically retry.`, + confirmButton: buildConfirmButton('Retry', 'primary', 10), + modalType: ModalType.Destructive, + }; + + if (await confirm(options)) { + setConnectingToEdgeEndpoint(true); + router.stateService.go(params.route, { + endpointId: params.environmentId, + }); + } else { + router.stateService.go('portainer.home', {}, { inherit: false }); + } + } + + if (params.redirect) { + redirect(); + } + }, [params, setConnectingToEdgeEndpoint, router]); + return ( <> diff --git a/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx b/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx index 5b6860e03..6e1f77d88 100644 --- a/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx +++ b/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx @@ -1,6 +1,7 @@ import { CopyButton } from '@@/buttons'; import { FormSection } from '@@/form-components/FormSection'; import { TextTip } from '@@/Tip/TextTip'; +import { Code } from '@@/Code'; export function EdgeKeyDisplay({ edgeKey }: { edgeKey: string }) { return ( @@ -15,9 +16,7 @@ export function EdgeKeyDisplay({ edgeKey }: { edgeKey: string }) { here.

-
- {edgeKey} -
+ {edgeKey} Copy token diff --git a/app/react/portainer/environments/ListView/ImportFdoDeviceButton.tsx b/app/react/portainer/environments/ListView/ImportFdoDeviceButton.tsx index 82a6752f6..8683155da 100644 --- a/app/react/portainer/environments/ListView/ImportFdoDeviceButton.tsx +++ b/app/react/portainer/environments/ListView/ImportFdoDeviceButton.tsx @@ -4,13 +4,20 @@ import { Button } from '@@/buttons'; import { Link } from '@@/Link'; import { useSettings } from '../../settings/queries'; +import { + FeatureFlag, + useFeatureFlag, +} from '../../feature-flags/useFeatureFlag'; export function ImportFdoDeviceButton() { + const flagEnabledQuery = useFeatureFlag(FeatureFlag.FDO); + const isFDOEnabledQuery = useSettings( - (settings) => settings.fdoConfiguration.enabled + (settings) => settings.fdoConfiguration.enabled, + flagEnabledQuery.data ); - if (!isFDOEnabledQuery.data) { + if (!isFDOEnabledQuery.data || !flagEnabledQuery.data) { return null; } @@ -21,6 +28,7 @@ export function ImportFdoDeviceButton() { icon={Plus} as={Link} props={{ to: 'portainer.endpoints.importDevice' }} + className="ml-[5px]" > Import FDO device diff --git a/app/react/portainer/environments/environment-groups/queries.ts b/app/react/portainer/environments/environment-groups/queries.ts index d480c95c4..9b2f937e9 100644 --- a/app/react/portainer/environments/environment-groups/queries.ts +++ b/app/react/portainer/environments/environment-groups/queries.ts @@ -5,8 +5,12 @@ import { error as notifyError } from '@/portainer/services/notifications'; import { EnvironmentGroup, EnvironmentGroupId } from './types'; import { getGroup, getGroups } from './environment-groups.service'; -export function useGroups() { - return useQuery(['environment-groups'], getGroups); +export function useGroups({ + select, +}: { select?: (group: EnvironmentGroup[]) => T } = {}) { + return useQuery(['environment-groups'], getGroups, { + select, + }); } export function useGroup( diff --git a/app/react/portainer/environments/environment.service/create.ts b/app/react/portainer/environments/environment.service/create.ts index 78347d0ef..d25de9b96 100644 --- a/app/react/portainer/environments/environment.service/create.ts +++ b/app/react/portainer/environments/environment.service/create.ts @@ -1,4 +1,3 @@ -import { Gpu } from '@/react/portainer/environments/wizard/EnvironmentsCreationView/shared/Hardware/GpusList'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { type EnvironmentGroupId } from '@/react/portainer/environments/environment-groups/types'; import { type TagId } from '@/portainer/tags/types'; @@ -18,7 +17,6 @@ interface CreateLocalDockerEnvironment { socketPath?: string; publicUrl?: string; meta?: EnvironmentMetadata; - gpus?: Gpu[]; } export async function createLocalDockerEnvironment({ @@ -26,7 +24,6 @@ export async function createLocalDockerEnvironment({ socketPath = '', publicUrl = '', meta = { tagIds: [] }, - gpus = [], }: CreateLocalDockerEnvironment) { const url = prefixPath(socketPath); @@ -37,7 +34,6 @@ export async function createLocalDockerEnvironment({ url, publicUrl, meta, - gpus, } ); @@ -112,8 +108,6 @@ export interface EnvironmentOptions { meta?: EnvironmentMetadata; azure?: AzureSettings; tls?: TLSSettings; - isEdgeDevice?: boolean; - gpus?: Gpu[]; pollFrequency?: number; edge?: EdgeSettings; tunnelServerAddr?: string; @@ -145,7 +139,6 @@ export interface CreateAgentEnvironmentValues { name: string; environmentUrl: string; meta: EnvironmentMetadata; - gpus: Gpu[]; } export function createAgentEnvironment({ @@ -173,8 +166,6 @@ interface CreateEdgeAgentEnvironment { tunnelServerAddr?: string; meta?: EnvironmentMetadata; pollFrequency: number; - gpus?: Gpu[]; - isEdgeDevice?: boolean; edge: EdgeSettings; } @@ -182,8 +173,6 @@ export function createEdgeAgentEnvironment({ name, portainerUrl, meta = { tagIds: [] }, - gpus = [], - isEdgeDevice, pollFrequency, edge, }: CreateEdgeAgentEnvironment) { @@ -196,8 +185,6 @@ export function createEdgeAgentEnvironment({ skipVerify: true, skipClientVerify: true, }, - gpus, - isEdgeDevice, pollFrequency, edge, meta, @@ -225,8 +212,6 @@ async function createEnvironment( GroupID: groupId, TagIds: arrayToJson(tagIds), CheckinInterval: options.pollFrequency, - IsEdgeDevice: options.isEdgeDevice, - Gpus: arrayToJson(options.gpus), }; const { tls, azure } = options; diff --git a/app/react/portainer/environments/queries/useEnvironment.ts b/app/react/portainer/environments/queries/useEnvironment.ts index 63f98e031..0ce1563e3 100644 --- a/app/react/portainer/environments/queries/useEnvironment.ts +++ b/app/react/portainer/environments/queries/useEnvironment.ts @@ -1,11 +1,18 @@ import { useQuery } from 'react-query'; import { getEndpoint } from '@/react/portainer/environments/environment.service'; -import { EnvironmentId } from '@/react/portainer/environments/types'; +import { + Environment, + EnvironmentId, +} from '@/react/portainer/environments/types'; import { withError } from '@/react-tools/react-query'; -export function useEnvironment(id?: EnvironmentId) { +export function useEnvironment( + id?: EnvironmentId, + select?: (environment: Environment | null) => T +) { return useQuery(['environments', id], () => (id ? getEndpoint(id) : null), { + select, ...withError('Failed loading environment'), staleTime: 50, enabled: !!id, diff --git a/app/react/portainer/environments/types.ts b/app/react/portainer/environments/types.ts index 418e338e0..bba78ec4d 100644 --- a/app/react/portainer/environments/types.ts +++ b/app/react/portainer/environments/types.ts @@ -50,8 +50,16 @@ export type IngressClass = { Type: string; }; +interface StorageClass { + Name: string; + AccessModes: string[]; + AllowVolumeExpansion: boolean; + Provisioner: string; +} + export interface KubernetesConfiguration { UseLoadBalancer?: boolean; + StorageClasses?: StorageClass[]; UseServerMetrics?: boolean; EnableResourceOverCommit?: boolean; ResourceOverCommitPercentage?: number; @@ -131,6 +139,7 @@ export type Environment = { TagIds: TagId[]; GroupId: EnvironmentGroupId; DeploymentOptions: DeploymentOptions | null; + EnableGPUManagement: boolean; EdgeID?: string; EdgeKey: string; EdgeCheckinInterval?: number; @@ -143,7 +152,6 @@ export type Environment = { Kubernetes: KubernetesSettings; Nomad: NomadSettings; PublicURL?: string; - IsEdgeDevice?: boolean; UserTrusted: boolean; AMTDeviceGUID?: string; Edge: EnvironmentEdge; diff --git a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/EndpointTypeView.tsx b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/EndpointTypeView.tsx index f0fbd9b38..bf23911be 100644 --- a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/EndpointTypeView.tsx +++ b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/EndpointTypeView.tsx @@ -8,19 +8,17 @@ import { useAnalytics } from '@/angulartics.matomo/analytics-services'; import { Button } from '@@/buttons'; import { PageHeader } from '@@/PageHeader'; import { Widget, WidgetBody, WidgetTitle } from '@@/Widget'; +import { FormSection } from '@@/form-components/FormSection'; -import { useCreateEdgeDeviceParam } from '../hooks/useCreateEdgeDeviceParam'; - +import { EnvironmentSelector } from './EnvironmentSelector'; import { - EnvironmentSelector, - EnvironmentSelectorValue, -} from './EnvironmentSelector'; -import { environmentTypes } from './environment-types'; + EnvironmentOptionValue, + existingEnvironmentTypes, + newEnvironmentTypes, +} from './environment-types'; export function EnvironmentTypeSelectView() { - const createEdgeDevice = useCreateEdgeDeviceParam(); - - const [types, setTypes] = useState([]); + const [types, setTypes] = useState([]); const { trackEvent } = useAnalytics(); const router = useRouter(); @@ -36,11 +34,32 @@ export function EnvironmentTypeSelectView() { - +
+ +

+ You can onboard different types of environments, select all + that apply. +

+

+ Connect to existing environments +

+ +

Set up new environments

+ + +