Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Hepto
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
reminec
Hepto
Commits
287e9a6d
Commit
287e9a6d
authored
2 years ago
by
kaiyou
Browse files
Options
Downloads
Patches
Plain Diff
General code cleanup
parent
55502ada
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
services/etcd.go
+1
-1
1 addition, 1 deletion
services/etcd.go
services/k8s.go
+16
-16
16 additions, 16 deletions
services/k8s.go
with
17 additions
and
17 deletions
services/etcd.go
+
1
−
1
View file @
287e9a6d
...
...
@@ -11,7 +11,7 @@ var EtcdPath = "/etcd"
var
etcd
=
&
Unit
{
Name
:
"etcd"
,
Dependencies
:
[]
*
Unit
{
m
aster
Certs
},
Dependencies
:
[]
*
Unit
{
pkiM
aster
},
Run
:
func
(
u
*
Unit
,
c
*
Cluster
,
ctx
context
.
Context
)
error
{
config
:=
embed
.
NewConfig
()
config
.
Dir
=
EtcdPath
...
...
This diff is collapsed.
Click to expand it.
services/k8s.go
+
16
−
16
View file @
287e9a6d
...
...
@@ -11,8 +11,8 @@ import (
restclient
"k8s.io/client-go/rest"
"k8s.io/component-base/cli/flag"
"k8s.io/klog/v2"
api
"k8s.io/kubernetes/cmd/kube-apiserver/app"
apiopts
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
api
server
"k8s.io/kubernetes/cmd/kube-apiserver/app"
api
server
opts
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
cm
"k8s.io/kubernetes/cmd/kube-controller-manager/app"
cmopts
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
scheduler
"k8s.io/kubernetes/cmd/kube-scheduler/app"
...
...
@@ -26,7 +26,7 @@ import (
var
configPath
=
"/etc"
var
k
8s
Logger
=
&
Unit
{
var
k
ube
Logger
=
&
Unit
{
Name
:
"kube-logger"
,
Run
:
func
(
u
*
Unit
,
c
*
Cluster
,
ctx
context
.
Context
)
error
{
klog
.
SetLogger
(
u
.
Manager
.
Logger
)
...
...
@@ -34,9 +34,9 @@ var k8sLogger = &Unit{
},
}
var
a
piserver
=
&
Unit
{
var
kubeA
piserver
=
&
Unit
{
Name
:
"kube-apiserver"
,
Dependencies
:
[]
*
Unit
{
etcd
,
masterCerts
,
pkiCA
,
vpn
,
k
8s
Logger
},
Dependencies
:
[]
*
Unit
{
etcd
,
pkiCA
,
pkiMaster
,
vpn
,
k
ube
Logger
},
Run
:
func
(
u
*
Unit
,
c
*
Cluster
,
ctx
context
.
Context
)
error
{
args
:=
[]
string
{
"--bind-address"
,
c
.
networking
.
NodeAddress
.
IP
.
String
(),
...
...
@@ -47,7 +47,7 @@ var apiserver = &Unit{
"--kubelet-certificate-authority"
,
c
.
pki
.
TLS
.
CertPath
(),
"--kubelet-client-certificate"
,
c
.
masterCerts
.
Kubelet
.
CertPath
(),
"--kubelet-client-key"
,
c
.
masterCerts
.
Kubelet
.
KeyPath
(),
"--etcd-servers"
,
"http://
localhost
:2379"
,
"--etcd-servers"
,
"http://
[::1]
:2379"
,
"--service-account-signing-key-file"
,
c
.
masterCerts
.
APITokens
.
KeyPath
(),
"--service-account-key-file"
,
c
.
masterCerts
.
APITokens
.
KeyPath
(),
"--service-account-issuer"
,
"https://kubernetes.default.svc.cluster.local"
,
...
...
@@ -55,18 +55,18 @@ var apiserver = &Unit{
"--authorization-mode"
,
"Node,RBAC"
,
"--allow-privileged"
,
"true"
,
}
config
:=
apiopts
.
NewServerRunOptions
()
config
:=
api
server
opts
.
NewServerRunOptions
()
nfs
:=
config
.
Flags
()
flags
:=
flagsFromNamedFlagSet
(
"apiserver"
,
&
nfs
)
err
:=
flags
.
Parse
(
args
)
if
err
!=
nil
{
return
err
}
completedOptions
,
err
:=
api
.
Complete
(
config
)
completedOptions
,
err
:=
api
server
.
Complete
(
config
)
if
err
!=
nil
{
return
err
}
server
,
err
:=
api
.
CreateServerChain
(
completedOptions
)
server
,
err
:=
api
server
.
CreateServerChain
(
completedOptions
)
if
err
!=
nil
{
return
err
}
...
...
@@ -88,9 +88,9 @@ var apiserver = &Unit{
},
}
var
c
ontroller
_m
anager
=
&
Unit
{
var
kubeC
ontroller
M
anager
=
&
Unit
{
Name
:
"kube-controller-manager"
,
Dependencies
:
[]
*
Unit
{
a
piserver
,
masterCerts
,
pkiCA
,
k8s
Logger
},
Dependencies
:
[]
*
Unit
{
kubeA
piserver
,
pkiCA
,
pkiMaster
,
kube
Logger
},
Run
:
func
(
u
*
Unit
,
c
*
Cluster
,
ctx
context
.
Context
)
error
{
cmConfig
:=
KubeConfig
{
URL
:
fmt
.
Sprintf
(
"https://[%s]:6443"
,
c
.
networking
.
NodeAddress
.
IP
.
String
()),
...
...
@@ -133,9 +133,9 @@ var controller_manager = &Unit{
},
}
var
kube
_s
cheduler
=
&
Unit
{
var
kube
S
cheduler
=
&
Unit
{
Name
:
"kube-scheduler"
,
Dependencies
:
[]
*
Unit
{
a
piserver
,
masterCerts
,
pkiCA
,
k8s
Logger
},
Dependencies
:
[]
*
Unit
{
kubeA
piserver
,
pkiCA
,
pkiMaster
,
kube
Logger
},
Run
:
func
(
u
*
Unit
,
c
*
Cluster
,
ctx
context
.
Context
)
error
{
schedulerConfig
:=
KubeConfig
{
URL
:
fmt
.
Sprintf
(
"https://[%s]:6443"
,
c
.
networking
.
NodeAddress
.
IP
.
String
()),
...
...
@@ -163,12 +163,12 @@ var kube_scheduler = &Unit{
},
}
var
kube
_k
ubelet
=
&
Unit
{
var
kube
K
ubelet
=
&
Unit
{
Name
:
"kubelet"
,
Dependencies
:
[]
*
Unit
{
remote_master
,
containerd
,
nodeCerts
,
pkiCA
,
k8s
Logger
},
Dependencies
:
[]
*
Unit
{
masterDiscovery
,
containerd
,
pkiCA
,
pkiNode
,
kube
Logger
},
Run
:
func
(
u
*
Unit
,
c
*
Cluster
,
ctx
context
.
Context
)
error
{
kubeletKubeConfig
:=
KubeConfig
{
URL
:
fmt
.
Sprintf
(
"https://[%s]:6443"
,
c
.
masterNode
.
String
()),
URL
:
fmt
.
Sprintf
(
"https://[%s]:6443"
,
c
.
masterNode
.
VpnIP
.
String
()),
CACert
:
c
.
pki
.
TLS
.
CertPath
(),
ClientCert
:
c
.
certs
.
API
.
CertPath
(),
ClientKey
:
c
.
certs
.
API
.
KeyPath
(),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment