Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Using containervm image for gce by default #2046

Merged
merged 1 commit into from
Oct 29, 2014
Merged

Using containervm image for gce by default #2046

merged 1 commit into from
Oct 29, 2014
+15 −4

Conversation

dchen1107
Copy link
Member

Have done a lot of tests against this change:

  1. Verified with kube-up.sh, and both docker and kubernetes binary are upgraded properly:

On master node:
root@kubernetes-master:/var/log# /usr/local/bin/apiserver --version
Kubernetes 3f52a97-311-gdcd454374fe4e1-dirty

On minion node:
root@kubernetes-minion-1:/var/log# /usr/local/bin/kubelet --version
Kubernetes 3f52a97-311-gdcd454374fe4e1-dirty
root@kubernetes-minion-1:/var/log# /usr/bin/docker --version
Docker version 1.3.0, build c78088f

  1. With Always check default-internal firewall absent or not; if not, create it #2042 merged, e2e tests are passed:
    2014/10/28 15:29:39 Passed tests: [update.sh guestbook.sh services.sh goe2e.sh basic.sh]
    2014/10/28 15:29:39 Failed tests: []
  • exit 0
  1. ran replication controller example by following examples/guestbook:

$ cluster/kubecfg.sh list pods
Name Image(s) Host Labels Status

redis-master-2 dockerfile/redis kubernetes-minion-1.c.golden-system-455.internal/146.148.52.185 name=redis-master Running
12ca8706-5efe-11e4-b6bd-42010af0091c brendanburns/redis-slave kubernetes-minion-4.c.golden-system-455.internal/130.211.121.128 name=redisslave Running
12cbf5f5-5efe-11e4-b6bd-42010af0091c brendanburns/redis-slave kubernetes-minion-2.c.golden-system-455.internal/107.178.223.69 name=redisslave Running
41141971-5efe-11e4-b6bd-42010af0091c brendanburns/php-redis kubernetes-minion-3.c.golden-system-455.internal/130.211.119.51 name=frontend Running
41144698-5efe-11e4-b6bd-42010af0091c brendanburns/php-redis kubernetes-minion-1.c.golden-system-455.internal/146.148.52.185 name=frontend Running
41149190-5efe-11e4-b6bd-42010af0091c brendanburns/php-redis kubernetes-minion-4.c.golden-system-455.internal/130.211.121.128 name=frontend Running

@dchen1107
Copy link
Member Author

With this PR, we have memcg cgroup enabled properly at node:

root@kubernetes-minion-4:/var/log# ls /sys/fs/cgroup/memory/docker/
02cc00f06dd5f8ee5decfba98d77a65d9a6f643887f0c052b34f501e419dac40 cgroup.event_control memory.max_usage_in_bytes memory.stat
3954b299d24d46e388e0a0b60545dbf996964184825dcd22c1b0db7818107318 cgroup.procs memory.move_charge_at_immigrate memory.swappiness
a36cf9c39af705cdb9efa3c523113437a4e41792bac55b83965d4f7bbf3d5d16 eb9ce3ceaa43b4aee3239a45aabaea6f4caf98767521d70ed5a0bc677ca57a0e memory.numa_stat memory.usage_in_bytes
aaebd1f0f875e20da9fef56357f3a5bf91a79436b5e1b1af1dd31115ecf21990 memory.failcnt memory.oom_control memory.use_hierarchy
b66e9246d786655ca1c44c021a7619c98b48407d1d88bb0cf98a1b65615bd71d memory.force_empty memory.pressure_level notify_on_release
cgroup.clone_children memory.limit_in_bytes memory.soft_limit_in_bytes tasks

Also cAdvisor could report memory related stats: http://146.148.52.185:4194/containers/

vmarmol
vmarmol reviewed Oct 29, 2014
View reviewed changes
cluster/gce/util.sh
@@ -239,6 +239,13 @@ function kube-up {
local htpasswd
htpasswd=$(cat "${KUBE_TEMP}/htpasswd")

if ! gcutil getimage "${IMAGE}" > /dev/null 2>&1; then
echo "Add new image: ${IMAGE}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: "Adding" new image?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks!

@vmarmol
Copy link
Contributor

vmarmol commented Oct 29, 2014

Minor nits, overall LGTM thanks @dchen1107! Finally getting the memory stats is awesome :)

@vmarmol
Copy link
Contributor

vmarmol commented Oct 29, 2014

LGTM

@vishh
Copy link
Contributor

vishh commented Oct 29, 2014

Thanks @dchen1107. This change saves a lot of time. Wonder when it will get merged... ?

@filbranden
Copy link
Contributor

LGTM will merge it now. Thanks Dawn!

filbranden added a commit that referenced this pull request Oct 29, 2014
@filbranden
Merge pull request #2046 from dchen1107/containervm
5619fb2 
Using containervm image for gce by default
@filbranden filbranden merged commit 5619fb2 into kubernetes:master Oct 29, 2014
This was referenced Oct 29, 2014
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dchen1107 @vmarmol @vishh @filbranden