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

helm/v1beta1: Rename files to use the default run-level for updates #1544

Merged

Conversation

wking
Copy link
Member

@wking wking commented Aug 3, 2023

I'd meant to do these in 9e3e820 (#1541), but flubbed my regexp. Fixed now, with:

$ rename 's/0000_[0-9][0-9][_-]/00_/' helm/*/*.yaml
$ sed -i 's/0000_[0-9][0-9][_-]/00_/' helm/*/*.testsuite.yaml

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 3, 2023

Hello @wking! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 3, 2023
@openshift-ci openshift-ci bot requested review from bparees and eparis August 3, 2023 18:31
I'd meant to do these in 9e3e820 (Console CRDs: Rename files to use
the default run-level for updates, 2023-08-02, openshift#1541), but flubbed my
regexp.  Fixed now, with:

  $ rename 's/0000_[0-9][0-9][_-]/00_/' helm/*/*.yaml
  $ sed -i 's/0000_[0-9][0-9][_-]/00_/' helm/*/*.testsuite.yaml
@wking wking force-pushed the fix-helm-CRD-filenames-too branch from 0197ef9 to 9aa8b74 Compare August 3, 2023 18:54
@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 3, 2023
wking added a commit to wking/openshift-api that referenced this pull request Aug 3, 2023
Like 9e3e820 (Console CRDs: Rename files to use the default
run-level for updates, 2023-08-02, openshift#1541) and 9aa8b74
(helm/v1beta1: Rename files to use the default run-level for updates,
2023-08-03, openshift#1544), but now for the CustomResourceDefinition deployed
by the samples operator [1].  As in the previous changes, the outgoing
filename failed to match the
0000_<runlevel>_<dash-separated-component>_<manifest_filename>
template [2], and there is no reason that the CRD needs bumping at
run-level 10 during updates.  I'm using a 00_ prefix to sort before
the other samples manifests [3], so there's no relative change in
update order between those resources; this commit just shifts update
CRD reconciliation vs. other, non-samples resources managed by the
cluster-version operator.

Generated with:

  $ mv samples/v1/0000_10_samplesconfig.crd.yaml samples/v1/00_samplesconfig.crd.yaml
  $ sed -i 's/0000_10_/00_/' samples/v1/stable.config.testsuite.yaml
  $ git add -A samples

[1]: https://github.com/openshift/cluster-samples-operator/blob/684b8c7f1cf6aaf9fb4f2bcffe91cde7eae07347/Dockerfile#L10
[2]: https://github.com/openshift/enhancements/blob/cafeb5c3cba7f8c9e261b2aabffa92e34dd76be6/dev-guide/cluster-version-operator/dev/operators.md#what-is-the-order-that-resources-get-createdupdated-in
[3]: https://github.com/openshift/cluster-samples-operator/tree/684b8c7f1cf6aaf9fb4f2bcffe91cde7eae07347/manifests
wking added a commit to wking/openshift-api that referenced this pull request Aug 3, 2023
Like 9e3e820 (Console CRDs: Rename files to use the default
run-level for updates, 2023-08-02, openshift#1541) and 9aa8b74
(helm/v1beta1: Rename files to use the default run-level for updates,
2023-08-03, openshift#1544), but now for the CustomResourceDefinition deployed
by the samples operator [1].  As in the previous changes, the outgoing
filename failed to match the
0000_<runlevel>_<dash-separated-component>_<manifest_filename>
template [2], and there is no reason that the CRD needs bumping at
run-level 10 during updates.  I'm using a 00_ prefix to sort before
the other samples manifests [3], so there's no relative change in
update order between those resources; this commit just shifts update
CRD reconciliation vs. other, non-samples resources managed by the
cluster-version operator.

Checking history, there doesn't seem to be any motivation for the
original 0000_10_ prefix for this manifest:

  $ git --no-pager log -1 3139ff9
  commit 3139ff9 (origin/pr/513)
  Author: gabemontero <gmontero@redhat.com>
  Date:   Mon Nov 11 14:02:54 2019 -0500

      generate CRD yaml

Generated with:

  $ mv samples/v1/0000_10_samplesconfig.crd.yaml samples/v1/00_samplesconfig.crd.yaml
  $ sed -i 's/0000_10_/00_/' samples/v1/stable.config.testsuite.yaml
  $ git add -A samples

[1]: https://github.com/openshift/cluster-samples-operator/blob/684b8c7f1cf6aaf9fb4f2bcffe91cde7eae07347/Dockerfile#L10
[2]: https://github.com/openshift/enhancements/blob/cafeb5c3cba7f8c9e261b2aabffa92e34dd76be6/dev-guide/cluster-version-operator/dev/operators.md#what-is-the-order-that-resources-get-createdupdated-in
[3]: https://github.com/openshift/cluster-samples-operator/tree/684b8c7f1cf6aaf9fb4f2bcffe91cde7eae07347/manifests
@bparees
Copy link
Contributor

bparees commented Aug 3, 2023

/approve

@jhadvig for the lgtm

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

bparees commented Aug 31, 2023

@jhadvig bump

@bparees
Copy link
Contributor

bparees commented Sep 27, 2023

/override ci/prow/verify-crd-schema

file has not actually changed(other than the rename) so ignore the complaint about the boolean field.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 27, 2023

@bparees: Overrode contexts on behalf of bparees: ci/prow/verify-crd-schema

In response to this:

/override ci/prow/verify-crd-schema

file has not actually changed(other than the rename) so ignore the complaint about the boolean field.

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.

Copy link
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

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

/lgtm

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

openshift-ci bot commented Sep 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, jhadvig, wking

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 27, 2023

@wking: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-robot openshift-merge-robot merged commit ea6b749 into openshift:master Sep 27, 2023
@wking wking deleted the fix-helm-CRD-filenames-too branch September 27, 2023 17:33
wking added a commit to wking/console-operator that referenced this pull request Sep 27, 2023
Pull in openshift/api@9e3e820a70e4b8 (Console CRDs: Rename files to
use the default run-level for updates, 2023-08-02, openshift/api#1541)
and openshift/api@9aa8b74279cf32 (helm/v1beta1: Rename files to use
the default run-level for updates, 2023-08-03, openshift/api#1544).

Generated with:

  $ rm -rf vendor/github.com/openshift/api  # possibly unnecessary?
  $ go get -u github.com/openshift/api
  $ go mod tidy
  $ go mod vendor
  $ git add -A go.* vendor

using:

  $ go version
  go version go1.19.5 linux/amd64
wking added a commit to wking/console-operator that referenced this pull request Oct 3, 2023
Pull in openshift/api@9e3e820a70e4b8 (Console CRDs: Rename files to
use the default run-level for updates, 2023-08-02, openshift/api#1541)
and openshift/api@9aa8b74279cf32 (helm/v1beta1: Rename files to use
the default run-level for updates, 2023-08-03, openshift/api#1544).

Generated with:

  $ rm -rf vendor/github.com/openshift/api  # possibly unnecessary?
  $ go get -u github.com/openshift/api
  $ go mod tidy
  $ go mod vendor
  $ git add -A go.* vendor

using:

  $ go version
  go version go1.19.5 linux/amd64
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants