Unverified Commit 4ab01f39 authored by Derek Nola's avatar Derek Nola Committed by GitHub

Warn that v1.28 will deprecate reencrypt/prepare (#7848)

* Warn that v1.28 will deprecate reencrypt/prepare Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com>
parent 6c44b06e
...@@ -16,6 +16,7 @@ import ( ...@@ -16,6 +16,7 @@ import (
"github.com/k3s-io/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
) )
...@@ -151,6 +152,7 @@ func Prepare(app *cli.Context) error { ...@@ -151,6 +152,7 @@ func Prepare(app *cli.Context) error {
if err = cmds.InitLogging(); err != nil { if err = cmds.InitLogging(); err != nil {
return err return err
} }
logrus.Warnln("This command will be deprecated in v1.28, will be combined with rotate")
info, err := commandPrep(app, &cmds.ServerConfig) info, err := commandPrep(app, &cmds.ServerConfig)
if err != nil { if err != nil {
return err return err
...@@ -196,6 +198,7 @@ func Reencrypt(app *cli.Context) error { ...@@ -196,6 +198,7 @@ func Reencrypt(app *cli.Context) error {
if err = cmds.InitLogging(); err != nil { if err = cmds.InitLogging(); err != nil {
return err return err
} }
logrus.Warnln("This command will be deprecated in v1.28, will be combined with rotate")
info, err := commandPrep(app, &cmds.ServerConfig) info, err := commandPrep(app, &cmds.ServerConfig)
if err != nil { if err != nil {
return err return err
......
...@@ -208,6 +208,7 @@ func encryptionPrepare(ctx context.Context, server *config.Control, force bool) ...@@ -208,6 +208,7 @@ func encryptionPrepare(ctx context.Context, server *config.Control, force bool)
if err := AppendNewEncryptionKey(&curKeys); err != nil { if err := AppendNewEncryptionKey(&curKeys); err != nil {
return err return err
} }
logrus.Warnln("prepare command will be deprecated in v1.28, will be combined with rotate")
logrus.Infoln("Adding secrets-encryption key: ", curKeys[len(curKeys)-1]) logrus.Infoln("Adding secrets-encryption key: ", curKeys[len(curKeys)-1])
if err := secretsencrypt.WriteEncryptionConfig(server.Runtime, curKeys, true); err != nil { if err := secretsencrypt.WriteEncryptionConfig(server.Runtime, curKeys, true); err != nil {
...@@ -275,6 +276,7 @@ func encryptionReencrypt(ctx context.Context, server *config.Control, force bool ...@@ -275,6 +276,7 @@ func encryptionReencrypt(ctx context.Context, server *config.Control, force bool
if _, err = server.Runtime.Core.Core().V1().Node().Update(node); err != nil { if _, err = server.Runtime.Core.Core().V1().Node().Update(node); err != nil {
return err return err
} }
logrus.Warnln("reencrypt command will be deprecated in v1.28, will be combined with rotate")
logrus.Debugf("encryption hash annotation set successfully on node: %s\n", node.ObjectMeta.Name) logrus.Debugf("encryption hash annotation set successfully on node: %s\n", node.ObjectMeta.Name)
return nil return nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment