Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 4ab01f3941.

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola 2023-07-14 12:38:33 -07:00 committed by GitHub
parent 58a8deb25d
commit 0b18a65d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cli/secretsencrypt/secrets_encrypt.go
View File

@ -16,7 +16,6 @@ import (
"github.com/k3s-io/k3s/pkg/server"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"k8s.io/utils/pointer"
)
@ -152,7 +151,6 @@ func Prepare(app *cli.Context) error {
if err = cmds.InitLogging(); err != nil {
return err
}
logrus.Warnln("This command will be deprecated in v1.28, will be combined with rotate")
info, err := commandPrep(app, &cmds.ServerConfig)
if err != nil {
return err
@ -198,7 +196,6 @@ func Reencrypt(app *cli.Context) error {
if err = cmds.InitLogging(); err != nil {
return err
}
logrus.Warnln("This command will be deprecated in v1.28, will be combined with rotate")
info, err := commandPrep(app, &cmds.ServerConfig)
if err != nil {
return err

2
pkg/server/secrets-encrypt.go
View File

@ -208,7 +208,6 @@ func encryptionPrepare(ctx context.Context, server *config.Control, force bool)
if err := AppendNewEncryptionKey(&curKeys); err != nil {
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])
if err := secretsencrypt.WriteEncryptionConfig(server.Runtime, curKeys, true); err != nil {
@ -276,7 +275,6 @@ func encryptionReencrypt(ctx context.Context, server *config.Control, force bool
if _, err = server.Runtime.Core.Core().V1().Node().Update(node); err != nil {
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)
return nil
}