1. 03 Nov, 2017 3 commits
    • Kubernetes Submit Queue's avatar
      Merge pull request #54964 from Random-Liu/add-containerd-e2e · 7a28aaff
      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>.
      
      Add support to for alternative container runtime in `kube-up.sh`
      
      For https://github.com/kubernetes/features/issues/286.
      
      This PR added 4 new environment variables in `kube-up.sh` to support alternative container runtime:
      1) `KUBE_MASTER_EXTRA_METADATA` and `KUBE_NODE_EXTRA_METADATA`. Add extra metadata on master and node instance. With this we could specify different cloud-init for a different container runtime, and also add extra metadata for the new cloud-init, e.g. [master.yaml](https://github.com/Random-Liu/cri-containerd/blob/7d739662141cc137f8b1e82a9824b18be2e5df21/test/e2e/master.yaml)
      2) `KUBE_CONTAINER_RUNTIME_ENDPOINT`. Specify different sock for different container runtime. It's only used when it's not empty.
      3) `KUBE_LOAD_IMAGE_COMMAND`. Specify different load image command for different container runtime.
      
      An example for cri-containerd:
      ```
      export KUBE_MASTER_EXTRA_METADATA="user-data=${GOPATH}/src/github.com/kubernetes-incubator/cri-containerd/test/e2e/master.yaml,cri-containerd-configure-sh=${GOPATH}/src/github.com/kubernetes-incubator/cri-containerd/test/configure.sh"
      export KUBE_NODE_EXTRA_METADATA="user-data=${GOPATH}/src/github.com/kubernetes-incubator/cri-containerd/test/e2e/node.yaml,cri-containerd-configure-sh=${GOPATH}/src/github.com/kubernetes-incubator/cri-containerd/test/configure.sh"
      export KUBE_CONTAINER_RUNTIME="remote"
      export KUBE_CONTAINER_RUNTIME_ENDPOINT="/var/run/cri-containerd.sock"
      export KUBE_LOAD_IMAGE_COMMAND="/home/cri-containerd/usr/local/bin/cri-containerd load"
      export NETWORK_POLICY_PROVIDER="calico"
      ```
      Signed-off-by: 's avatarLantao Liu <lantaol@google.com>
      
      ```release-note
      none
      ```
      /cc @yujuhong @dchen1107 @feiskyer @mikebrow @abhi @mrunalp @runcom 
      /cc @kubernetes/sig-node-pr-reviews
      7a28aaff
    • 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
    • Kubernetes Submit Queue's avatar
      Merge pull request #54488 from lichuqiang/plugin_base · 2084f7f4
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue. 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>.
      
      Add admission handler for device resources allocation
      
      **What this PR does / why we need it**:
      Add admission handler for device resources allocation to fail fast during pod creation
      
      **Which issue this PR fixes** 
      fixes #51592
      
      **Special notes for your reviewer**:
      @jiayingz Sorry, there is something wrong with my branch in #51895. And I think the existing comments in the PR might be too long for others to view. So I closed it and opened the new one, as we have basically reach an agreement on the implement :)
      I have covered the functionality and unit test part here, and would set about the e2e part ASAP
      
      /cc @jiayingz @vishh @RenaudWasTaken 
      
      **Release note**:
      
      ```release-note
      NONE
      ```
      2084f7f4
  2. 02 Nov, 2017 37 commits