Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rke
Commits
c425298f
Commit
c425298f
authored
7 years ago
by
galal-hussein
Browse files
Options
Download
Email Patches
Plain Diff
revert back to ignore docker version
parent
c2f4ada9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cluster/hosts.go
+1
-1
cluster/hosts.go
hosts/hosts.go
+9
-9
hosts/hosts.go
hosts/tunnel.go
+1
-1
hosts/tunnel.go
with
11 additions
and
11 deletions
+11
-11
cluster/hosts.go
+
1
-
1
View file @
c425298f
...
...
@@ -47,7 +47,7 @@ func (c *Cluster) InvertIndexHosts() error {
RKEConfigNode
:
host
,
}
newHost
.
Enf
or
c
eDockerVersion
=
c
.
Enf
or
c
eDockerVersion
newHost
.
Ign
oreDockerVersion
=
c
.
Ign
oreDockerVersion
for
_
,
role
:=
range
host
.
Role
{
logrus
.
Debugf
(
"Host: "
+
host
.
Address
+
" has role: "
+
role
)
...
...
This diff is collapsed.
Click to expand it.
hosts/hosts.go
+
9
-
9
View file @
c425298f
...
...
@@ -16,15 +16,15 @@ import (
type
Host
struct
{
v3
.
RKEConfigNode
DClient
*
client
.
Client
LocalConnPort
int
IsControl
bool
IsWorker
bool
IsEtcd
bool
Enf
or
c
eDockerVersion
bool
ToAddEtcdMember
bool
ExistingEtcdCluster
bool
SavedKeyPhrase
string
DClient
*
client
.
Client
LocalConnPort
int
IsControl
bool
IsWorker
bool
IsEtcd
bool
Ign
oreDockerVersion
bool
ToAddEtcdMember
bool
ExistingEtcdCluster
bool
SavedKeyPhrase
string
}
const
(
...
...
This diff is collapsed.
Click to expand it.
hosts/tunnel.go
+
1
-
1
View file @
c425298f
...
...
@@ -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
.
Enf
or
c
eDockerVersion
{
if
!
isvalid
&&
!
h
.
Ign
oreDockerVersion
{
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
])
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help