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

Default target storage in etcd #41065

Merged

Conversation

wojtek-t
Copy link
Member

@wojtek-t wojtek-t commented Feb 7, 2017

To make etcd v2->v3 upgrade work correctly, we need to correctly set the "TARGET_STORAGE" env var. Since in head we are defaulting to etcd v3, this PR is defaulting also that env var to etcd3, so that by default upgrade works fine.

@fgrzadkowski @gmarek

@wojtek-t wojtek-t added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 7, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 7, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 7, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: wojtek-t

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2017
@fgrzadkowski
Copy link
Contributor

Please add more context in the PR description. It's unclear to people without context what this PR is supposed to fix.

@wojtek-t
Copy link
Member Author

wojtek-t commented Feb 7, 2017

@fgrzadkowski - added description. PTAL

sed -i -e "s@{{ *storage_backend *}}@${STORAGE_BACKEND:-}@g" "${temp_file}"
if [[ "${STORAGE_BACKEND:-}" == "etcd3" ]]; then
if [[ "${STORAGE_BACKEND:-etcd3}" == "etcd3" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't understand this. Shouldn't we just default STORAGE_BACKEND to etcdv3 in one place, rather than default it in all the places where you'd use it?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, I understand this one.

However it means that the default you have here has to be inline with whatever you set as the default in manifest file. Is there anyway we can just read the default value from manifest file using sed?

Copy link
Member Author

Choose a reason for hiding this comment

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

We can do it using "grep + sed". Will fix. (I agree it makes sense, especially since we are touching the same manifest file here).

@wojtek-t wojtek-t force-pushed the default_target_storage_in_etcd branch from 2bd2cf7 to a2a861b Compare February 8, 2017 09:40
@k8s-ci-robot
Copy link
Contributor

@wojtek-t: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins verification 2bd2cf7d168d583e777b4fc5e75c24f632d4847d link @k8s-bot verify test this
Jenkins Cross Build a2a861b link @k8s-bot cross build this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@wojtek-t
Copy link
Member Author

wojtek-t commented Feb 8, 2017

@k8s-bot cross build test this, issue: #IGNORE (timeout)

@wojtek-t
Copy link
Member Author

wojtek-t commented Feb 8, 2017

@fgrzadkowski - PTAL

@fgrzadkowski
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 8, 2017
@mml
Copy link
Contributor

mml commented Feb 8, 2017

I thought I'd clicked "Send" on my review yesterday, but I guess I did not. My only comment was the same as @fgrzadkowski's.

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 40873, 40948, 39580, 41065, 40815)

@k8s-github-robot k8s-github-robot merged commit e280e27 into kubernetes:master Feb 8, 2017
@wojtek-t wojtek-t deleted the default_target_storage_in_etcd branch February 10, 2017 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants