Skip to content

USHIFT-367: apply rebase.sh to openshift-dns manifests#925

Merged
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
fzdarsky:rebase-manifests-dns
Sep 8, 2022
Merged

USHIFT-367: apply rebase.sh to openshift-dns manifests#925
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
fzdarsky:rebase-manifests-dns

Conversation

@fzdarsky
Copy link
Copy Markdown
Contributor

@fzdarsky fzdarsky commented Sep 3, 2022

Updates the openshift-dns manifests using the latest rebase.sh automation.

Most changes are completely neutral and result from the adoption of yq, e.g. reordering of fields resulting from yq appending added fields at the end rather than ordering them in alphabetically or different indentation. A few changes drop comments or labels that are no longer applied by the respective operator. Most notable change is the adoption of the PSA labels for the namespace.

Signed-off-by: Frank A. Zdarsky fzdarsky@redhat.com

Partially addresses USHIFT-367

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 3, 2022
Copy link
Copy Markdown
Contributor

@stlaz stlaz left a comment

Choose a reason for hiding this comment

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

/hold
the script appears to be generating suspicious whitespace changes

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 5, 2022
@fzdarsky
Copy link
Copy Markdown
Contributor Author

fzdarsky commented Sep 5, 2022

/hold the script appears to be generating suspicious whitespace changes

@stlaz You're right that the indentation changes. This is an unfortunate side-effect of the rebase script editing manifests using yq, which lints YAML with a slightly different indentation for lists (see PR description), e.g.

containers:
- name: dns
  ...
- name: kube-rbac-proxy
  ...

becomes

containers:
  - name: dns
    ...
  - name: kube-rbac-proxy
    ...

@fzdarsky fzdarsky changed the title apply rebase.sh to openshift-dns manifests [USHIFT-367] apply rebase.sh to openshift-dns manifests Sep 5, 2022
@fzdarsky fzdarsky changed the title [USHIFT-367] apply rebase.sh to openshift-dns manifests USHIFT-367: apply rebase.sh to openshift-dns manifests Sep 5, 2022
@stlaz
Copy link
Copy Markdown
Contributor

stlaz commented Sep 6, 2022

/hold cancel

I see, this is explained here: https://mikefarah.gitbook.io/yq/usage/output-format

I guess this was caused either by yq change or yq integration into the script. All good from me, then.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 6, 2022
@fzdarsky
Copy link
Copy Markdown
Contributor Author

fzdarsky commented Sep 6, 2022

/retest

@dhellmann
Copy link
Copy Markdown
Contributor

Updates the openshift-dns manifests using the latest rebase.sh automation.

Most changes are completely neutral and result from the adoption of yq, e.g. reordering of fields resulting from yq appending added fields at the end rather than ordering them in alphabetically or different indentation. A few changes drop comments or labels that are no longer applied by the respective operator. Most notable change is the adoption of the PSA labels for the namespace.

Are the script changes to make those edits in another PR? Or is the script already updating these manifests but the versions in this PR come from a different release image?

@dhellmann
Copy link
Copy Markdown
Contributor

/label needs-rebase

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Sep 6, 2022

@dhellmann: The label(s) /label needs-rebase cannot be applied. These labels are supported: platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, downstream-change-needed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved

Details

In response to this:

/label needs-rebase

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.

@fzdarsky fzdarsky force-pushed the rebase-manifests-dns branch 2 times, most recently from f20496b to 0633213 Compare September 6, 2022 23:08
@fzdarsky
Copy link
Copy Markdown
Contributor Author

fzdarsky commented Sep 7, 2022

/retest

@pacevedom
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2022
@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD f4b540c and 2 for PR HEAD 063321357175fb6f0666e8c9f3a947f31ef0908e in total

@fzdarsky fzdarsky force-pushed the rebase-manifests-dns branch from 0633213 to ebae634 Compare September 8, 2022 12:02
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2022
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 8, 2022
Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com>
@fzdarsky fzdarsky force-pushed the rebase-manifests-dns branch from ebae634 to 6b6b697 Compare September 8, 2022 14:03
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 8, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Sep 8, 2022

@fzdarsky: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@pacevedom
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Sep 8, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fzdarsky, pacevedom

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

The pull request process is described here

Details 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

@openshift-merge-robot openshift-merge-robot merged commit 68f3701 into openshift:main Sep 8, 2022
@fzdarsky fzdarsky deleted the rebase-manifests-dns branch October 5, 2022 10:49
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants