• Kubernetes Submit Queue's avatar
    Merge pull request #54838 from Random-Liu/fix-calico-network-policy · 52ec6f42
    Kubernetes Submit Queue authored
    Automatic merge from submit-queue (batch tested with PRs 54488, 54838, 54964). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
    
    Fix calico network policy for opensource.
    
    For https://github.com/kubernetes/features/issues/286
    
    This PR:
    1) Add `NON_MASTER_NODE_LABELS` env, and only apply calico node label on non-master nodes.
    2) Set ip masq rules in cloud init, so that we don't need the ip masq agent. @dchen1107 @dnardo As we discussed.
    3) Let master use `${NETWORK_PROVIDER}` instead of fixed cni, because we won't run calico node agent on master. The master network should be configured separately (kubenet by default).
    
    With this PR, I could bring up a cluster with `NETWORK_POLICY_PROVIDER=calico` on GCE now.
    ```console
    $ cluster/kubectl.sh get pods --all-namespaces
    NAMESPACE     NAME                                                  READY     STATUS    RESTARTS   AGE
    kube-system   calico-node-9bxbv                                     2/2       Running   0          13m
    kube-system   calico-node-kjxtw                                     2/2       Running   0          13m
    kube-system   calico-node-vertical-autoscaler-67fb4f45bd-hcjmw      1/1       Running   0          16m
    kube-system   calico-node-xs2s2                                     2/2       Running   0          13m
    kube-system   calico-typha-7c4d876ddf-d4dtx                         1/1       Running   0          15m
    kube-system   calico-typha-horizontal-autoscaler-5f477cdc66-qwwph   1/1       Running   0          16m
    kube-system   calico-typha-vertical-autoscaler-58f7d686f7-pn72s     1/1       Running   0          16m
    kube-system   etcd-empty-dir-cleanup-e2e-test-lantaol-master        1/1       Running   0          16m
    kube-system   etcd-server-e2e-test-lantaol-master                   1/1       Running   0          16m
    kube-system   etcd-server-events-e2e-test-lantaol-master            1/1       Running   0          16m
    kube-system   event-exporter-v0.1.7-9d4dbb69c-m76v5                 2/2       Running   0          16m
    kube-system   fluentd-gcp-v2.0.10-25dmf                             2/2       Running   0          16m
    kube-system   fluentd-gcp-v2.0.10-kgxsk                             2/2       Running   0          16m
    kube-system   fluentd-gcp-v2.0.10-p75xg                             2/2       Running   0          16m
    kube-system   fluentd-gcp-v2.0.10-xzh77                             2/2       Running   0          16m
    kube-system   heapster-v1.5.0-beta.0-5cf4d9dff7-dmvm7               4/4       Running   0          13m
    kube-system   kube-addon-manager-e2e-test-lantaol-master            1/1       Running   0          15m
    kube-system   kube-apiserver-e2e-test-lantaol-master                1/1       Running   0          16m
    kube-system   kube-controller-manager-e2e-test-lantaol-master       1/1       Running   0          16m
    kube-system   kube-dns-79bdcb6c9f-2bpc8                             3/3       Running   0          15m
    kube-system   kube-dns-79bdcb6c9f-gr686                             3/3       Running   0          16m
    kube-system   kube-dns-autoscaler-996dcfc9d-pfs4s                   1/1       Running   0          16m
    kube-system   kube-proxy-e2e-test-lantaol-minion-group-3khw         1/1       Running   0          16m
    kube-system   kube-proxy-e2e-test-lantaol-minion-group-6878         1/1       Running   0          16m
    kube-system   kube-proxy-e2e-test-lantaol-minion-group-j9rq         1/1       Running   0          16m
    kube-system   kube-scheduler-e2e-test-lantaol-master                1/1       Running   0          16m
    kube-system   kubernetes-dashboard-765c6f47bd-lsw5r                 1/1       Running   0          16m
    kube-system   l7-default-backend-6d477bf555-x54zf                   1/1       Running   0          16m
    kube-system   l7-lb-controller-v0.9.7-e2e-test-lantaol-master       1/1       Running   0          16m
    kube-system   metrics-server-v0.2.0-9c4f8c48d-gkl79                 2/2       Running   0          13m
    kube-system   monitoring-influxdb-grafana-v4-54df94856c-krkvb       2/2       Running   0          16m
    kube-system   rescheduler-v0.3.1-e2e-test-lantaol-master            1/1       Running   0          16m
    ```
    
    **Note that with this PR, master node will be using kubenet by default. And network policy will not apply on master node.**
    
    **We need this to unblock `cri-containerd` integration with `kube-up.sh`.**
    /cc @dchen1107 @dnardo Please take a look.
    @kubernetes/sig-network-misc @kubernetes/sig-cluster-lifecycle-misc 
    Signed-off-by: 's avatarLantao Liu <lantaol@google.com>
    
    ```release-note
    None
    ```
    52ec6f42
Name
Last commit
Last update
.github Loading commit data...
Godeps Loading commit data...
api Loading commit data...
build Loading commit data...
cluster Loading commit data...
cmd Loading commit data...
docs Loading commit data...
examples Loading commit data...
hack Loading commit data...
logo Loading commit data...
pkg Loading commit data...
plugin Loading commit data...
staging Loading commit data...
test Loading commit data...
third_party Loading commit data...
translations Loading commit data...
vendor Loading commit data...
.bazelrc Loading commit data...
.generated_files Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.kazelcfg.json Loading commit data...
BUILD.bazel Loading commit data...
CHANGELOG-1.2.md Loading commit data...
CHANGELOG-1.3.md Loading commit data...
CHANGELOG-1.4.md Loading commit data...
CHANGELOG-1.5.md Loading commit data...
CHANGELOG-1.6.md Loading commit data...
CHANGELOG-1.7.md Loading commit data...
CHANGELOG-1.8.md Loading commit data...
CHANGELOG-1.9.md Loading commit data...
CHANGELOG.md Loading commit data...
CONTRIBUTING.md Loading commit data...
LICENSE Loading commit data...
Makefile Loading commit data...
Makefile.generated_files Loading commit data...
OWNERS Loading commit data...
OWNERS_ALIASES Loading commit data...
README.md Loading commit data...
SUPPORT.md Loading commit data...
Vagrantfile Loading commit data...
WORKSPACE Loading commit data...
code-of-conduct.md Loading commit data...
labels.yaml Loading commit data...