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

Yamlgen: Upgrade to serde-yaml 0.9 #334

Merged
merged 1 commit into from Nov 21, 2022

Conversation

jpmcb
Copy link
Contributor

@jpmcb jpmcb commented Nov 4, 2022

Issue number:

Closes #333
Closes #277

Description of changes:

- Captures formatting changes introduced in new versions of serde.
- Adds `---` delimiters explicitly when generating yaml manifest since
  serde-yaml no longer includes those.
- Upgrades schemars to 0.8.11 which no longer breaks enum serialization
  when combined with kube-rs 0.76
- Removes outdated kube-rs ignore in deny.toml
- Adds a dump of the git diff in the "Evaluate git clean" GitHub action
  in order to see what's changed directly from the action failure.

Signed-off-by: John McBride <jpmmcb@amazon.com>

Testing done:

Integration tests running ... please hold!

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@jpmcb jpmcb force-pushed the serde-upgrade branch 2 times, most recently from 5bd98df to 319cb7a Compare November 4, 2022 17:27
@jpmcb
Copy link
Contributor Author

jpmcb commented Nov 4, 2022

Force pushed to add

  • Upgrade to schemars 0.8.11
  • Remove an unnecessary line in the deny.toml for an outdated version of kube-rs

@jpmcb
Copy link
Contributor Author

jpmcb commented Nov 4, 2022

Integration tests passed!

❯ k get brs -A
NAMESPACE                 NAME                                                STATE   VERSION   TARGET STATE   TARGET VERSION   CRASH COUNT
brupop-bottlerocket-aws   brs-ip-192-168-138-240.us-west-2.compute.internal   Idle    1.10.1    Idle                            0
brupop-bottlerocket-aws   brs-ip-192-168-145-184.us-west-2.compute.internal   Idle    1.10.1    Idle                            0
brupop-bottlerocket-aws   brs-ip-192-168-159-48.us-west-2.compute.internal    Idle    1.10.1    Idle                            0

Marking ready for review

@jpmcb jpmcb marked this pull request as ready for review November 4, 2022 18:18
@jpmcb jpmcb requested a review from webern November 7, 2022 22:28
Copy link
Member

@webern webern left a comment

Choose a reason for hiding this comment

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

while yamlgen still exists...

@stmcginnis
Copy link
Contributor

Merge conflicts now...

- Captures formatting changes introduced in new versions of serde.
- Adds `---` delimiters explicitly when generating yaml manifest since
  serde-yaml no longer includes those.
- Upgrades schemars to 0.8.11 which no longer breaks enum serialization
  when combined with kube-rs 0.76
- Removes outdated kube-rs ignore in deny.toml
- Adds a dump of the git diff in the "Evaluate git clean" GitHub action
  in order to see what's changed directly from the action failure.

Signed-off-by: John McBride <jpmmcb@amazon.com>
@jpmcb
Copy link
Contributor Author

jpmcb commented Nov 18, 2022

Force pushed to address merge-conflicts

@jpmcb jpmcb requested a review from gthao313 November 21, 2022 15:56
@gthao313 gthao313 merged commit 2c20604 into bottlerocket-os:develop Nov 21, 2022
@jpmcb jpmcb deleted the serde-upgrade branch November 21, 2022 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

schemars v0.8.11 broke the brupop CRD
4 participants