Fixing calico-ipam using hostname instead of nodename #375
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
caseydavenport
requested changes
Sep 7, 2017
|
lgtm at this point. |
ipam/calico-ipam.go
Outdated
| @@ -69,12 +69,26 @@ type ipamArgs struct { | |||
| IP net.IP `json:"ip,omitempty"` | |||
| } | |||
|
|
|||
| func updateNodename(conf utils.NetConf) string { | |||
There was a problem hiding this comment.
naming nit: this isn't updating nodename, it's determining it.
Maybe determineNodename would be better.
ipam/calico-ipam.go
Outdated
| func cmdAdd(args *skel.CmdArgs) error { | ||
| conf := utils.NetConf{} | ||
| if err := json.Unmarshal(args.StdinData, &conf); err != nil { | ||
| return fmt.Errorf("failed to load netconf: %v", err) | ||
| } | ||
|
|
||
| nodename := updateNodename(conf) | ||
|
|
There was a problem hiding this comment.
no need for the extra newline.
caseydavenport
approved these changes
Sep 8, 2017
It looks as though we were still using the deprecated `hostname` from the CNI payload, and not `nodename` which was causing issues assigning affine blocks if you need to use a `NODENAME` that is different from the Nodes `os.Hostname()`. We'll check for the old `hostname` value as well similar to how we do in the CNI plugin.
heschlie
force-pushed
the
nodename-fix
branch
from
9653b24
to
12f2233
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes projectcalico/calico#826
It looks as though we were still using the deprecated
hostnamefrom the CNI payload, and notnodenamewhich was causing issues assigning affine blocks if you need to use aNODENAMEthat is different from the Nodesos.Hostname().I tested this on a vagrant cluster launching Calico with systemd to configure a
NODENAMEdifferent than the Nodes hostname, and matched theNODENAMEenv var in the CNI config filesnodename. Without this fix the claimed blocks get assigned to the Nodes hostname in etcd, instead of the proper nodename.Todos
Release Note