-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bootstrap worker nodes using kops-controller #9653
Merged
k8s-ci-robot
merged 13 commits into
kubernetes:master
from
johngmyers:kops-controller-server
Aug 17, 2020
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
00c60dd
Add server code to kops-controller
johngmyers 82c7521
update-expected.sh
johngmyers 9c01e1f
Send bootstrap query from nodeup to kops-controller
johngmyers cfa262a
Authenticate from nodeup to kops-controller
johngmyers 9cfa169
Add server code to kops-controller
johngmyers 321035f
Allow cert/key file tasks to specify owner
johngmyers bec273e
Implement signing of kubelet cert in kops-controller
johngmyers c5871df
Get kubelet certificate from kops-controller
johngmyers fb381c4
Don't issue kubelet cert on masters before k8s 1.19
johngmyers 8ec55f2
Don't install RBAC addon when using kops-controller bootstrap
johngmyers 9e99f76
Address review comments
johngmyers 5dcc951
Verify the ARN's partition
johngmyers 1a253dc
Send the STS queries to the local region
johngmyers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,19 @@ | ||
load("@io_bazel_rules_go//go:def.bzl", "go_library") | ||
|
||
go_library( | ||
name = "go_default_library", | ||
srcs = [ | ||
"keystore.go", | ||
"server.go", | ||
], | ||
importpath = "k8s.io/kops/cmd/kops-controller/pkg/server", | ||
visibility = ["//visibility:public"], | ||
deps = [ | ||
"//cmd/kops-controller/pkg/config:go_default_library", | ||
"//pkg/apis/nodeup:go_default_library", | ||
"//pkg/pki:go_default_library", | ||
"//pkg/rbac:go_default_library", | ||
"//upup/pkg/fi:go_default_library", | ||
"//vendor/k8s.io/klog:go_default_library", | ||
], | ||
) |
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,76 @@ | ||
/* | ||
Copyright 2020 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 server | ||
|
||
import ( | ||
"fmt" | ||
"io/ioutil" | ||
"path" | ||
|
||
"k8s.io/kops/pkg/pki" | ||
) | ||
|
||
type keystore struct { | ||
keys map[string]keystoreEntry | ||
} | ||
|
||
type keystoreEntry struct { | ||
certificate *pki.Certificate | ||
key *pki.PrivateKey | ||
} | ||
|
||
var _ pki.Keystore = keystore{} | ||
|
||
func (k keystore) FindKeypair(name string) (*pki.Certificate, *pki.PrivateKey, bool, error) { | ||
entry, ok := k.keys[name] | ||
if !ok { | ||
return nil, nil, false, fmt.Errorf("unknown CA %q", name) | ||
} | ||
return entry.certificate, entry.key, false, nil | ||
} | ||
|
||
func newKeystore(basePath string, cas []string) (pki.Keystore, error) { | ||
keystore := &keystore{ | ||
keys: map[string]keystoreEntry{}, | ||
} | ||
for _, name := range cas { | ||
certBytes, err := ioutil.ReadFile(path.Join(basePath, name+".pem")) | ||
if err != nil { | ||
return nil, fmt.Errorf("reading %q certificate: %v", name, err) | ||
} | ||
certificate, err := pki.ParsePEMCertificate(certBytes) | ||
if err != nil { | ||
return nil, fmt.Errorf("parsing %q certificate: %v", name, err) | ||
} | ||
|
||
keyBytes, err := ioutil.ReadFile(path.Join(basePath, name+"-key.pem")) | ||
if err != nil { | ||
return nil, fmt.Errorf("reading %q key: %v", name, err) | ||
} | ||
key, err := pki.ParsePEMPrivateKey(keyBytes) | ||
if err != nil { | ||
return nil, fmt.Errorf("parsing %q key: %v", name, err) | ||
} | ||
|
||
keystore.keys[name] = keystoreEntry{ | ||
certificate: certificate, | ||
key: key, | ||
} | ||
} | ||
|
||
return keystore, nil | ||
} |
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.
I've been finding recently that I've been rewriting the kubebuilder main to call into a
func run() error
function immediately, just to avoid having to log & exit every time!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.
The structured logging, such as in the handling of
addNodeController
, makes it tricky to use that pattern.