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.

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

Assigned emptyDir for etcd data dir in skydns pod #11055

Merged
merged 1 commit into from
Jul 10, 2015

Conversation

ArtfulCoder
Copy link
Contributor

@ArtfulCoder ArtfulCoder added this to the v1.0 milestone Jul 10, 2015
@ArtfulCoder
Copy link
Contributor Author

@bprashanth @dchen1107
issue #10926

@k8s-bot
Copy link

k8s-bot commented Jul 10, 2015

GCE e2e build/test failed for commit 4e3db347bd41c5b378d1e0a12ffb67eb67a372b1.

@ArtfulCoder
Copy link
Contributor Author

The 3 tests that are failing in this e2e are failing already in all the k8s bot runs for other in-flight PRs.
So I believe this to be un-related to my changes and should be safe to merge.

@@ -28,12 +28,17 @@ spec:
memory: 50Mi
command:
- /usr/local/bin/etcd
- -data-dir
- /var/etcd/data
Copy link
Member

Choose a reason for hiding this comment

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

this is a subdir of the volumeMount - is that intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have now mounted mounted emptydir on /var/etcd/data
I used that as a mount mount for consistency. Our other etcd container on master uses /var/etcd/data

@thockin
Copy link
Member

thockin commented Jul 10, 2015

LGTM

@thockin
Copy link
Member

thockin commented Jul 10, 2015

@jnagal for priority merge once @bprashanth OKs

- -listen-client-urls
- http://127.0.0.1:2379,http://127.0.0.1:4001
- -advertise-client-urls
- http://127.0.0.1:2379,http://127.0.0.1:4001
- -initial-cluster-token
- skydns-etcd
volumeMounts:
Copy link
Contributor

Choose a reason for hiding this comment

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

optional nit: etcd logs would also be nice

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will have to wrap the etcd command in a shell for stdout and stderr to be redirected. I can do it in a separate PR

Copy link
Member

Choose a reason for hiding this comment

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

don't redirect stdout/err - then 'kubectl logs` won't work

On Fri, Jul 10, 2015 at 8:59 AM, Abhi Shah notifications@github.com wrote:

In cluster/addons/dns/skydns-rc.yaml.in
#11055 (comment)
:

     - -listen-client-urls
     - http://127.0.0.1:2379,http://127.0.0.1:4001
     - -advertise-client-urls
     - http://127.0.0.1:2379,http://127.0.0.1:4001
     - -initial-cluster-token
     - skydns-etcd
  •    volumeMounts:
    

I will have to wrap the etcd command in a shell for stdout and stderr to
be redirected. I can do it in a separate PR


Reply to this email directly or view it on GitHub
https://github.com/GoogleCloudPlatform/kubernetes/pull/11055/files#r34368610
.

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess I just want -debug https://github.com/coreos/etcd/blob/master/Documentation/configuration.md, but it looks like it isn't available in etcd 2.0 :\

@bprashanth
Copy link
Contributor

LGTM sans the volumeMount point. Also can you please wait for #11004 and rebase? :)

@ArtfulCoder ArtfulCoder force-pushed the etcd_mount branch 2 times, most recently from 68dfed8 to cebf233 Compare July 10, 2015 15:57
@thockin thockin added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge labels Jul 10, 2015
@thockin
Copy link
Member

thockin commented Jul 10, 2015

marked ok to merge

@thockin
Copy link
Member

thockin commented Jul 10, 2015

@rjnagal

@k8s-bot
Copy link

k8s-bot commented Jul 10, 2015

GCE e2e build/test failed for commit 68dfed865f506a85fad020fb4de8ffd4531310bd.

@k8s-bot
Copy link

k8s-bot commented Jul 10, 2015

GCE e2e build/test passed for commit cebf23321d4017621e143552fcee0843b1a79c33.

@rjnagal
Copy link
Contributor

rjnagal commented Jul 10, 2015

#11004 merged. Can you rebase?

@ArtfulCoder
Copy link
Contributor Author

@rjnagal rebased

@thockin
Copy link
Member

thockin commented Jul 10, 2015

@ArtfulCoder ASAP please

On Fri, Jul 10, 2015 at 9:26 AM, Rohit Jnagal notifications@github.com
wrote:

#11004 #11004
merged. Can you rebase?


Reply to this email directly or view it on GitHub
#11055 (comment)
.

@thockin
Copy link
Member

thockin commented Jul 10, 2015

LGTM still, thanks

@rjnagal
Copy link
Contributor

rjnagal commented Jul 10, 2015

merging

@ArtfulCoder
Copy link
Contributor Author

Rohit is waiting for e2e

@k8s-bot
Copy link

k8s-bot commented Jul 10, 2015

GCE e2e build/test passed for commit bc99a57.

rjnagal added a commit that referenced this pull request Jul 10, 2015
Assigned emptyDir for etcd data dir in skydns pod
@rjnagal rjnagal merged commit 553e062 into kubernetes:master Jul 10, 2015
@rjnagal
Copy link
Contributor

rjnagal commented Jul 10, 2015

passed and merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants