Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
0b18a65d
Unverified
Commit
0b18a65d
authored
Jul 14, 2023
by
Derek Nola
Committed by
GitHub
Jul 14, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Warn that v1.28 will deprecate reencrypt/prepare (#7848)"
This reverts commit
4ab01f39
. Signed-off-by:
Derek Nola
<
derek.nola@suse.com
>
parent
58a8deb2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
5 deletions
+0
-5
secrets_encrypt.go
pkg/cli/secretsencrypt/secrets_encrypt.go
+0
-3
secrets-encrypt.go
pkg/server/secrets-encrypt.go
+0
-2
No files found.
pkg/cli/secretsencrypt/secrets_encrypt.go
View file @
0b18a65d
...
@@ -16,7 +16,6 @@ import (
...
@@ -16,7 +16,6 @@ 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"
)
)
...
@@ -152,7 +151,6 @@ func Prepare(app *cli.Context) error {
...
@@ -152,7 +151,6 @@ 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
...
@@ -198,7 +196,6 @@ func Reencrypt(app *cli.Context) error {
...
@@ -198,7 +196,6 @@ 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
...
...
pkg/server/secrets-encrypt.go
View file @
0b18a65d
...
@@ -208,7 +208,6 @@ func encryptionPrepare(ctx context.Context, server *config.Control, force bool)
...
@@ -208,7 +208,6 @@ 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
{
...
@@ -276,7 +275,6 @@ func encryptionReencrypt(ctx context.Context, server *config.Control, force bool
...
@@ -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
{
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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment