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
d0e29789
Unverified
Commit
d0e29789
authored
Sep 23, 2016
by
Ilya Dmitrichenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sorting of linted packages and gofmt
parent
37dab801
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
manifests.go
cmd/kubeadm/app/master/manifests.go
+4
-4
.linted_packages
hack/.linted_packages
+1
-1
No files found.
cmd/kubeadm/app/master/manifests.go
View file @
d0e29789
...
@@ -220,7 +220,7 @@ func componentPod(container api.Container, volumes ...api.Volume) api.Pod {
...
@@ -220,7 +220,7 @@ func componentPod(container api.Container, volumes ...api.Volume) api.Pod {
func
getComponentCommand
(
component
string
,
s
*
kubeadmapi
.
KubeadmConfig
)
(
command
[]
string
)
{
func
getComponentCommand
(
component
string
,
s
*
kubeadmapi
.
KubeadmConfig
)
(
command
[]
string
)
{
baseFlags
:=
map
[
string
][]
string
{
baseFlags
:=
map
[
string
][]
string
{
apiServer
:
[]
string
{
apiServer
:
{
"--address=127.0.0.1"
,
"--address=127.0.0.1"
,
"--etcd-servers=http://127.0.0.1:2379"
,
"--etcd-servers=http://127.0.0.1:2379"
,
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota"
,
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota"
,
...
@@ -233,7 +233,7 @@ func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command
...
@@ -233,7 +233,7 @@ func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command
"--secure-port=443"
,
"--secure-port=443"
,
"--allow-privileged"
,
"--allow-privileged"
,
},
},
controllerManager
:
[]
string
{
controllerManager
:
{
// TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the cm port to the rest of the world
// TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the cm port to the rest of the world
"--leader-elect"
,
"--leader-elect"
,
"--master=127.0.0.1:8080"
,
"--master=127.0.0.1:8080"
,
...
@@ -244,12 +244,12 @@ func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command
...
@@ -244,12 +244,12 @@ func getComponentCommand(component string, s *kubeadmapi.KubeadmConfig) (command
"--cluster-signing-key-file="
+
pkiDir
+
"/ca-key.pem"
,
"--cluster-signing-key-file="
+
pkiDir
+
"/ca-key.pem"
,
"--insecure-experimental-approve-all-kubelet-csrs-for-group=system:kubelet-bootstrap"
,
"--insecure-experimental-approve-all-kubelet-csrs-for-group=system:kubelet-bootstrap"
,
},
},
scheduler
:
[]
string
{
scheduler
:
{
// TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the scheduler port to the rest of the world
// TODO(phase1+): consider adding --address=127.0.0.1 in order to not expose the scheduler port to the rest of the world
"--leader-elect"
,
"--leader-elect"
,
"--master=127.0.0.1:8080"
,
"--master=127.0.0.1:8080"
,
},
},
proxy
:
[]
string
{},
proxy
:
{},
}
}
if
s
.
EnvParams
[
"hyperkube_image"
]
!=
""
{
if
s
.
EnvParams
[
"hyperkube_image"
]
!=
""
{
...
...
hack/.linted_packages
View file @
d0e29789
...
@@ -15,6 +15,7 @@ cmd/kube-discovery
...
@@ -15,6 +15,7 @@ cmd/kube-discovery
cmd/kube-dns
cmd/kube-dns
cmd/kube-proxy
cmd/kube-proxy
cmd/kubeadm
cmd/kubeadm
cmd/kubeadm
cmd/kubectl
cmd/kubectl
cmd/kubelet
cmd/kubelet
cmd/kubernetes-discovery
cmd/kubernetes-discovery
...
@@ -243,4 +244,3 @@ test/integration/openshift
...
@@ -243,4 +244,3 @@ test/integration/openshift
test/soak/cauldron
test/soak/cauldron
test/soak/serve_hostnames
test/soak/serve_hostnames
third_party/forked/golang/expansion
third_party/forked/golang/expansion
cmd/kubeadm
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