rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-01 11:46:17 +00:00
Code Issues Releases Wiki Activity

add ignore_docker_version

Browse Source
This commit is contained in:
moelsayed 2017-12-15 05:02:44 +02:00
parent e30d90f5c4
commit c671552a27
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster.yml
View File

@ -20,6 +20,7 @@ network:
flannel_cni_image: quay.io/coreos/flannel-cni:v0.2.0 flannel_cni_image: quay.io/coreos/flannel-cni:v0.2.0
ssh_key_path: ~/.ssh/test ssh_key_path: ~/.ssh/test
ignore_docker_version: false
nodes: nodes:
- address: 1.1.1.1 - address: 1.1.1.1

3
cluster/hosts.go
View File

@ -40,6 +40,9 @@ func (c *Cluster) InvertIndexHosts() error {
if err := newHost.RegisterDialer(c.Dialer); err != nil { if err := newHost.RegisterDialer(c.Dialer); err != nil {
return fmt.Errorf("Failed to register new Dialer for host [%s]: %v", host.Address, err) return fmt.Errorf("Failed to register new Dialer for host [%s]: %v", host.Address, err)
} }
newHost.IgnoreDockerVersion = c.IgnoreDockerVersion
for _, role := range host.Role { for _, role := range host.Role {
logrus.Debugf("Host: " + host.Address + " has role: " + role) logrus.Debugf("Host: " + host.Address + " has role: " + role)
switch role { switch role {

4
cmd/config.go
View File

@ -273,8 +273,8 @@ func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) {
return &servicesConfig, nil return &servicesConfig, nil
} }
func getAuthConfig(reader *bufio.Reader) (*v3.AuthConfig, error) { func getAuthConfig(reader *bufio.Reader) (*v3.AuthnConfig, error) {
authConfig := v3.AuthConfig{} authConfig := v3.AuthnConfig{}
authType, err := getConfig(reader, "Authentication Strategy", "x509") authType, err := getConfig(reader, "Authentication Strategy", "x509")
if err != nil { if err != nil {

9
hosts/hosts.go
View File

@ -15,10 +15,11 @@ import (
type Host struct { type Host struct {
v3.RKEConfigNode v3.RKEConfigNode
DClient *client.Client DClient *client.Client
Dialer Dialer Dialer Dialer
IsControl bool IsControl bool
IsWorker bool IsWorker bool
IgnoreDockerVersion bool
} }
const ( const (

4
hosts/tunnel.go
View File

@ -46,8 +46,10 @@ func (h *Host) TunnelUp() error {
return fmt.Errorf("Error while determining supported Docker version [%s]: %v", info.ServerVersion, err) return fmt.Errorf("Error while determining supported Docker version [%s]: %v", info.ServerVersion, err)
} }
if !isvalid { if !isvalid && !h.IgnoreDockerVersion {
return fmt.Errorf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion]) return fmt.Errorf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])
} else if !isvalid {
logrus.Warnf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])
} }
return nil return nil