kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up "create secret weavepassword"

This commit is contained in:
John Gardiner Myers 2021-07-24 13:07:41 -07:00
parent df325d28a3
commit 597192981d
5 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/BUILD.bazel generated
View File

@ -11,7 +11,7 @@ go_library(
"create_secret_ciliumpassword.go", "create_secret_ciliumpassword.go",
"create_secret_dockerconfig.go", "create_secret_dockerconfig.go",
"create_secret_encryptionconfig.go", "create_secret_encryptionconfig.go",
"create_secret_weave_encryptionconfig.go", "create_secret_weavepassword.go",
"create_sshpublickey.go", "create_sshpublickey.go",
"delete.go", "delete.go",
"delete_cluster.go", "delete_cluster.go",

2
cmd/kops/create_secret.go
View File

@ -38,7 +38,7 @@ func NewCmdCreateSecret(f *util.Factory, out io.Writer) *cobra.Command {
cmd.AddCommand(NewCmdCreateSecretCiliumPassword(f, out)) cmd.AddCommand(NewCmdCreateSecretCiliumPassword(f, out))
cmd.AddCommand(NewCmdCreateSecretDockerConfig(f, out)) cmd.AddCommand(NewCmdCreateSecretDockerConfig(f, out))
cmd.AddCommand(NewCmdCreateSecretEncryptionConfig(f, out)) cmd.AddCommand(NewCmdCreateSecretEncryptionConfig(f, out))
cmd.AddCommand(NewCmdCreateSecretWeaveEncryptionConfig(f, out)) cmd.AddCommand(NewCmdCreateSecretWeavePassword(f, out))
sshPublicKey := NewCmdCreateSSHPublicKey(f, out) sshPublicKey := NewCmdCreateSSHPublicKey(f, out)
sshPublicKey.Hidden = true sshPublicKey.Hidden = true

70
cmd/kops/create_secret_weave_encryptionconfig.go → cmd/kops/create_secret_weavepassword.go
View File

@ -23,6 +23,7 @@ import (
"io/ioutil" "io/ioutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/kops/pkg/commands/commandutils"
"k8s.io/kops/cmd/kops/util" "k8s.io/kops/cmd/kops/util"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
@ -31,74 +32,66 @@ import (
) )
var ( var (
createSecretWeaveEncryptionconfigLong = templates.LongDesc(i18n.T(` createSecretWeavePasswordLong = templates.LongDesc(i18n.T(`
Create a new weave encryption secret, and store it in the state store. Create a new weave encryption secret and store it in the state store.
Used to weave networking to use encrypted communication between nodes. Used by Weave networking to encrypt communication between nodes.
If no password is provided, kOps will generate one at random. If no password is provided, kOps will generate one at random.
WARNING: cannot be enabled on a running cluster without downtime.`)) WARNING: cannot be enabled or changed on a running cluster without downtime.`))
createSecretWeaveEncryptionconfigExample = templates.Examples(i18n.T(` createSecretWeavePasswordExample = templates.Examples(i18n.T(`
# Create a new random weave password. # Create a new random weave password.
kops create secret weavepassword \ kops create secret weavepassword \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
# Install a specific weave password. # Install a specific weave password.
kops create secret weavepassword -f /path/to/weavepassword \ kops create secret weavepassword -f /path/to/weavepassword \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
# Install a specific weave password via stdin. # Install a specific weave password via stdin.
kops create secret weavepassword -f - \ kops create secret weavepassword -f - \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
# Replace an existing weavepassword secret.
# Replace an existing weave password.
kops create secret weavepassword -f /path/to/weavepassword --force \ kops create secret weavepassword -f /path/to/weavepassword --force \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
`)) `))
createSecretWeaveEncryptionconfigShort = i18n.T(`Create a weave encryption config.`) createSecretWeavePasswordShort = i18n.T(`Create a Weave password.`)
) )
type CreateSecretWeaveEncryptionConfigOptions struct { type CreateSecretWeavePasswordOptions struct {
ClusterName string ClusterName string
WeavePasswordFilePath string WeavePasswordFilePath string
Force bool Force bool
} }
func NewCmdCreateSecretWeaveEncryptionConfig(f *util.Factory, out io.Writer) *cobra.Command { func NewCmdCreateSecretWeavePassword(f *util.Factory, out io.Writer) *cobra.Command {
options := &CreateSecretWeaveEncryptionConfigOptions{} options := &CreateSecretWeavePasswordOptions{}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "weavepassword", Use: "weavepassword [CLUSTER]",
Short: createSecretWeaveEncryptionconfigShort, Short: createSecretWeavePasswordShort,
Long: createSecretWeaveEncryptionconfigLong, Long: createSecretWeavePasswordLong,
Example: createSecretWeaveEncryptionconfigExample, Example: createSecretWeavePasswordExample,
Run: func(cmd *cobra.Command, args []string) { Args: rootCommand.clusterNameArgs(&options.ClusterName),
ctx := context.TODO() ValidArgsFunction: commandutils.CompleteClusterName(&rootCommand, true, false),
RunE: func(cmd *cobra.Command, args []string) error {
err := rootCommand.ProcessArgs(args[0:]) return RunCreateSecretWeavePassword(context.TODO(), f, out, options)
if err != nil {
exitWithError(err)
}
options.ClusterName = rootCommand.ClusterName(true)
err = RunCreateSecretWeaveEncryptionConfig(ctx, f, options)
if err != nil {
exitWithError(err)
}
}, },
} }
cmd.Flags().StringVarP(&options.WeavePasswordFilePath, "", "f", "", "Path to the weave password file (optional)") cmd.Flags().StringVarP(&options.WeavePasswordFilePath, "filename", "f", "", "Path to Weave password file")
cmd.Flags().BoolVar(&options.Force, "force", options.Force, "Force replace the kOps secret if it already exists") cmd.Flags().BoolVar(&options.Force, "force", options.Force, "Force replace the secret if it already exists")
return cmd return cmd
} }
func RunCreateSecretWeaveEncryptionConfig(ctx context.Context, f *util.Factory, options *CreateSecretWeaveEncryptionConfigOptions) error { func RunCreateSecretWeavePassword(ctx context.Context, f *util.Factory, out io.Writer, options *CreateSecretWeavePasswordOptions) error {
secret, err := fi.CreateSecret() secret, err := fi.CreateSecret()
if err != nil { if err != nil {
return fmt.Errorf("error creating encryption secret: %v", err) return fmt.Errorf("creating Weave password: %v", err)
} }
cluster, err := GetCluster(ctx, f, options.ClusterName) cluster, err := GetCluster(ctx, f, options.ClusterName)
@ -121,14 +114,13 @@ func RunCreateSecretWeaveEncryptionConfig(ctx context.Context, f *util.Factory,
if options.WeavePasswordFilePath == "-" { if options.WeavePasswordFilePath == "-" {
data, err = ConsumeStdin() data, err = ConsumeStdin()
if err != nil { if err != nil {
return fmt.Errorf("error reading weave password file from stdin: %v", err) return fmt.Errorf("reading Weave password file from stdin: %v", err)
} }
} else { } else {
data, err = ioutil.ReadFile(options.WeavePasswordFilePath) data, err = ioutil.ReadFile(options.WeavePasswordFilePath)
if err != nil { if err != nil {
return fmt.Errorf("error reading weave password file %v: %v", options.WeavePasswordFilePath, err) return fmt.Errorf("reading Weave password file %v: %v", options.WeavePasswordFilePath, err)
} }
} }
secret.Data = data secret.Data = data
@ -137,15 +129,15 @@ func RunCreateSecretWeaveEncryptionConfig(ctx context.Context, f *util.Factory,
if !options.Force { if !options.Force {
_, created, err := secretStore.GetOrCreateSecret("weavepassword", secret) _, created, err := secretStore.GetOrCreateSecret("weavepassword", secret)
if err != nil { if err != nil {
return fmt.Errorf("error adding weavepassword secret: %v", err) return fmt.Errorf("adding weavepassword secret: %v", err)
} }
if !created { if !created {
return fmt.Errorf("failed to create the weavepassword secret as it already exists. The `--force` flag can be passed to replace an existing secret") return fmt.Errorf("failed to create the weavepassword secret as it already exists. Pass the `--force` flag to replace an existing secret")
} }
} else { } else {
_, err := secretStore.ReplaceSecret("weavepassword", secret) _, err := secretStore.ReplaceSecret("weavepassword", secret)
if err != nil { if err != nil {
return fmt.Errorf("error updating weavepassword secret: %v", err) return fmt.Errorf("updating weavepassword secret: %v", err)
} }
} }

2
docs/cli/kops_create_secret.md generated
View File

@ -38,5 +38,5 @@ Create a secret.
* [kops create secret ciliumpassword](kops_create_secret_ciliumpassword.md) - Create a Cilium IPsec configuration. * [kops create secret ciliumpassword](kops_create_secret_ciliumpassword.md) - Create a Cilium IPsec configuration.
* [kops create secret dockerconfig](kops_create_secret_dockerconfig.md) - Create a Docker config. * [kops create secret dockerconfig](kops_create_secret_dockerconfig.md) - Create a Docker config.
* [kops create secret encryptionconfig](kops_create_secret_encryptionconfig.md) - Create an encryption config. * [kops create secret encryptionconfig](kops_create_secret_encryptionconfig.md) - Create an encryption config.
* [kops create secret weavepassword](kops_create_secret_weavepassword.md) - Create a weave encryption config. * [kops create secret weavepassword](kops_create_secret_weavepassword.md) - Create a Weave password.

17
docs/cli/kops_create_secret_weavepassword.md generated
View File

@ -3,18 +3,18 @@
## kops create secret weavepassword ## kops create secret weavepassword
Create a weave encryption config. Create a Weave password.
### Synopsis ### Synopsis
Create a new weave encryption secret, and store it in the state store. Used to weave networking to use encrypted communication between nodes. Create a new weave encryption secret and store it in the state store. Used by Weave networking to encrypt communication between nodes.
If no password is provided, kOps will generate one at random. If no password is provided, kOps will generate one at random.
WARNING: cannot be enabled on a running cluster without downtime. WARNING: cannot be enabled or changed on a running cluster without downtime.
``` ```
kops create secret weavepassword [flags] kops create secret weavepassword [CLUSTER] [flags]
``` ```
### Examples ### Examples
@ -23,13 +23,16 @@ kops create secret weavepassword [flags]
# Create a new random weave password. # Create a new random weave password.
kops create secret weavepassword \ kops create secret weavepassword \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
# Install a specific weave password. # Install a specific weave password.
kops create secret weavepassword -f /path/to/weavepassword \ kops create secret weavepassword -f /path/to/weavepassword \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
# Install a specific weave password via stdin. # Install a specific weave password via stdin.
kops create secret weavepassword -f - \ kops create secret weavepassword -f - \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
# Replace an existing weavepassword secret.
# Replace an existing weave password.
kops create secret weavepassword -f /path/to/weavepassword --force \ kops create secret weavepassword -f /path/to/weavepassword --force \
--name k8s-cluster.example.com --state s3://my-state-store --name k8s-cluster.example.com --state s3://my-state-store
``` ```
@ -37,8 +40,8 @@ kops create secret weavepassword [flags]
### Options ### Options
``` ```
-f, -- string Path to the weave password file (optional) -f, --filename string Path to Weave password file
--force Force replace the kOps secret if it already exists --force Force replace the secret if it already exists
-h, --help help for weavepassword -h, --help help for weavepassword
``` ```