Skip to content

Commit

Permalink
Merge pull request #255 from galal-hussein/revert_enforce_docker
Browse files Browse the repository at this point in the history
Revert enforce docker
  • Loading branch information
Alena Prokharchyk authored Jan 22, 2018
2 parents bafc7ad + c425298 commit 57c61bb
Show file tree
Hide file tree
Showing 119 changed files with 17,794 additions and 12,635 deletions.
2 changes: 1 addition & 1 deletion cluster/hosts.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (c *Cluster) InvertIndexHosts() error {
RKEConfigNode: host,
}

newHost.EnforceDockerVersion = c.EnforceDockerVersion
newHost.IgnoreDockerVersion = c.IgnoreDockerVersion

for _, role := range host.Role {
logrus.Debugf("Host: " + host.Address + " has role: " + role)
Expand Down
18 changes: 9 additions & 9 deletions hosts/hosts.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ import (

type Host struct {
v3.RKEConfigNode
DClient *client.Client
LocalConnPort int
IsControl bool
IsWorker bool
IsEtcd bool
EnforceDockerVersion bool
ToAddEtcdMember bool
ExistingEtcdCluster bool
SavedKeyPhrase string
DClient *client.Client
LocalConnPort int
IsControl bool
IsWorker bool
IsEtcd bool
IgnoreDockerVersion bool
ToAddEtcdMember bool
ExistingEtcdCluster bool
SavedKeyPhrase string
}

const (
Expand Down
2 changes: 1 addition & 1 deletion hosts/tunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func checkDockerVersion(ctx context.Context, h *Host) error {
return fmt.Errorf("Error while determining supported Docker version [%s]: %v", info.ServerVersion, err)
}

if !isvalid && h.EnforceDockerVersion {
if !isvalid && !h.IgnoreDockerVersion {
return fmt.Errorf("Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])
} else if !isvalid {
log.Warnf(ctx, "Unsupported Docker version found [%s], supported versions are %v", info.ServerVersion, docker.K8sDockerVersions[K8sVersion])
Expand Down
4 changes: 2 additions & 2 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ github.com/coreos/etcd 52f73c5a6cb0d1d196ffd6eced406c9d8502078
github.com/coreos/go-semver e214231b295a8ea9479f11b70b35d5acf3556d9b
github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869dc

github.com/rancher/norman 432219d44739826485fb6c9178e5db08a162a9c3
github.com/rancher/types 62ac6749a4cb557b6816580f91ae6c1900b9492c
github.com/rancher/norman da40fa7b068e21ca85bfb3c9f4cf207f1008bf43
github.com/rancher/types 89ffa83b41713b743dbb420b7bd7180ad6ccb5f9
4 changes: 2 additions & 2 deletions vendor/github.com/rancher/norman/clientbase/object_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 75 additions & 41 deletions vendor/github.com/rancher/norman/condition/condition.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions vendor/github.com/rancher/norman/controller/cluster_check.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 57c61bb

Please sign in to comment.