Skip to content

USHIFT-367: apply rebase.sh to service-ca manifests#926

Merged
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
fzdarsky:rebase-manifests-service-ca
Sep 6, 2022
Merged

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

Conversation

@fzdarsky
Copy link
Copy Markdown
Contributor

@fzdarsky fzdarsky commented Sep 3, 2022

Updates the service-ca 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.

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

Partially addresses USHIFT-367

Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com>
@openshift-ci openshift-ci bot requested review from oglok and sallyom September 3, 2022 14:45
@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
name: signing-key
- mountPath: /var/run/configmaps/signing-cabundle
name: signing-cabundle
- name: service-ca-controller
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The whitespace change is the result from yq's reformatting.

Comment on lines +51 to +52
nodeSelector:
node-role.kubernetes.io/master: ""
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's unlikely that this was commented out in our code, you may want to figure out why this was here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We originally didn't have node roles set; this was fixed in #869 only recently; we probably missed removing the comment.

operator: "Exists"
effect: "NoExecute"
tolerationSeconds: 120
- key: node-role.kubernetes.io/master
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

again - these whitespaces don't appear in the orig

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The whitespace change is the result from yq's reformatting.

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

fzdarsky commented Sep 6, 2022

/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Sep 6, 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.

@dhellmann
Copy link
Copy Markdown
Contributor

Is "the latest rebase automation" the version in the repo now, or in another PR?

@dhellmann
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 6, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Sep 6, 2022

[APPROVALNOTIFIER] This PR is APPROVED

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

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 50bb3d2 into openshift:main Sep 6, 2022
@fzdarsky fzdarsky deleted the rebase-manifests-service-ca 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.

4 participants