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

Don't output empty sections in the manifests #8317

Merged

Conversation

justinsb
Copy link
Member

In our kube-dns manifest for 1.6 we often had an empty section,
normalization converted this to {} which causes kubectl apply to fail.

We can simply skip empty objects when outputing.

Tests are split into a separate commit for easier cherry-picking.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 11, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 11, 2020
In our kube-dns manifest for 1.6 we often had an empty section,
normalization converted this to `{}` which causes `kubectl apply` to
fail.

We can simply skip empty objects when outputing.
(The tests are split out for easier cherry-picking, should we choose to)
@justinsb justinsb force-pushed the clean_up_empty_manifest_sections branch from 97bf64b to cf5c53c Compare January 12, 2020 03:41
@hakman
Copy link
Member

hakman commented Jan 12, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2020
@k8s-ci-robot k8s-ci-robot merged commit e5902d5 into kubernetes:master Jan 12, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jan 12, 2020
k8s-ci-robot added a commit that referenced this pull request Jan 12, 2020
…-origin-release-1.17

Automated cherry pick of #8317: Don't output empty sections in the manifests
k8s-ci-robot added a commit that referenced this pull request Jan 18, 2020
…-origin-release-1.16

Automated cherry pick of #8317: Don't output empty sections in the manifests
k8s-ci-robot added a commit that referenced this pull request Jan 22, 2020
…-origin-release-1.15

Automated cherry pick of #8317: Don't output empty sections in the manifests
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants