mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 14:37:00 +00:00
Merge pull request #18105 from mikedanese/vagrant-provider
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
commit
51c5e66e7a
@ -24,5 +24,4 @@ import (
|
||||
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
|
||||
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt"
|
||||
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace"
|
||||
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/vagrant"
|
||||
)
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
/*
|
||||
Copyright 2014 The Kubernetes Authors All rights reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// Package vagrant is an implementation of Interface, TCPLoadBalancer
|
||||
// and Instances for developer managed Vagrant cluster.
|
||||
package vagrant
|
||||
@ -1,272 +0,0 @@
|
||||
/*
|
||||
Copyright 2014 The Kubernetes Authors All rights reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package vagrant
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"net/http"
|
||||
neturl "net/url"
|
||||
"sort"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/cloudprovider"
|
||||
)
|
||||
|
||||
const ProviderName = "vagrant"
|
||||
|
||||
// VagrantCloud is an implementation of Interface, TCPLoadBalancer and Instances for developer managed Vagrant cluster.
|
||||
type VagrantCloud struct {
|
||||
saltURL string
|
||||
saltUser string
|
||||
saltPass string
|
||||
saltAuth string
|
||||
}
|
||||
|
||||
func init() {
|
||||
cloudprovider.RegisterCloudProvider(ProviderName, func(config io.Reader) (cloudprovider.Interface, error) { return newVagrantCloud() })
|
||||
}
|
||||
|
||||
// SaltToken is an authorization token required by Salt REST API.
|
||||
type SaltToken struct {
|
||||
Token string `json:"token"`
|
||||
User string `json:"user"`
|
||||
EAuth string `json:"eauth"`
|
||||
}
|
||||
|
||||
// SaltLoginResponse is the response object for a /login operation against Salt REST API.
|
||||
type SaltLoginResponse struct {
|
||||
Data []SaltToken `json:"return"`
|
||||
}
|
||||
|
||||
// SaltMinion is a machine managed by the Salt service.
|
||||
type SaltMinion struct {
|
||||
Roles []string `json:"roles"`
|
||||
IP string `json:"node_ip"`
|
||||
Host string `json:"host"`
|
||||
}
|
||||
|
||||
// SaltMinions is a map of minion name to machine information.
|
||||
type SaltMinions map[string]SaltMinion
|
||||
|
||||
// SaltMinionsResponse is the response object for a /minions operation against Salt REST API
|
||||
type SaltMinionsResponse struct {
|
||||
Minions []SaltMinions `json:"return"`
|
||||
}
|
||||
|
||||
// newVagrantCloud creates a new instance of VagrantCloud configured to talk to the Salt REST API.
|
||||
func newVagrantCloud() (*VagrantCloud, error) {
|
||||
return &VagrantCloud{
|
||||
saltURL: "http://kubernetes-master:8000",
|
||||
saltUser: "vagrant",
|
||||
saltPass: "vagrant",
|
||||
saltAuth: "pam",
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (v *VagrantCloud) Clusters() (cloudprovider.Clusters, bool) {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
// ProviderName returns the cloud provider ID.
|
||||
func (v *VagrantCloud) ProviderName() string {
|
||||
return ProviderName
|
||||
}
|
||||
|
||||
// ScrubDNS filters DNS settings for pods.
|
||||
func (v *VagrantCloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) {
|
||||
return nameservers, searches
|
||||
}
|
||||
|
||||
// TCPLoadBalancer returns an implementation of TCPLoadBalancer for Vagrant cloud.
|
||||
func (v *VagrantCloud) TCPLoadBalancer() (cloudprovider.TCPLoadBalancer, bool) {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
// Instances returns an implementation of Instances for Vagrant cloud.
|
||||
func (v *VagrantCloud) Instances() (cloudprovider.Instances, bool) {
|
||||
return v, true
|
||||
}
|
||||
|
||||
// Zones returns an implementation of Zones for Vagrant cloud.
|
||||
func (v *VagrantCloud) Zones() (cloudprovider.Zones, bool) {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
// Routes returns an implementation of Routes for Vagrant cloud.
|
||||
func (v *VagrantCloud) Routes() (cloudprovider.Routes, bool) {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
// getInstanceByAddress retuns
|
||||
func (v *VagrantCloud) getInstanceByAddress(address string) (*SaltMinion, error) {
|
||||
token, err := v.saltLogin()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
minions, err := v.saltMinions(token)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
filteredMinions := v.saltMinionsByRole(minions, "kubernetes-pool")
|
||||
for _, minion := range filteredMinions {
|
||||
// Due to vagrant not running with a dedicated DNS setup, we return the IP address of a minion as its hostname at this time
|
||||
if minion.IP == address {
|
||||
return &minion, nil
|
||||
}
|
||||
}
|
||||
return nil, fmt.Errorf("unable to find instance for address: %s", address)
|
||||
}
|
||||
|
||||
func (v *VagrantCloud) AddSSHKeyToAllInstances(user string, keyData []byte) error {
|
||||
return errors.New("unimplemented")
|
||||
}
|
||||
|
||||
// Implementation of Instances.CurrentNodeName
|
||||
func (v *VagrantCloud) CurrentNodeName(hostname string) (string, error) {
|
||||
return hostname, nil
|
||||
}
|
||||
|
||||
// NodeAddresses returns the NodeAddresses of a particular machine instance.
|
||||
func (v *VagrantCloud) NodeAddresses(instance string) ([]api.NodeAddress, error) {
|
||||
// Due to vagrant not running with a dedicated DNS setup, we return the IP address of a minion as its hostname at this time
|
||||
minion, err := v.getInstanceByAddress(instance)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ip := net.ParseIP(minion.IP)
|
||||
return []api.NodeAddress{{Type: api.NodeLegacyHostIP, Address: ip.String()}}, nil
|
||||
}
|
||||
|
||||
// ExternalID returns the cloud provider ID of the specified instance (deprecated).
|
||||
func (v *VagrantCloud) ExternalID(instance string) (string, error) {
|
||||
// Due to vagrant not running with a dedicated DNS setup, we return the IP address of a minion as its hostname at this time
|
||||
minion, err := v.getInstanceByAddress(instance)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return minion.IP, nil
|
||||
}
|
||||
|
||||
// InstanceID returns the cloud provider ID of the specified instance.
|
||||
func (v *VagrantCloud) InstanceID(instance string) (string, error) {
|
||||
minion, err := v.getInstanceByAddress(instance)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return minion.IP, nil
|
||||
}
|
||||
|
||||
// saltMinionsByRole filters a list of minions that have a matching role.
|
||||
func (v *VagrantCloud) saltMinionsByRole(minions []SaltMinion, role string) []SaltMinion {
|
||||
var filteredMinions []SaltMinion
|
||||
for _, value := range minions {
|
||||
sort.Strings(value.Roles)
|
||||
if pos := sort.SearchStrings(value.Roles, role); pos < len(value.Roles) {
|
||||
filteredMinions = append(filteredMinions, value)
|
||||
}
|
||||
}
|
||||
return filteredMinions
|
||||
}
|
||||
|
||||
// saltMinions invokes the Salt API for minions using provided token.
|
||||
func (v *VagrantCloud) saltMinions(token SaltToken) ([]SaltMinion, error) {
|
||||
var minions []SaltMinion
|
||||
|
||||
url := v.saltURL + "/minions"
|
||||
req, err := http.NewRequest("GET", url, nil)
|
||||
req.Header.Add("X-Auth-Token", token.Token)
|
||||
|
||||
client := &http.Client{}
|
||||
resp, err := client.Do(req)
|
||||
|
||||
defer resp.Body.Close()
|
||||
body, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return minions, err
|
||||
}
|
||||
|
||||
var minionsResp SaltMinionsResponse
|
||||
if err = json.Unmarshal(body, &minionsResp); err != nil {
|
||||
return minions, err
|
||||
}
|
||||
|
||||
for _, value := range minionsResp.Minions[0] {
|
||||
minions = append(minions, value)
|
||||
}
|
||||
|
||||
return minions, nil
|
||||
}
|
||||
|
||||
// saltLogin invokes the Salt API to get an authorization token.
|
||||
func (v *VagrantCloud) saltLogin() (SaltToken, error) {
|
||||
url := v.saltURL + "/login"
|
||||
data := neturl.Values{
|
||||
"username": {v.saltUser},
|
||||
"password": {v.saltPass},
|
||||
"eauth": {v.saltAuth},
|
||||
}
|
||||
|
||||
var token SaltToken
|
||||
resp, err := http.PostForm(url, data)
|
||||
if err != nil {
|
||||
return token, err
|
||||
}
|
||||
|
||||
defer resp.Body.Close()
|
||||
body, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return token, err
|
||||
}
|
||||
|
||||
var loginResp SaltLoginResponse
|
||||
if err := json.Unmarshal(body, &loginResp); err != nil {
|
||||
return token, err
|
||||
}
|
||||
|
||||
if len(loginResp.Data) == 0 {
|
||||
return token, errors.New("No token found in response")
|
||||
}
|
||||
|
||||
return loginResp.Data[0], nil
|
||||
}
|
||||
|
||||
// List enumerates the set of minions instances known by the cloud provider.
|
||||
func (v *VagrantCloud) List(filter string) ([]string, error) {
|
||||
token, err := v.saltLogin()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
minions, err := v.saltMinions(token)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
filteredMinions := v.saltMinionsByRole(minions, "kubernetes-pool")
|
||||
var instances []string
|
||||
for _, instance := range filteredMinions {
|
||||
// With no dedicated DNS setup in cluster, IP address is used as hostname
|
||||
instances = append(instances, instance.IP)
|
||||
}
|
||||
|
||||
return instances, nil
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
/*
|
||||
Copyright 2014 The Kubernetes Authors All rights reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package vagrant
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// startSaltTestServer starts a test server that mocks the Salt REST API
|
||||
func startSaltTestServer() *httptest.Server {
|
||||
|
||||
// mock responses
|
||||
var (
|
||||
testSaltMinionsResponse = []byte(`{ "return": [{"kubernetes-minion-1": {"kernel": "Linux", "domain": "", "zmqversion": "3.2.4", "kernelrelease": "3.11.10-301.fc20.x86_64", "pythonpath": ["/usr/bin", "/usr/lib64/python27.zip", "/usr/lib64/python2.7", "/usr/lib64/python2.7/plat-linux2", "/usr/lib64/python2.7/lib-tk", "/usr/lib64/python2.7/lib-old", "/usr/lib64/python2.7/lib-dynload", "/usr/lib64/python2.7/site-packages", "/usr/lib/python2.7/site-packages"], "etcd_servers": "10.245.1.2", "ip_interfaces": {"lo": ["127.0.0.1"], "docker0": ["172.17.42.1"], "enp0s8": ["10.245.2.2"], "p2p1": ["10.0.2.15"]}, "shell": "/bin/sh", "mem_total": 491, "saltversioninfo": [2014, 1, 7], "osmajorrelease": ["20"], "node_ip": "10.245.2.2", "id": "kubernetes-minion-1", "osrelease": "20", "ps": "ps -efH", "server_id": 1005530826, "num_cpus": 1, "hwaddr_interfaces": {"lo": "00:00:00:00:00:00", "docker0": "56:84:7a:fe:97:99", "enp0s8": "08:00:27:17:c5:0f", "p2p1": "08:00:27:96:96:e1"}, "virtual": "VirtualBox", "osfullname": "Fedora", "master": "kubernetes-master", "ipv4": ["10.0.2.15", "10.245.2.2", "127.0.0.1", "172.17.42.1"], "ipv6": ["::1", "fe80::a00:27ff:fe17:c50f", "fe80::a00:27ff:fe96:96e1"], "cpu_flags": ["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clflush", "mmx", "fxsr", "sse", "sse2", "syscall", "nx", "rdtscp", "lm", "constant_tsc", "rep_good", "nopl", "pni", "monitor", "ssse3", "lahf_lm"], "localhost": "kubernetes-minion-1", "lsb_distrib_id": "Fedora", "fqdn_ip4": ["127.0.0.1"], "fqdn_ip6": [], "nodename": "kubernetes-minion-1", "saltversion": "2014.1.7", "saltpath": "/usr/lib/python2.7/site-packages/salt", "pythonversion": [2, 7, 5, "final", 0], "host": "kubernetes-minion-1", "os_family": "RedHat", "oscodename": "Heisenbug", "defaultencoding": "UTF-8", "osfinger": "Fedora-20", "roles": ["kubernetes-pool"], "num_gpus": 1, "cpu_model": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz", "fqdn": "kubernetes-minion-1", "osarch": "x86_64", "cpuarch": "x86_64", "gpus": [{"model": "VirtualBox Graphics Adapter", "vendor": "unknown"}], "path": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", "os": "Fedora", "defaultlanguage": "en_US"}}]}`)
|
||||
testSaltLoginResponse = []byte(`{ "return": [{"perms": [".*"], "start": 1407355696.564397, "token": "ca74fa1c48ce40e204a1e820d2fa14b7cf033137", "expire": 1407398896.564398, "user": "vagrant", "eauth": "pam"}]}`)
|
||||
testSaltFailure = []byte(`failure`)
|
||||
)
|
||||
|
||||
handler := func(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.Method {
|
||||
case "GET":
|
||||
switch r.URL.Path {
|
||||
case "/minions":
|
||||
w.Write(testSaltMinionsResponse)
|
||||
return
|
||||
}
|
||||
case "POST":
|
||||
switch r.URL.Path {
|
||||
case "/login":
|
||||
w.Write(testSaltLoginResponse)
|
||||
return
|
||||
}
|
||||
}
|
||||
w.Write(testSaltFailure)
|
||||
}
|
||||
return httptest.NewServer(http.HandlerFunc(handler))
|
||||
}
|
||||
|
||||
// TestVagrantCloud tests against a mock Salt REST API to validate its cloud provider features
|
||||
func TestVagrantCloud(t *testing.T) {
|
||||
server := startSaltTestServer()
|
||||
defer server.Close()
|
||||
|
||||
vagrantCloud := &VagrantCloud{
|
||||
saltURL: server.URL,
|
||||
saltUser: "vagrant",
|
||||
saltPass: "vagrant",
|
||||
saltAuth: "pam",
|
||||
}
|
||||
|
||||
instances, err := vagrantCloud.List("")
|
||||
if err != nil {
|
||||
t.Fatalf("There was an error listing instances %s", err)
|
||||
}
|
||||
|
||||
if len(instances) != 1 {
|
||||
t.Fatalf("Incorrect number of instances returned")
|
||||
}
|
||||
|
||||
// no DNS in vagrant cluster, so we return IP as hostname
|
||||
expectedInstanceHost := "10.245.2.2"
|
||||
expectedInstanceIP := "10.245.2.2"
|
||||
|
||||
if instances[0] != expectedInstanceHost {
|
||||
t.Fatalf("Invalid instance returned")
|
||||
}
|
||||
|
||||
addrs, err := vagrantCloud.NodeAddresses(instances[0])
|
||||
if err != nil {
|
||||
t.Fatalf("Unexpected error, should have returned valid NodeAddresses: %s", err)
|
||||
}
|
||||
if len(addrs) != 1 {
|
||||
t.Fatalf("should have returned exactly one NodeAddress: %v", addrs)
|
||||
}
|
||||
if addrs[0].Address != expectedInstanceIP {
|
||||
t.Fatalf("Invalid IP address returned")
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user