Kubeadm add v1beta1 config #69289
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,11 +16,6 @@ limitations under the License. | |
|
|
||
| package fuzzer | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = [ | ||
| "bootstraptokenstring.go", | ||
| "defaults.go", | ||
| "defaults_unix.go", | ||
| "defaults_windows.go", | ||
| "doc.go", | ||
| "register.go", | ||
| "types.go", | ||
| "zz_generated.conversion.go", | ||
| "zz_generated.deepcopy.go", | ||
| "zz_generated.defaults.go", | ||
| ], | ||
| importpath = "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1", | ||
| visibility = ["//visibility:public"], | ||
| deps = [ | ||
| "//cmd/kubeadm/app/apis/kubeadm:go_default_library", | ||
| "//cmd/kubeadm/app/constants:go_default_library", | ||
| "//staging/src/k8s.io/api/core/v1:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", | ||
| "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library", | ||
| "//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library", | ||
| ], | ||
| ) | ||
|
|
||
| go_test( | ||
| name = "go_default_test", | ||
| srcs = ["bootstraptokenstring_test.go"], | ||
| embed = [":go_default_library"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "package-srcs", | ||
| srcs = glob(["**"]), | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "all-srcs", | ||
| srcs = [":package-srcs"], | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:public"], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
|
|
||
| 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 v1beta1 | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| bootstrapapi "k8s.io/cluster-bootstrap/token/api" | ||
| bootstraputil "k8s.io/cluster-bootstrap/token/util" | ||
| ) | ||
|
|
||
| // BootstrapTokenString is a token of the format abcdef.abcdef0123456789 that is used | ||
| // for both validation of the practically of the API server from a joining node's point | ||
| // of view and as an authentication method for the node in the bootstrap phase of | ||
| // "kubeadm join". This token is and should be short-lived | ||
| type BootstrapTokenString struct { | ||
|
There was a problem hiding this comment. So with bootstrap tokens finding a landing home this cycle do we still need this? We've been carrying this for a while now. There was a problem hiding this comment. If you don't mind I will iterate on this in a separated PR trying to get rid of the code for bootstrap token management that now is duplicated for each API version |
||
| ID string | ||
| Secret string | ||
| } | ||
|
|
||
| // MarshalJSON implements the json.Marshaler interface. | ||
| func (bts BootstrapTokenString) MarshalJSON() ([]byte, error) { | ||
| return []byte(fmt.Sprintf(`"%s"`, bts.String())), nil | ||
| } | ||
|
|
||
| // UnmarshalJSON implements the json.Unmarshaller interface. | ||
| func (bts *BootstrapTokenString) UnmarshalJSON(b []byte) error { | ||
| // If the token is represented as "", just return quickly without an error | ||
| if len(b) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| // Remove unnecessary " characters coming from the JSON parser | ||
| token := strings.Replace(string(b), `"`, ``, -1) | ||
| // Convert the string Token to a BootstrapTokenString object | ||
| newbts, err := NewBootstrapTokenString(token) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| bts.ID = newbts.ID | ||
| bts.Secret = newbts.Secret | ||
| return nil | ||
| } | ||
|
|
||
| // String returns the string representation of the BootstrapTokenString | ||
| func (bts BootstrapTokenString) String() string { | ||
| if len(bts.ID) > 0 && len(bts.Secret) > 0 { | ||
| return bootstraputil.TokenFromIDAndSecret(bts.ID, bts.Secret) | ||
| } | ||
| return "" | ||
| } | ||
|
|
||
| // NewBootstrapTokenString converts the given Bootstrap Token as a string | ||
| // to the BootstrapTokenString object used for serialization/deserialization | ||
| // and internal usage. It also automatically validates that the given token | ||
| // is of the right format | ||
| func NewBootstrapTokenString(token string) (*BootstrapTokenString, error) { | ||
| substrs := bootstraputil.BootstrapTokenRegexp.FindStringSubmatch(token) | ||
| // TODO: Add a constant for the 3 value here, and explain better why it's needed (other than because how the regexp parsin works) | ||
| if len(substrs) != 3 { | ||
| return nil, fmt.Errorf("the bootstrap token %q was not of the form %q", token, bootstrapapi.BootstrapTokenPattern) | ||
| } | ||
|
|
||
| return &BootstrapTokenString{ID: substrs[1], Secret: substrs[2]}, nil | ||
| } | ||
|
|
||
| // NewBootstrapTokenStringFromIDAndSecret is a wrapper around NewBootstrapTokenString | ||
| // that allows the caller to specify the ID and Secret separately | ||
| func NewBootstrapTokenStringFromIDAndSecret(id, secret string) (*BootstrapTokenString, error) { | ||
| return NewBootstrapTokenString(bootstraputil.TokenFromIDAndSecret(id, secret)) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably needs to be moved to #69058
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right, but I missed that train, so I'm fixing it here