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

Escape systemd special chars in docker-env #3997

Merged
merged 1 commit into from
Apr 4, 2019

Conversation

11janci
Copy link
Contributor

@11janci 11janci commented Mar 27, 2019

The --docker-env param is interpolated into systemd unit file for docker engine. Any special characters that systemd provides for use in templates will be interpreted by systemd. Since minikube does not support these special characters in docker-env, we must escape them so that systemd does not interpret them as special chars.
See examples in the below issue.

Note: this PR deals only with the docker-env param which gets inserted into the Environment option of the systemd unit file. Other parts of the file are omitted.

Closes #3812

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 27, 2019
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 27, 2019
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@11janci 11janci changed the title Escape systemd special chars in docker-env [WIP] Escape systemd special chars in docker-env Mar 28, 2019
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 28, 2019
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 28, 2019
@11janci 11janci force-pushed the jjanik-docker-env-escape branch 4 times, most recently from bce4bf3 to e5a6587 Compare March 28, 2019 10:25
@11janci 11janci changed the title [WIP] Escape systemd special chars in docker-env Escape systemd special chars in docker-env Mar 28, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 28, 2019
@11janci
Copy link
Contributor Author

11janci commented Mar 28, 2019

/assign @afbjorklund

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 29, 2019
@afbjorklund
Copy link
Collaborator

/lgtm /approve

Looks good, thanks for the analysis and test cases!

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 30, 2019
@afbjorklund
Copy link
Collaborator

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 11janci, afbjorklund

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit e48fddd into kubernetes:master Apr 4, 2019
@11janci 11janci deleted the jjanik-docker-env-escape branch July 14, 2020 09:30
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. 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.

4 participants