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

manifest: reduce CRD size by removing some descriptions (backport #13793) #13797

Merged
merged 2 commits into from
Mar 7, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 20, 2024

This is an automatic backport of pull request #13793 done by Mergify.
Cherry-pick of bd7477e has failed:

On branch mergify/bp/release-1.13/pr-13793
Your branch is up to date with 'origin/release-1.13'.

You are currently cherry-picking commit bd7477ec6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Documentation/CRDs/specification.md
	modified:   build/crds/build-crds.sh
	modified:   pkg/apis/ceph.rook.io/v1/types.go
	modified:   pkg/apis/ceph.rook.io/v1/volume.go
	modified:   pkg/apis/ceph.rook.io/v1/zz_generated.deepcopy.go
	modified:   pkg/daemon/ceph/osd/remove_test.go
	modified:   pkg/operator/ceph/cluster/mon/health_test.go
	modified:   pkg/operator/ceph/cluster/mon/mon.go
	modified:   pkg/operator/ceph/cluster/mon/mon_test.go
	modified:   pkg/operator/ceph/cluster/mon/spec_test.go
	modified:   pkg/operator/ceph/cluster/osd/create_test.go
	modified:   pkg/operator/ceph/cluster/osd/deviceSet.go
	modified:   pkg/operator/ceph/cluster/osd/deviceset_test.go
	modified:   pkg/operator/ceph/cluster/osd/integration_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deploy/charts/rook-ceph/templates/resources.yaml
	both modified:   deploy/examples/crds.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Reduce CRD size by removing some descriptions for things that
(a) are long, (b) are repeated, and (c) are commong kubernetes types.

Remove the `Status` field from VolumeClaimTemplates (a.k.a. PVCs) in
types.go to remove all unnecessary status-related fields.

Use `yq` to go through generated `crds.yaml` to strip out descriptions
for well-known k8s types that are long and repeated where we can't
remove them from types.go. This is mostly placement descriptions and
volumeSource descriptions.

The overall `crds.yaml` file is reduced to less than 60% of its original
size.

Signed-off-by: Blaine Gardner <blaine.gardner@ibm.com>
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
Co-authored-by: Blaine Gardner <blaine.gardner@ibm.com>
(cherry picked from commit bd7477e)

# Conflicts:
#	deploy/charts/rook-ceph/templates/resources.yaml
#	deploy/examples/crds.yaml
@mergify mergify bot added the conflicts label Feb 20, 2024
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 7a7b983)
@BlaineEXE BlaineEXE force-pushed the mergify/bp/release-1.13/pr-13793 branch from 4080966 to 52eea1a Compare March 7, 2024 19:34
@mergify mergify bot merged commit a7fc1f3 into release-1.13 Mar 7, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/release-1.13/pr-13793 branch March 7, 2024 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants