From 5ae6b0b811bed004049bc9235d7303d85610db6d Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 30 Mar 2016 09:55:52 -0600 Subject: [PATCH 1/6] fix(cli): remove non-MVP 'helm chart' functions. --- cmd/helm/chart.go | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/cmd/helm/chart.go b/cmd/helm/chart.go index bde9b16a9..91d4e7e85 100644 --- a/cmd/helm/chart.go +++ b/cmd/helm/chart.go @@ -46,33 +46,12 @@ func chartCommands() cli.Command { Usage: "Perform chart-centered operations.", Description: chartDesc, Subcommands: []cli.Command{ - { - Name: "config", - Usage: "Create a configuration parameters file for this chart.", - ArgsUsage: "CHART", - }, - { - Name: "show", - Aliases: []string{"info"}, - Usage: "Provide details about this package.", - ArgsUsage: "CHART", - }, { Name: "create", Usage: "Create a new chart directory and set up base files and directories.", ArgsUsage: "CHARTNAME", Action: func(c *cli.Context) { run(c, createChart) }, }, - { - Name: "list", - Usage: "list all deployed charts, optionally constraining by pattern.", - ArgsUsage: "[PATTERN]", - }, - { - Name: "deployments", - Usage: "given a chart, show all the deployments that reference it.", - ArgsUsage: "CHART", - }, { Name: "package", Aliases: []string{"pack"}, From ccb730678f2f319e8f4eae1e7f17b0f5f43e37ce Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 30 Mar 2016 10:27:16 -0600 Subject: [PATCH 2/6] fix(cli): remove unused credential commands --- cmd/helm/credential.go | 57 ------------------------------------------ 1 file changed, 57 deletions(-) delete mode 100644 cmd/helm/credential.go diff --git a/cmd/helm/credential.go b/cmd/helm/credential.go deleted file mode 100644 index 16e1ef0ae..000000000 --- a/cmd/helm/credential.go +++ /dev/null @@ -1,57 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "github.com/codegangsta/cli" -) - -func init() { - addCommands(credCommands()) -} - -func credCommands() cli.Command { - return cli.Command{ - Name: "credential", - Aliases: []string{"cred"}, - Usage: "Perform repository credential operations.", - Subcommands: []cli.Command{ - { - Name: "add", - Usage: "Add a credential to the remote manager.", - Flags: []cli.Flag{ - cli.StringFlag{ - Name: "file,f", - Usage: "A JSON file with credential information.", - }, - }, - ArgsUsage: "CREDENTIAL", - }, - { - Name: "list", - Usage: "List the credentials on the remote manager.", - ArgsUsage: "", - }, - { - Name: "remove", - Aliases: []string{"rm"}, - Usage: "Remove a credential from the remote manager.", - ArgsUsage: "CREDENTIAL", - }, - }, - } -} From 274eb198bfc4d4fb7cc994d7602f6ee8576d3055 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 30 Mar 2016 10:58:58 -0600 Subject: [PATCH 3/6] fix(cli): remove unused 'helm dep' subcommands --- cmd/helm/deployment.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cmd/helm/deployment.go b/cmd/helm/deployment.go index 95f0a0142..ac642402d 100644 --- a/cmd/helm/deployment.go +++ b/cmd/helm/deployment.go @@ -60,11 +60,6 @@ func deploymentCommands() cli.Command { Usage: "Perform deployment-centered operations.", Description: deploymentDesc, Subcommands: []cli.Command{ - { - Name: "config", - Usage: "Dump the configuration file for this deployment.", - ArgsUsage: "DEPLOYMENT", - }, { Name: "remove", Aliases: []string{"rm"}, @@ -78,11 +73,6 @@ func deploymentCommands() cli.Command { ArgsUsage: "DEPLOYMENT", Action: func(c *cli.Context) { run(c, describeDeployment) }, }, - { - Name: "manifest", - Usage: "Dump the Kubernetes manifest file for this deployment.", - ArgsUsage: "DEPLOYMENT", - }, { Name: "show", Aliases: []string{"info"}, From e96978067c7491ec7a769a403d5f361607a82796 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 30 Mar 2016 11:06:01 -0600 Subject: [PATCH 4/6] fix(cli): remove 'helm search' for MVP --- cmd/helm/helm.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index 42e084e90..8994ceb72 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -97,11 +97,7 @@ func main() { } func cmds() []cli.Command { - return []cli.Command{ - { - Name: "search", - }, - } + return []cli.Command{} } func addCommands(cmds ...cli.Command) { From 5c13a4b9682d77297198eff19f1c428450ca99f1 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 30 Mar 2016 11:20:59 -0600 Subject: [PATCH 5/6] fix(cli): remove lint, redeploy and release for MVP --- cmd/helm/lint.go | 33 --------------------- cmd/helm/redeploy.go | 39 ------------------------- cmd/helm/release.go | 68 -------------------------------------------- 3 files changed, 140 deletions(-) delete mode 100644 cmd/helm/lint.go delete mode 100644 cmd/helm/redeploy.go delete mode 100644 cmd/helm/release.go diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go deleted file mode 100644 index a49d30893..000000000 --- a/cmd/helm/lint.go +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "github.com/codegangsta/cli" -) - -func init() { - addCommands(lintCmd()) -} - -func lintCmd() cli.Command { - return cli.Command{ - Name: "lint", - Usage: "Evaluate a chart's conformance to the specification.", - ArgsUsage: "PATH [PATH...]", - } -} diff --git a/cmd/helm/redeploy.go b/cmd/helm/redeploy.go deleted file mode 100644 index a4974511b..000000000 --- a/cmd/helm/redeploy.go +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "github.com/codegangsta/cli" -) - -func init() { - addCommands(redeployCommand()) -} - -func redeployCommand() cli.Command { - return cli.Command{ - Name: "redeploy", - Usage: "update an existing deployment with a new configuration.", - ArgsUsage: "DEPLOYMENT", - Flags: []cli.Flag{ - cli.StringFlag{ - Name: "config,f", - Usage: "Configuration values file.", - }, - }, - } -} diff --git a/cmd/helm/release.go b/cmd/helm/release.go deleted file mode 100644 index a9cd02a1c..000000000 --- a/cmd/helm/release.go +++ /dev/null @@ -1,68 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "errors" - "os" - - "github.com/codegangsta/cli" - "github.com/kubernetes/helm/pkg/format" -) - -func init() { - addCommands(releaseCmd()) -} - -func releaseCmd() cli.Command { - return cli.Command{ - Name: "release", - Usage: "Release a chart to a remote chart repository.", - ArgsUsage: "PATH", - Flags: []cli.Flag{ - cli.StringFlag{ - Name: "destination,u", - Usage: "Destination URL to which this will be POSTed.", - }, - }, - Action: func(c *cli.Context) { run(c, release) }, - } -} - -func release(c *cli.Context) error { - a := c.Args() - if len(a) == 0 { - return errors.New("'helm release' requires a path to a chart archive or directory") - } - - var arch string - if fi, err := os.Stat(a[0]); err != nil { - return err - } else if fi.IsDir() { - var err error - arch, err = packDir(a[0]) - if err != nil { - return err - } - } else { - arch = a[0] - } - - u, err := NewClient(c).PostChart(arch, arch) - format.Msg(u) - return err -} From 629f5e9fd5b30a3ddf2c491125f05b7fcb3b8f07 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 30 Mar 2016 11:22:32 -0600 Subject: [PATCH 6/6] fix(cli): remove deprecated 'helm status' command --- cmd/helm/status.go | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 cmd/helm/status.go diff --git a/cmd/helm/status.go b/cmd/helm/status.go deleted file mode 100644 index 71fc9f75e..000000000 --- a/cmd/helm/status.go +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "github.com/codegangsta/cli" -) - -func init() { - addCommands(statusCommand()) -} - -func statusCommand() cli.Command { - return cli.Command{ - Name: "status", - Usage: "Provide status on a named deployment.", - ArgsUsage: "DEPLOYMENT", - } -}