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
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
ACIDES
Hepto
Commits
7302105c
Commit
7302105c
authored
2 years ago
by
kaiyou
Browse files
Options
Downloads
Patches
Plain Diff
Add a kubeconfig and additional binaries
parent
f21b8225
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pkg/cluster/cluster.go
+3
-1
3 additions, 1 deletion
pkg/cluster/cluster.go
pkg/cluster/env.go
+55
-0
55 additions, 0 deletions
pkg/cluster/env.go
pkg/pki/master.go
+8
-0
8 additions, 0 deletions
pkg/pki/master.go
with
66 additions
and
1 deletion
pkg/cluster/cluster.go
+
3
−
1
View file @
7302105c
...
@@ -32,9 +32,11 @@ func New(settings *ClusterSettings, node *NodeSettings) *Cluster {
...
@@ -32,9 +32,11 @@ func New(settings *ClusterSettings, node *NodeSettings) *Cluster {
}
}
func
(
c
*
Cluster
)
Run
()
{
func
(
c
*
Cluster
)
Run
()
{
// Initialize components
// Initialize components, certs must be initialized before
// environment, which references master keys
c
.
initVPN
()
c
.
initVPN
()
c
.
initCerts
()
c
.
initCerts
()
c
.
initEnv
()
c
.
ml
.
Meta
.
Role
=
string
(
c
.
node
.
Role
)
c
.
ml
.
Meta
.
Role
=
string
(
c
.
node
.
Role
)
// Start waiting for events
// Start waiting for events
events
:=
c
.
ml
.
Events
()
events
:=
c
.
ml
.
Events
()
...
...
This diff is collapsed.
Click to expand it.
pkg/cluster/env.go
0 → 100644
+
55
−
0
View file @
7302105c
package
cluster
import
(
"fmt"
"os"
"path"
"github.com/sirupsen/logrus"
)
const
homeDir
=
"/root"
const
binDir
=
"/bin"
// Initialize hepto environment:
// - deploy subcommand symlinks
func
(
c
*
Cluster
)
initEnv
()
{
// Remove all binaries and configs
err
:=
os
.
RemoveAll
(
binDir
)
if
err
!=
nil
{
logrus
.
Fatal
(
err
)
}
err
=
os
.
RemoveAll
(
homeDir
)
if
err
!=
nil
{
logrus
.
Fatal
(
err
)
}
// Create bin directory and all useful symlinks
err
=
os
.
Setenv
(
"PATH"
,
binDir
)
if
err
!=
nil
{
logrus
.
Fatal
(
err
)
}
err
=
os
.
MkdirAll
(
binDir
,
0
o755
)
if
err
!=
nil
{
logrus
.
Fatal
(
err
)
}
for
_
,
name
:=
range
[]
string
{
"kubectl"
,
"ctr"
,
"mount"
,
"containerd-shim"
,
"containerd-shim-runc-v2"
}
{
err
=
os
.
Symlink
(
"/proc/1/exe"
,
path
.
Join
(
binDir
,
name
))
}
// Create the admin kubeconfig on master only
if
c
.
node
.
Role
==
Master
{
err
=
os
.
MkdirAll
(
path
.
Join
(
homeDir
,
".kube"
),
0
o755
)
if
err
!=
nil
{
logrus
.
Fatal
(
err
)
}
rootConfig
:=
KubeConfig
{
URL
:
fmt
.
Sprintf
(
"https://[%s]:6443"
,
c
.
networking
.
NodeAddress
.
IP
.
String
()),
CACert
:
c
.
pki
.
TLS
.
CertPath
(),
ClientKey
:
c
.
masterCerts
.
RootClient
.
KeyPath
(),
ClientCert
:
c
.
masterCerts
.
RootClient
.
CertPath
(),
}
err
=
rootConfig
.
Write
(
path
.
Join
(
homeDir
,
".kube/config"
))
if
err
!=
nil
{
logrus
.
Fatal
(
err
)
}
}
}
This diff is collapsed.
Click to expand it.
pkg/pki/master.go
+
8
−
0
View file @
7302105c
...
@@ -20,6 +20,8 @@ type MasterCerts struct {
...
@@ -20,6 +20,8 @@ type MasterCerts struct {
ControllersAPI
*
pekahi
.
Certificate
ControllersAPI
*
pekahi
.
Certificate
// API client certificate for the scheduler
// API client certificate for the scheduler
SchedulerAPI
*
pekahi
.
Certificate
SchedulerAPI
*
pekahi
.
Certificate
// Root access to the API server
RootClient
*
pekahi
.
Certificate
}
}
func
NewMasterCerts
(
path
string
,
ip
net
.
IP
)
(
*
MasterCerts
,
error
)
{
func
NewMasterCerts
(
path
string
,
ip
net
.
IP
)
(
*
MasterCerts
,
error
)
{
...
@@ -67,6 +69,10 @@ func NewMasterCerts(path string, ip net.IP) (*MasterCerts, error) {
...
@@ -67,6 +69,10 @@ func NewMasterCerts(path string, ip net.IP) (*MasterCerts, error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
// Root client certificate
rootClientCert
,
err
:=
bundle
.
GetCertOrCSR
(
"root"
,
pekahi
.
NewClientTemplate
(
"root"
,
"system:masters"
),
)
return
&
MasterCerts
{
return
&
MasterCerts
{
TLS
:
tlsCert
,
TLS
:
tlsCert
,
Tokens
:
tokenKey
,
Tokens
:
tokenKey
,
...
@@ -74,6 +80,7 @@ func NewMasterCerts(path string, ip net.IP) (*MasterCerts, error) {
...
@@ -74,6 +80,7 @@ func NewMasterCerts(path string, ip net.IP) (*MasterCerts, error) {
ControllersTLS
:
controllersTLSCert
,
ControllersTLS
:
controllersTLSCert
,
ControllersAPI
:
controllersAPICert
,
ControllersAPI
:
controllersAPICert
,
SchedulerAPI
:
schedulerAPICert
,
SchedulerAPI
:
schedulerAPICert
,
RootClient
:
rootClientCert
,
},
nil
},
nil
}
}
...
@@ -83,4 +90,5 @@ func (ca *ClusterCA) SignMasterCerts(m *MasterCerts) {
...
@@ -83,4 +90,5 @@ func (ca *ClusterCA) SignMasterCerts(m *MasterCerts) {
signCert
(
ca
.
TLS
,
m
.
ControllersTLS
,
pekahi
.
NewServerTemplate
(
m
.
ControllersTLS
.
CSR
.
DNSNames
,
m
.
ControllersTLS
.
CSR
.
IPAddresses
))
signCert
(
ca
.
TLS
,
m
.
ControllersTLS
,
pekahi
.
NewServerTemplate
(
m
.
ControllersTLS
.
CSR
.
DNSNames
,
m
.
ControllersTLS
.
CSR
.
IPAddresses
))
signCert
(
ca
.
API
,
m
.
ControllersAPI
,
pekahi
.
NewClientTemplate
(
m
.
ControllersAPI
.
CSR
.
Subject
.
CommonName
,
""
))
signCert
(
ca
.
API
,
m
.
ControllersAPI
,
pekahi
.
NewClientTemplate
(
m
.
ControllersAPI
.
CSR
.
Subject
.
CommonName
,
""
))
signCert
(
ca
.
API
,
m
.
SchedulerAPI
,
pekahi
.
NewClientTemplate
(
m
.
SchedulerAPI
.
CSR
.
Subject
.
CommonName
,
""
))
signCert
(
ca
.
API
,
m
.
SchedulerAPI
,
pekahi
.
NewClientTemplate
(
m
.
SchedulerAPI
.
CSR
.
Subject
.
CommonName
,
""
))
signCert
(
ca
.
API
,
m
.
RootClient
,
pekahi
.
NewClientTemplate
(
m
.
RootClient
.
CSR
.
Subject
.
CommonName
,
"system:masters"
))
}
}
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