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
a5193353
Unverified
Commit
a5193353
authored
Jan 06, 2017
by
Paulo Pires
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm: added HTTPS discovery.
Fixes kubernetes/kubeadm#94
parent
18370ba0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
BUILD
cmd/kubeadm/app/discovery/BUILD
+1
-0
discovery.go
cmd/kubeadm/app/discovery/discovery.go
+20
-0
No files found.
cmd/kubeadm/app/discovery/BUILD
View file @
a5193353
...
...
@@ -20,6 +20,7 @@ go_library(
"//cmd/kubeadm/app/discovery/file:go_default_library",
"//cmd/kubeadm/app/discovery/https:go_default_library",
"//cmd/kubeadm/app/discovery/token:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/client/unversioned/clientcmd/api:go_default_library",
"//vendor:github.com/spf13/pflag",
],
...
...
cmd/kubeadm/app/discovery/discovery.go
View file @
a5193353
...
...
@@ -18,8 +18,11 @@ package discovery
import
(
"fmt"
"io/ioutil"
"net/http"
kubeadmapi
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
clientcmdapi
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
)
...
...
@@ -28,6 +31,8 @@ func For(d kubeadmapi.Discovery) (*clientcmdapi.Config, error) {
switch
{
case
d
.
File
!=
nil
:
return
runFileDiscovery
(
d
.
File
)
case
d
.
HTTPS
!=
nil
:
return
runHTTPSDiscovery
(
d
.
HTTPS
)
default
:
return
nil
,
fmt
.
Errorf
(
"Couldn't find a valid discovery configuration. Please provide one."
)
}
...
...
@@ -37,5 +42,20 @@ func For(d kubeadmapi.Discovery) (*clientcmdapi.Config, error) {
func
runFileDiscovery
(
fd
*
kubeadmapi
.
FileDiscovery
)
(
*
clientcmdapi
.
Config
,
error
)
{
return
clientcmd
.
LoadFromFile
(
fd
.
Path
)
}
// runHTTPSDiscovery executes HTTPS-based discovery.
func
runHTTPSDiscovery
(
hd
*
kubeadmapi
.
HTTPSDiscovery
)
(
*
clientcmdapi
.
Config
,
error
)
{
response
,
err
:=
http
.
Get
(
hd
.
URL
)
if
err
!=
nil
{
return
nil
,
err
}
defer
response
.
Body
.
Close
()
kubeconfig
,
err
:=
ioutil
.
ReadAll
(
response
.
Body
)
if
err
!=
nil
{
return
nil
,
err
}
return
clientcmd
.
Load
(
kubeconfig
)
}
}
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