Skip to content

[deckhouse-cli] Add plugin folder fallback #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldmonster merged 1 commit into from
Dec 26, 2025
Merged

[deckhouse-cli] Add plugin folder fallback #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions cmd/plugins/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
package plugins

import (
"errors"
"fmt"
"log/slog"
"os"
Expand Down Expand Up @@ -50,6 +51,27 @@ func NewPluginCommand(commandName string, description string, aliases []string,
description = pluginContract.Description
}

// to check we can create directories here
// we try to create root plugins folder
err = os.MkdirAll(flags.DeckhousePluginsDir+"/plugins", 0755)
// if permission failed
if errors.Is(err, os.ErrPermission) {
pc.logger.Warn("use homedir instead of default d8 plugins path in '/opt/deckhouse/lib/deckhouse-cli'", slog.String("new_path", flags.DeckhousePluginsDir), dkplog.Err(err))

flags.DeckhousePluginsDir, err = os.UserHomeDir()
if err != nil {
logger.Warn("failed to receive home dir to create plugins dir", slog.String("error", err.Error()))
return nil
}

flags.DeckhousePluginsDir = path.Join(flags.DeckhousePluginsDir, ".deckhouse-cli")
}

if err != nil {
logger.Warn("failed to create plugin root directory", slog.String("error", err.Error()))
return nil
}

systemCmd := &cobra.Command{
Use: commandName,
Short: description,
Expand Down
22 changes: 1 addition & 21 deletions cmd/plugins/plugins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package plugins
import (
"context"
"encoding/json"
"errors"
"fmt"
"log/slog"
"os"
Expand Down Expand Up @@ -519,29 +518,10 @@ func (pc *PluginsCommand) InstallPlugin(ctx context.Context, pluginName, version
}

func (pc *PluginsCommand) installPlugin(ctx context.Context, pluginName string, version *semver.Version, useMajor int) error {
// to check we can create directories here
// we try to create root plugins folder
err := os.MkdirAll(flags.DeckhousePluginsDir+"/plugins", 0755)
// if permission failed
if errors.Is(err, os.ErrPermission) {
pc.logger.Warn("use homedir instead of default d8 plugins path in '/opt/deckhouse/lib/deckhouse-cli'", slog.String("new_path", flags.DeckhousePluginsDir), dkplog.Err(err))

flags.DeckhousePluginsDir, err = os.UserHomeDir()
if err != nil {
return fmt.Errorf("failed to receive home dir to create plugins dir: %w", err)
}

flags.DeckhousePluginsDir = path.Join(flags.DeckhousePluginsDir, ".deckhouse-cli")
}

if err != nil {
return fmt.Errorf("failed to create plugin root directory: %w", err)
}

// create plugin directory if it doesn't exist
// example path: /opt/deckhouse/lib/deckhouse-cli/plugins/example-plugin
pluginDir := path.Join(flags.DeckhousePluginsDir, "plugins", pluginName)
err = os.MkdirAll(pluginDir, 0755)
err := os.MkdirAll(pluginDir, 0755)
if err != nil {
return fmt.Errorf("failed to create plugin directory: %w", err)
}
Expand Down