mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge branch 'master' of https://github.com/GoogleCloudPlatform/kubernetes
This commit is contained in:
commit
eb58220e7e
@ -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) {
|
||||
oldRc := oldRc(1, 1)
|
||||
delete(oldRc.Annotations, originalReplicasAnnotation)
|
||||
@ -743,6 +745,7 @@ func TestUpdate_assignOriginalAnnotation(t *testing.T) {
|
||||
t.Fatalf("expected annotation value %s, got %s", e, a)
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// TestRollingUpdater_cleanupWithClients ensures that the cleanup policy is
|
||||
// correctly implemented.
|
||||
|
@ -121,13 +121,23 @@ func cbr0CidrCorrect(wantCIDR *net.IPNet) bool {
|
||||
// TODO(dawnchen): Using pkg/util/iptables
|
||||
func ensureIPTablesMasqRule() error {
|
||||
// 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
|
||||
return nil
|
||||
}
|
||||
|
||||
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 nil
|
||||
|
Loading…
Reference in New Issue
Block a user