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

Add indent template function and use it to fix KubeDNS.ExternalCoreFile rendering #7979

Merged
merged 2 commits into from Nov 23, 2019

Conversation

@rochacon
Copy link
Contributor

rochacon commented Nov 21, 2019

This PR adds a new indent template function and use it to fix KubeDNS.ExternalCoreFile rendering as reported on #7975.

indent function was copied from sprig.

Fixes #7975

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Nov 21, 2019

Hi @rochacon. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@rochacon

This comment has been minimized.

Copy link
Contributor Author

rochacon commented Nov 21, 2019

@mikesplain I was able to replace+update a cluster with the following patch using the new externalCoreFile feature. Not sure how we can add a test for this, if you have any idea please let me know so I can include in this PR.

@mikesplain

This comment has been minimized.

Copy link
Member

mikesplain commented Nov 21, 2019

Awesome thanks! I’ll give this a test later today!

@mikesplain mikesplain self-assigned this Nov 21, 2019
@mikesplain

This comment has been minimized.

Copy link
Member

mikesplain commented Nov 21, 2019

/ok-to-test

@mikesplain

This comment has been minimized.

Copy link
Member

mikesplain commented Nov 21, 2019

/retest

upup/pkg/fi/cloudup/template_functions.go Outdated Show resolved Hide resolved
@rochacon rochacon force-pushed the rochacon:fix-ext-core-file-indent branch 2 times, most recently from 9330549 to 84f3eee Nov 22, 2019
@mikesplain

This comment has been minimized.

Copy link
Member

mikesplain commented Nov 22, 2019

Awesome! We're making some good progress @rochacon!

I think you need to run make gazelle to update bazel (this assumes you already have bazel installed).

rochacon added 2 commits Nov 21, 2019
Map Sprig indent string template function into cloudup template
functions.
@rochacon rochacon force-pushed the rochacon:fix-ext-core-file-indent branch from 84f3eee to 9b0d0aa Nov 22, 2019
@rochacon

This comment has been minimized.

Copy link
Contributor Author

rochacon commented Nov 22, 2019

@mikesplain oops, didn't know that, thanks. It is done. Hope build get green now 🤞

@mikesplain

This comment has been minimized.

Copy link
Member

mikesplain commented Nov 23, 2019

Thanks so much @rochacon! This looks great and worked well for me. I'll approve this and cherry-pick it into 1.15 for the next release.

Thanks!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label Nov 23, 2019
@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Nov 23, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikesplain, rochacon

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 33089f9 into kubernetes:master Nov 23, 2019
17 of 18 checks passed
17 of 18 checks passed
tide Not mergeable. Retesting: pull-kops-e2e-kubernetes-aws
Details
Header rules No header rules processed
Details
Pages changed 1 new file uploaded
Details
Redirect rules No redirect rules processed
Details
Mixed content No mixed content detected
Details
cla/linuxfoundation rochacon authorized
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details
pull-kops-bazel-build Job succeeded.
Details
pull-kops-bazel-test Job succeeded.
Details
pull-kops-e2e-kubernetes-aws Job succeeded.
Details
pull-kops-verify-bazel Job succeeded.
Details
pull-kops-verify-boilerplate Job succeeded.
Details
pull-kops-verify-generated Job succeeded.
Details
pull-kops-verify-gofmt Job succeeded.
Details
pull-kops-verify-gomod Job succeeded.
Details
pull-kops-verify-govet Job succeeded.
Details
pull-kops-verify-packages Job succeeded.
Details
k8s-ci-robot added a commit that referenced this pull request Nov 23, 2019
…79-origin-release-1.15

Automated cherry pick of #7979: cloudup: Map sprig indent template function
@rochacon rochacon deleted the rochacon:fix-ext-core-file-indent branch Nov 24, 2019
@rochacon

This comment has been minimized.

Copy link
Contributor Author

rochacon commented Nov 24, 2019

Awesome, thanks @mikesplain!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.