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

Adding support for docker-storage-setup on overlay #6524

Merged
merged 1 commit into from
Dec 20, 2017

Conversation

kwoodson
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 19, 2017
group: root
mode: 0664
when:
- container_runtime_run_docker_storage_setup | default(False)
Copy link
Contributor

Choose a reason for hiding this comment

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

get rid of the bool, let's check the variable that sets to storage type.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This doesn't really give us a mechanism to turn on or off the storage setup, especially if we default the variable to something.

container_runtime_docker_storage_setup_type=overlay

Should we not specify the variable and then it will not be defined? Or default it to ''?

mode: 0664
when:
- container_runtime_run_docker_storage_setup | default(False)
- container_runtime_docker_storage_driver == 'overlay2'
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should change this from _driver to _type. This will allow us greater flexibility to control more types of storage scenarios. For instance, if a storage driver can be used in a variety of ways (overlay2 on top of gluster) or what have you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good

CONTAINER_ROOT_LV_NAME="docker-root-lv"
CONTAINER_ROOT_LV_SIZE="100%FREE"
CONTAINER_ROOT_LV_MOUNT_PATH="{{ docker_storage_path }}"
EXTRA_STORAGE_OPTIONS="--storage-opt overlay2.override_kernel_check=true --storage-opt overlay2.size={{ docker_storage_size }} --graph={{ docker_storage_path}} "
Copy link
Contributor

Choose a reason for hiding this comment

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

We should try to make these all variables instead of hard-coding.
extra_storage_options should take a list of options.

eso:
  - '--storage-opt overlay2.override_kernel_check=true'
  - "--graph={{ docker_storage_path}}"

This will be easier for the user to override, and we don't have to implement any fancy logic other than joining the list items.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do.

@ashcrow
Copy link
Member

ashcrow commented Dec 19, 2017

Functionality looks fine. I'll defer to @michaelgugino on naming/etc...

However, some of this looks to be similar to #5216

@kwoodson kwoodson force-pushed the docker_storage_setup_overlay branch 2 times, most recently from 9221cf1 to 69c0417 Compare December 19, 2017 17:02
@kwoodson
Copy link
Contributor Author

/retest

@kwoodson
Copy link
Contributor Author

[FATAL] Required `go` binary was not found in $PATH.

These seem highly unrelated.

@sdodson
Copy link
Member

sdodson commented Dec 19, 2017

/retest

Copy link
Contributor

@michaelgugino michaelgugino left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2017
@kwoodson
Copy link
Contributor Author

@sdodson will require a cherry pick once merged.

@sdodson
Copy link
Member

sdodson commented Dec 19, 2017

/lgtm

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 20, 2017

@kwoodson: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/logging 5c6af56 link /test logging
ci/openshift-jenkins/install 5c6af56 link /test install

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.

@sdodson
Copy link
Member

sdodson commented Dec 20, 2017

flakes

@kwoodson
Copy link
Contributor Author

/cherrypick release-3.8

@openshift-cherrypick-robot

@kwoodson: failed to push cherry-picked changes in Github: exit status 1

In response to this:

/cherrypick release-3.8

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.

@kwoodson kwoodson deleted the docker_storage_setup_overlay branch March 5, 2018 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. 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.

7 participants