Skip to content

Commit

Permalink
fix: add --no-install for activate command (#536)
Browse files Browse the repository at this point in the history
to fix #534

Signed-off-by: Peter Pan <Peter.Pan@daocloud.io>
  • Loading branch information
panpan0000 committed Jul 3, 2023
1 parent 5a983c4 commit 1f5462c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/cache/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var listCmd = &cobra.Command{
color.Red("Error: %v", err)
os.Exit(1)
}

for _, name := range names {
println(name)
}
Expand Down
7 changes: 6 additions & 1 deletion cmd/integration/activate.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import (
"github.com/spf13/viper"
)

var (
skipInstall bool
)

// activateCmd represents the activate command
var activateCmd = &cobra.Command{
Use: "activate [integration]",
Expand All @@ -39,7 +43,7 @@ var activateCmd = &cobra.Command{

integration := integration.NewIntegration()
// Check if the integation exists
err := integration.Activate(integrationName, namespace, activeFilters)
err := integration.Activate(integrationName, namespace, activeFilters, skipInstall)
if err != nil {
color.Red("Error: %v", err)
return
Expand All @@ -51,5 +55,6 @@ var activateCmd = &cobra.Command{

func init() {
IntegrationCmd.AddCommand(activateCmd)
activateCmd.Flags().BoolVarP(&skipInstall, "no-install", "s", false, "Only activate the integration filter without installing the filter (for example, if that filter plugin is already deployed in cluster, we do not need to re-install it again)")

}
8 changes: 5 additions & 3 deletions pkg/integration/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (*Integration) Get(name string) (IIntegration, error) {
return integrations[name], nil
}

func (*Integration) Activate(name string, namespace string, activeFilters []string) error {
func (*Integration) Activate(name string, namespace string, activeFilters []string, skipInstall bool) error {
if _, ok := integrations[name]; !ok {
return errors.New("integration not found")
}
Expand All @@ -83,8 +83,10 @@ func (*Integration) Activate(name string, namespace string, activeFilters []stri

viper.Set("active_filters", uniqueFilters)

if err := integrations[name].Deploy(namespace); err != nil {
return err
if !skipInstall {
if err := integrations[name].Deploy(namespace); err != nil {
return err
}
}

if err := viper.WriteConfig(); err != nil {
Expand Down

0 comments on commit 1f5462c

Please sign in to comment.