Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.

CRDs: Fix typo: EnforcedNamepsaceLabel -> EnforcedNamespaceLabel - #790

Merged
rfratto merged 4 commits into
grafana-cold-storage:mainfrom
flokli:fix-typo-enforced-namespace-label
Aug 9, 2021
Merged

CRDs: Fix typo: EnforcedNamepsaceLabel -> EnforcedNamespaceLabel#790
rfratto merged 4 commits into
grafana-cold-storage:mainfrom
flokli:fix-typo-enforced-namespace-label

Conversation

@flokli

@flokli flokli commented Aug 3, 2021

Copy link
Copy Markdown
Contributor

PR Description

This fixes a typo, EnforcedNamepsaceLabel -> EnforcedNamespaceLabel, and regenerates the CRDs.

Notes to the Reviewer

Best reviewed on a commit-by-commit base, as the previous commit introduces a lot of diff due to wrapping.

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

flokli added 2 commits August 3, 2021 21:51
controller-gen@latest now uses kubebuilder v0.6.2, which does
linebreaks. Reformat to keep the diff smaller for future changes.
@flokli flokli changed the title Fix typo enforced namespace label CRDs: Fix typo: EnforcedNamepsaceLabel -> EnforcedNamespaceLabel Aug 3, 2021
@rfratto

rfratto commented Aug 9, 2021

Copy link
Copy Markdown
Contributor

Thanks for working on this!

Best reviewed on a commit-by-commit base, as the previous commit introduces a lot of diff due to wrapping.

If you run make crds it will use a Docker image to regenerate the CRDs with a fixed version of controller-gen that won't add all the extra line wrapping. I'd like to do that before merging, just so the next person that runs make crds doesn't reintroduce the longer lines.

@flokli

flokli commented Aug 9, 2021 via email

Copy link
Copy Markdown
Contributor Author

Right now, we only asked to install `@latest`.

controller-gen@v0.6.2 changed the word wrapping.
Developers installing this according to
`cmd/agent-operator/DEVELOPERS.md` will get CRDs formated differently
than what the container image will create, and the container image will
produce new outputs whenever the container layer gets recreated.

Explicitly provide a version, and add cross-references on both sides to
ensure this stays in sync.
@flokli

flokli commented Aug 9, 2021

Copy link
Copy Markdown
Contributor Author

I added a commit on top, explicitly pinning versions, and pinned controller-gen to its latest released version.

There's probably few reason to stick with the older version present in the container image right now - in the current state, it'd silently self-upgrade anyways.

Comment thread build-image/Dockerfile

@rfratto rfratto left a comment

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.

LGTM, thanks again!

@rfratto
rfratto merged commit 141f8b3 into grafana-cold-storage:main Aug 9, 2021
@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
mattdurham pushed a commit that referenced this pull request Nov 11, 2021
* operator: regenerate CRDs with controller-gen

controller-gen@latest now uses kubebuilder v0.6.2, which does
linebreaks. Reformat to keep the diff smaller for future changes.

* operator: crds: fix typo in EnforcedNamespaceLabel

* controller-gen: explicitly pin versions

Right now, we only asked to install `@latest`.

controller-gen@v0.6.2 changed the word wrapping.
Developers installing this according to
`cmd/agent-operator/DEVELOPERS.md` will get CRDs formated differently
than what the container image will create, and the container image will
produce new outputs whenever the container layer gets recreated.

Explicitly provide a version, and add cross-references on both sides to
ensure this stays in sync.

* Bump build-image version

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
@github-actions github-actions Bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Apr 11, 2024
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants