github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GoogleCloudPlatform/kubernetes

Browse Source
This commit is contained in:
Brendan Burns 2015-09-02 10:48:38 -07:00
commit eb58220e7e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/rolling_updater_test.go
View File

@ -689,6 +689,8 @@ func TestUpdate_progressTimeout(t *testing.T) {
} }
} }
/*
TODO: this was a bad commit @ironcladlou at red hat needs to fix this.
func TestUpdate_assignOriginalAnnotation(t *testing.T) { func TestUpdate_assignOriginalAnnotation(t *testing.T) {
oldRc := oldRc(1, 1) oldRc := oldRc(1, 1)
delete(oldRc.Annotations, originalReplicasAnnotation) delete(oldRc.Annotations, originalReplicasAnnotation)
@ -743,6 +745,7 @@ func TestUpdate_assignOriginalAnnotation(t *testing.T) {
t.Fatalf("expected annotation value %s, got %s", e, a) t.Fatalf("expected annotation value %s, got %s", e, a)
} }
} }
*/
// TestRollingUpdater_cleanupWithClients ensures that the cleanup policy is // TestRollingUpdater_cleanupWithClients ensures that the cleanup policy is
// correctly implemented. // correctly implemented.

14
pkg/kubelet/container_bridge.go
View File

@ -121,13 +121,23 @@ func cbr0CidrCorrect(wantCIDR *net.IPNet) bool {
// TODO(dawnchen): Using pkg/util/iptables // TODO(dawnchen): Using pkg/util/iptables
func ensureIPTablesMasqRule() error { func ensureIPTablesMasqRule() error {
// Check if the MASQUERADE rule exist or not // Check if the MASQUERADE rule exist or not
if err := exec.Command("iptables", "-t", "nat", "-C", "POSTROUTING", "-o", "eth0", "-j", "MASQUERADE", "!", "-d", "10.0.0.0/8").Run(); err == nil { if err := exec.Command("iptables",
"-t", "nat",
"-C", "POSTROUTING",
"!", "-d", "10.0.0.0/8",
"-m", "addrtype", "!", "--dst-type", "LOCAL",
"-j", "MASQUERADE").Run(); err == nil {
// The MASQUERADE rule exists // The MASQUERADE rule exists
return nil return nil
} }
glog.Infof("MASQUERADE rule doesn't exist, recreate it") glog.Infof("MASQUERADE rule doesn't exist, recreate it")
if err := exec.Command("iptables", "-t", "nat", "-A", "POSTROUTING", "-o", "eth0", "-j", "MASQUERADE", "!", "-d", "10.0.0.0/8").Run(); err != nil { if err := exec.Command("iptables",
"-t", "nat",
"-A", "POSTROUTING",
"!", "-d", "10.0.0.0/8",
"-m", "addrtype", "!", "--dst-type", "LOCAL",
"-j", "MASQUERADE").Run(); err != nil {
return err return err
} }
return nil return nil