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
7d7ffdb6
Unverified
Commit
7d7ffdb6
authored
May 10, 2018
by
Jason DeTiberus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm - add preflight warning when using systemd-resolved
parent
828ffd5a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
1 deletion
+31
-1
BUILD
cmd/kubeadm/app/preflight/BUILD
+1
-0
checks.go
cmd/kubeadm/app/preflight/checks.go
+30
-1
No files found.
cmd/kubeadm/app/preflight/BUILD
View file @
7d7ffdb6
...
@@ -59,6 +59,7 @@ go_library(
...
@@ -59,6 +59,7 @@ go_library(
"//pkg/kubeapiserver/authorizer/modes:go_default_library",
"//pkg/kubeapiserver/authorizer/modes:go_default_library",
"//pkg/registry/core/service/ipallocator:go_default_library",
"//pkg/registry/core/service/ipallocator:go_default_library",
"//pkg/util/initsystem:go_default_library",
"//pkg/util/initsystem:go_default_library",
"//pkg/util/procfs:go_default_library",
"//pkg/util/version:go_default_library",
"//pkg/util/version:go_default_library",
"//pkg/version:go_default_library",
"//pkg/version:go_default_library",
"//test/e2e_node/system:go_default_library",
"//test/e2e_node/system:go_default_library",
...
...
cmd/kubeadm/app/preflight/checks.go
View file @
7d7ffdb6
...
@@ -54,6 +54,7 @@ import (
...
@@ -54,6 +54,7 @@ import (
authzmodes
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
authzmodes
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/util/initsystem"
"k8s.io/kubernetes/pkg/util/initsystem"
"k8s.io/kubernetes/pkg/util/procfs"
versionutil
"k8s.io/kubernetes/pkg/util/version"
versionutil
"k8s.io/kubernetes/pkg/util/version"
kubeadmversion
"k8s.io/kubernetes/pkg/version"
kubeadmversion
"k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/test/e2e_node/system"
"k8s.io/kubernetes/test/e2e_node/system"
...
@@ -867,6 +868,33 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{})
...
@@ -867,6 +868,33 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{})
return
err
return
err
}
}
// ResolveCheck tests for potential issues related to the system resolver configuration
type
ResolveCheck
struct
{}
// Name returns label for ResolveCheck
func
(
ResolveCheck
)
Name
()
string
{
return
"Resolve"
}
// Check validates the system resolver configuration
func
(
ResolveCheck
)
Check
()
(
warnings
,
errors
[]
error
)
{
glog
.
V
(
1
)
.
Infoln
(
"validating the system resolver configuration"
)
warnings
=
[]
error
{}
// procfs.PidOf only returns an error if the string passed is empty
// or there is an issue compiling the regex, so we can ignore it here
pids
,
_
:=
procfs
.
PidOf
(
"systemd-resolved"
)
if
len
(
pids
)
>
0
{
warnings
=
append
(
warnings
,
fmt
.
Errorf
(
"systemd-resolved was detected, for cluster dns resolution to work "
+
"properly --resolv-conf=/run/systemd/resolve/resolv.conf must be set "
+
"for the kubelet. (/etc/systemd/system/kubelet.service.d/10-kubeadm.conf should be edited for this purpose)
\n
"
))
}
return
warnings
,
errors
}
// RunInitMasterChecks executes all individual, applicable to Master node checks.
// RunInitMasterChecks executes all individual, applicable to Master node checks.
func
RunInitMasterChecks
(
execer
utilsexec
.
Interface
,
cfg
*
kubeadmapi
.
MasterConfiguration
,
ignorePreflightErrors
sets
.
String
)
error
{
func
RunInitMasterChecks
(
execer
utilsexec
.
Interface
,
cfg
*
kubeadmapi
.
MasterConfiguration
,
ignorePreflightErrors
sets
.
String
)
error
{
// First, check if we're root separately from the other preflight checks and fail fast
// First, check if we're root separately from the other preflight checks and fail fast
...
@@ -1010,7 +1038,8 @@ func addCommonChecks(execer utilsexec.Interface, cfg kubeadmapi.CommonConfigurat
...
@@ -1010,7 +1038,8 @@ func addCommonChecks(execer utilsexec.Interface, cfg kubeadmapi.CommonConfigurat
InPathCheck
{
executable
:
"socat"
,
mandatory
:
false
,
exec
:
execer
},
InPathCheck
{
executable
:
"socat"
,
mandatory
:
false
,
exec
:
execer
},
InPathCheck
{
executable
:
"tc"
,
mandatory
:
false
,
exec
:
execer
},
InPathCheck
{
executable
:
"tc"
,
mandatory
:
false
,
exec
:
execer
},
InPathCheck
{
executable
:
"touch"
,
mandatory
:
false
,
exec
:
execer
},
InPathCheck
{
executable
:
"touch"
,
mandatory
:
false
,
exec
:
execer
},
criCtlChecker
)
criCtlChecker
,
ResolveCheck
{})
}
}
checks
=
append
(
checks
,
checks
=
append
(
checks
,
SystemVerificationCheck
{
CRISocket
:
cfg
.
GetCRISocket
()},
SystemVerificationCheck
{
CRISocket
:
cfg
.
GetCRISocket
()},
...
...
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