-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
Containerd CRI Integration #286
Comments
@Random-Liu it seems to be a notable feature - any documentation can be provided? /cc @dchen1107 @kubernetes/sig-node-feature-requests |
@idvoretskyi Hi, the document will be located in the We'll add document to |
Thanks
…On Tue, Jun 20, 2017, 6:45 PM Lantao Liu ***@***.***> wrote:
@idvoretskyi <https://github.com/idvoretskyi> Hi, the document will be
located in the cri-containerd
<https://github.com/kubernetes-incubator/cri-containerd> repo.
We'll add document to k8s.io next release with feature complete.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#286 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAHOu-xWSnUxVn2OwzGe9uyXaZxCJjZ1ks5sF_cZgaJpZM4NMGSa>
.
|
@Random-Liu @kubernetes/sig-node-feature-requests any progress for 1.8? If yes, please, update the features tracking board with the relevant data. |
1.0-alpha planned for release at the end of September |
Status Update
|
thanks for the update, @Random-Liu |
@Random-Liu can you update the features tracking board with the relevant data? Thanks. |
@idvoretskyi Will do. Thanks for reminding! |
@idvoretskyi Done |
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 kubernetes/enhancements#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: Lantao Liu <lantaol@google.com> ```release-note none ``` /cc @yujuhong @dchen1107 @feiskyer @mikebrow @abhi @mrunalp @runcom /cc @kubernetes/sig-node-pr-reviews
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 kubernetes/enhancements#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: Lantao Liu <lantaol@google.com> ```release-note None ```
Automatic merge from submit-queue (batch tested with PRs 55392, 55491, 51914, 55831, 55836). 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>. Rename log-dump env to `LOG_DUMP_SYSTEMD_SERVICES`. For kubernetes/enhancements#286. Rename `SYSTEMD_SERVICES` to `LOG_DUMP_SYSTEMD_SERVICES`. test-infra disables log dump in our e2e framework, and uses a different log dump logic https://github.com/kubernetes/test-infra/blob/master/kubetest/e2e.go#L480-L497. So the flags we added in #55288 will not work in test-infra. Fortrunately, test-infra is using the same script `cluster/log-dump/log-dump.sh`, so we could still configure systemd services by setting the environment variable globally. The original environment variable name is too general for setting globally, change it to a more specific name. **Release note**: ```release-note none ```
Issues go stale after 90d of inactivity. Prevent issues from auto-closing with an If this issue is safe to close now please do so with Send feedback to sig-testing, kubernetes/test-infra and/or |
/remove-lifecycle stale |
Automatic merge from submit-queue (batch tested with PRs 60011, 59256, 59293, 60328, 60367). 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 CPU/Memory pod stats for CRI stats. For kubernetes/enhancements#286. Add CPU and memory stats for pod. @kubernetes/sig-node-pr-reviews /cc @dashpole @yujuhong @abhi @yguo0905 Signed-off-by: Lantao Liu <lantaol@google.com> **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note Summary API will include pod CPU and Memory stats for CRI container runtime. ```
Issues go stale after 90d of inactivity. If this issue is safe to close now please do so with Send feedback to sig-testing, kubernetes/test-infra and/or fejta. |
@Random-Liu If so, can you please ensure the feature is up-to-date with the appropriate:
cc @idvoretskyi |
/remove-lifecycle stale |
@Random-Liu @mikebrow pinging again for status. Any plans for this in 1.11? If so, can you please ensure the feature is up-to-date with the appropriate:
|
The feature is GA now. Status Update
|
Thanks for the update, @Random-Liu! /remove-help |
Feature Name
The text was updated successfully, but these errors were encountered: