Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1389213 - Fix join/isolate project network #11679

Merged
merged 2 commits into from
Nov 2, 2016
Merged

Bug 1389213 - Fix join/isolate project network #11679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6ac87
Bug 1389213 - Fix join/isolate project network
Oct 31, 2016
bca9fd2
Use existing kube method to fetch the container ID
Oct 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkg/sdn/plugin/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ import (
kapi "k8s.io/kubernetes/pkg/api"
kcache "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/fields"
kcontainer "k8s.io/kubernetes/pkg/kubelet/container"
)

func getPodContainerID(pod *kapi.Pod) string {
if len(pod.Status.ContainerStatuses) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this bit is acutally also fixed by #11613

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But actually, just use yours and I'll rebase #11613 on top of this one.

// Extract only container ID, pod.Status.ContainerStatuses[0].ContainerID is of the format: docker://<containerID>
if parts := strings.Split(pod.Status.ContainerStatuses[0].ContainerID, "://"); len(parts) > 1 {
return parts[1]
}
return kcontainer.ParseContainerID(pod.Status.ContainerStatuses[0].ContainerID).ID
}
return ""
}
Expand Down
14 changes: 6 additions & 8 deletions pkg/sdn/plugin/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
kapi "k8s.io/kubernetes/pkg/api"
kclient "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields"
kubeletTypes "k8s.io/kubernetes/pkg/kubelet/container"
knetwork "k8s.io/kubernetes/pkg/kubelet/network"
"k8s.io/kubernetes/pkg/labels"
kexec "k8s.io/kubernetes/pkg/util/exec"
Expand Down Expand Up @@ -215,10 +214,9 @@ func (node *OsdnNode) Start() error {
return err
}
for _, p := range pods {
containerID := getPodContainerID(&p)
err = node.UpdatePod(p.Namespace, p.Name, kubeletTypes.ContainerID{ID: containerID})
err = node.UpdatePod(p)
if err != nil {
log.Warningf("Could not update pod %q (%s): %s", p.Name, containerID, err)
log.Warningf("Could not update pod %q: %s", p.Name, err)
}
}
}
Expand All @@ -234,12 +232,12 @@ func (node *OsdnNode) Start() error {

// FIXME: this should eventually go into kubelet via a CNI UPDATE/CHANGE action
// See https://github.com/containernetworking/cni/issues/89
func (node *OsdnNode) UpdatePod(namespace string, name string, id kubeletTypes.ContainerID) error {
func (node *OsdnNode) UpdatePod(pod kapi.Pod) error {
req := &cniserver.PodRequest{
Command: cniserver.CNI_UPDATE,
PodNamespace: namespace,
PodName: name,
ContainerId: id.String(),
PodNamespace: pod.Namespace,
PodName: pod.Name,
ContainerId: getPodContainerID(&pod),
// netns is read from docker if needed, since we don't get it from kubelet
Result: make(chan *cniserver.PodResult),
}
Expand Down
1 change: 0 additions & 1 deletion pkg/sdn/plugin/pod_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const (
sdnScript = "openshift-sdn-ovs"
setUpCmd = "setup"
tearDownCmd = "teardown"
statusCmd = "status"
updateCmd = "update"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this omission have anything to do with the bz? Or is it just a cleanup.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, minor cleanup. Since this cleanup is only couple of lines, I have created a separate commit instead of new pr to avoid additional test/merge cycle.


AssignMacvlanAnnotation string = "pod.network.openshift.io/assign-macvlan"
Expand Down
3 changes: 1 addition & 2 deletions pkg/sdn/plugin/vnids_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

kapi "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache"
kubetypes "k8s.io/kubernetes/pkg/kubelet/container"
kerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/sets"
utilwait "k8s.io/kubernetes/pkg/util/wait"
Expand Down Expand Up @@ -167,7 +166,7 @@ func (node *OsdnNode) updatePodNetwork(namespace string, oldNetID, netID uint32)

// Update OF rules for the existing/old pods in the namespace
for _, pod := range pods {
err = node.UpdatePod(pod.Namespace, pod.Name, kubetypes.ContainerID{ID: getPodContainerID(&pod)})
err = node.UpdatePod(pod)
if err != nil {
errList = append(errList, err)
}
Expand Down