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
2085f77e
Unverified
Commit
2085f77e
authored
Feb 02, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 'get node' call during bootstrapping
parent
d6f7ae2f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
30 deletions
+0
-30
BUILD
cmd/kubeadm/app/node/BUILD
+0
-2
bootstrap.go
cmd/kubeadm/app/node/bootstrap.go
+0
-15
csr.go
cmd/kubeadm/app/node/csr.go
+0
-5
policy.go
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
+0
-2
cluster-roles.yaml
...thorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
+0
-6
No files found.
cmd/kubeadm/app/node/BUILD
View file @
2085f77e
...
@@ -24,8 +24,6 @@ go_library(
...
@@ -24,8 +24,6 @@ go_library(
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/kubelet/util/csr:go_default_library",
"//pkg/kubelet/util/csr:go_default_library",
"//vendor:github.com/square/go-jose",
"//vendor:github.com/square/go-jose",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/apimachinery/pkg/types",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/client-go/tools/clientcmd",
"//vendor:k8s.io/client-go/tools/clientcmd",
...
...
cmd/kubeadm/app/node/bootstrap.go
View file @
2085f77e
...
@@ -22,8 +22,6 @@ import (
...
@@ -22,8 +22,6 @@ import (
"sync"
"sync"
"time"
"time"
apierrs
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/clientcmd"
...
@@ -124,19 +122,6 @@ func createClients(caCert []byte, endpoint, token string, nodeName types.NodeNam
...
@@ -124,19 +122,6 @@ func createClients(caCert []byte, endpoint, token string, nodeName types.NodeNam
return
ac
,
nil
return
ac
,
nil
}
}
// checkForNodeNameDuplicates checks whether there are other nodes in the cluster with identical node names.
func
checkForNodeNameDuplicates
(
clientSet
*
clientset
.
Clientset
)
error
{
hostName
,
err
:=
os
.
Hostname
()
if
err
!=
nil
{
return
fmt
.
Errorf
(
"Failed to get node hostname [%v]"
,
err
)
}
_
,
err
=
clientSet
.
Nodes
()
.
Get
(
hostName
,
metav1
.
GetOptions
{})
if
err
!=
nil
&&
!
apierrs
.
IsNotFound
(
err
)
{
return
err
}
return
nil
}
// checks the connection requirements for a specific API endpoint
// checks the connection requirements for a specific API endpoint
func
checkAPIEndpoint
(
clientSet
*
clientset
.
Clientset
,
endpoint
string
)
error
{
func
checkAPIEndpoint
(
clientSet
*
clientset
.
Clientset
,
endpoint
string
)
error
{
// check general connectivity
// check general connectivity
...
...
cmd/kubeadm/app/node/csr.go
View file @
2085f77e
...
@@ -51,11 +51,6 @@ func PerformTLSBootstrap(cfg *clientcmdapi.Config) error {
...
@@ -51,11 +51,6 @@ func PerformTLSBootstrap(cfg *clientcmdapi.Config) error {
return
fmt
.
Errorf
(
"failed to generate private key [%v]"
,
err
)
return
fmt
.
Errorf
(
"failed to generate private key [%v]"
,
err
)
}
}
// Make sure there are no other nodes in the cluster with identical node name.
if
err
:=
checkForNodeNameDuplicates
(
c
);
err
!=
nil
{
return
err
}
cert
,
err
:=
csr
.
RequestNodeCertificate
(
c
.
Certificates
()
.
CertificateSigningRequests
(),
key
,
name
)
cert
,
err
:=
csr
.
RequestNodeCertificate
(
c
.
Certificates
()
.
CertificateSigningRequests
(),
key
,
name
)
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to request signed certificate from the API server [%v]"
,
err
)
return
fmt
.
Errorf
(
"failed to request signed certificate from the API server [%v]"
,
err
)
...
...
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
View file @
2085f77e
...
@@ -244,8 +244,6 @@ func ClusterRoles() []rbac.ClusterRole {
...
@@ -244,8 +244,6 @@ func ClusterRoles() []rbac.ClusterRole {
// a role to use for bootstrapping a node's client certificates
// a role to use for bootstrapping a node's client certificates
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"system:node-bootstrapper"
},
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"system:node-bootstrapper"
},
Rules
:
[]
rbac
.
PolicyRule
{
Rules
:
[]
rbac
.
PolicyRule
{
// used to check if the node already exists
rbac
.
NewRule
(
"get"
)
.
Groups
(
legacyGroup
)
.
Resources
(
"nodes"
)
.
RuleOrDie
(),
// used to create a certificatesigningrequest for a node-specific client certificate, and watch for it to be signed
// used to create a certificatesigningrequest for a node-specific client certificate, and watch for it to be signed
rbac
.
NewRule
(
"create"
,
"get"
,
"list"
,
"watch"
)
.
Groups
(
certificatesGroup
)
.
Resources
(
"certificatesigningrequests"
)
.
RuleOrDie
(),
rbac
.
NewRule
(
"create"
,
"get"
,
"list"
,
"watch"
)
.
Groups
(
certificatesGroup
)
.
Resources
(
"certificatesigningrequests"
)
.
RuleOrDie
(),
},
},
...
...
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
View file @
2085f77e
...
@@ -578,12 +578,6 @@ items:
...
@@ -578,12 +578,6 @@ items:
name
:
system:node-bootstrapper
name
:
system:node-bootstrapper
rules
:
rules
:
-
apiGroups
:
-
apiGroups
:
-
"
"
resources
:
-
nodes
verbs
:
-
get
-
apiGroups
:
-
certificates.k8s.io
-
certificates.k8s.io
resources
:
resources
:
-
certificatesigningrequests
-
certificatesigningrequests
...
...
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