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

kustomize: 4.5.4 -> 5.0.2 #224075

Merged
merged 1 commit into from
May 9, 2023
Merged

kustomize: 4.5.4 -> 5.0.2 #224075

merged 1 commit into from
May 9, 2023

Conversation

Djabx
Copy link
Contributor

@Djabx Djabx commented Mar 31, 2023

Description of changes

https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv5.0.1

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Djabx
Copy link
Contributor Author

Djabx commented Mar 31, 2023

@@ -15,13 +15,13 @@ buildGoModule rec {
owner = "kubernetes-sigs";
repo = pname;
rev = "kustomize/v${version}";
sha256 = "sha256-7Ode+ONgWJRNSbIpvIjhuT+oVvZgJfByFqS/iSUhcXw=";
sha256 = "sha256-0pykj3vgnxjaya9krq5l9wvxrfazgcxq0la7dg60wqnbyksl2my1";
Copy link
Contributor

Choose a reason for hiding this comment

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

While we're at it we could change them to the new convention

Suggested change
sha256 = "sha256-0pykj3vgnxjaya9krq5l9wvxrfazgcxq0la7dg60wqnbyksl2my1";
hash = "sha256-0pykj3vgnxjaya9krq5l9wvxrfazgcxq0la7dg60wqnbyksl2my1";

};

# avoid finding test and development commands
modRoot = "kustomize";

vendorSha256 = "sha256-beIbeY/+k2NgotGw5zQFkYuqMKlwctoxuToZfiFlCm4=";
vendorSha256 = "sha256-wVdB9fTLYg7Ma0dRgDt7X7ncN0+04DyT8kp2+/aQ018=";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
vendorSha256 = "sha256-wVdB9fTLYg7Ma0dRgDt7X7ncN0+04DyT8kp2+/aQ018=";
vendorHash = "sha256-wVdB9fTLYg7Ma0dRgDt7X7ncN0+04DyT8kp2+/aQ018=";

@Djabx Djabx marked this pull request as draft April 5, 2023 15:31
@Djabx
Copy link
Contributor Author

Djabx commented Apr 5, 2023

@zaninime I'm struggling to correct the package outputs. And I'm mearly a user of NixOs, not really a developper of nix (if that make any sense).

Do you have any help I can check to correct the issue here ?

@zaninime
Copy link
Contributor

zaninime commented Apr 6, 2023

The hashes you provided are not in a valid format. It's not enough to prepend sha256- to them to transform them in the new format. You can use a command if you wish to convert them: https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-hash-to-sri.html, otherwise they are generated by default in the format if nix-command is added to experimental-features if I'm not mistaken.

Also, this contributions kinda goes towards NixOS itself more than Nix, so you're on a good path to become a power user 😉

@Djabx
Copy link
Contributor Author

Djabx commented Apr 7, 2023

@zaninime I'm using NixOS... but I always feel like I'm doing blakc magic as an sorcerer's apprentice.

Here I just want to update a package version, but how to do it, there is "easy and dump" way to do it. You give insight on nix hash (witch I have btw) but how to use it ? on what ?...

So i write hash = "" in local... build watch the build crashed telling me the hash it want, replace, rebuild until next step.
I'm not really in power here...

And BTW, that how I removed the vendor line, because with it I had:

go: -mod may only be set to readonly when in workspace mode, but it is set to "vendor"
        Remove the -mod flag to use the default readonly value,
        or set GOWORK=off to disable workspace mode.
error: builder for '/nix/store/qk5qsnkzdpmydlq5vpdpy8l4i7yljiax-kustomize-5.0.1.drv' failed with exit code 1;
       last 10 log lines:
       > unpacking sources
       > unpacking source archive /nix/store/pajwdwj8yl6ckf23lpjpc3b7h1bnmr7h-source
       > source root is source
       > patching sources
       > configuring
       > building
       > Building subPackage .
       > go: -mod may only be set to readonly when in workspace mode, but it is set to "vendor"
       >         Remove the -mod flag to use the default readonly value,
       >        or set GOWORK=off to disable workspace mode.

Removed the vendor line and no more build error...but I feel guilty..

@ofborg ofborg bot added 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 7, 2023
@Djabx Djabx marked this pull request as ready for review April 16, 2023 16:32
@zaninime
Copy link
Contributor

For me without vendorHash it does not even start the build.

error: either `vendorHash` or `vendorSha256` is required

I'll try to have another look later why that error comes up.

@zaninime
Copy link
Contributor

@saschagrunert does it build for you?

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 2, 2023
@Djabx
Copy link
Contributor Author

Djabx commented May 5, 2023

@zaninime does it build for you ?

@zaninime
Copy link
Contributor

zaninime commented May 5, 2023

No it doesn't. Not in the current state. I was asking @saschagrunert as he approved the PR but I couldn't get it to build it myself.

@Djabx Djabx changed the title kustomize: 4.5.4 -> 5.0.1 kustomize: 4.5.4 -> 5.0.2 May 9, 2023
@Djabx
Copy link
Contributor Author

Djabx commented May 9, 2023

I've:

  • rebase
  • update kustomize to v5.0.2
  • update all sha.

I've no issue to build it.

@zaninime could you test it please ?

Copy link
Contributor

@zaninime zaninime left a comment

Choose a reason for hiding this comment

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

Now it builds and run on aarch64-darwin.

@Djabx
Copy link
Contributor Author

Djabx commented May 9, 2023

Could we merge it ?
What are the blockers ?

@zaninime
Copy link
Contributor

zaninime commented May 9, 2023

We need to wait for someone with merge permissions. Now it's approved so it can be merged. Pinging @NickCao as you recently merged a couple other PRs with Go packages.

@NickCao NickCao merged commit b9ac35d into NixOS:master May 9, 2023
@Djabx Djabx deleted the upgrade-kustomize branch May 10, 2023 07:19
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.

5 participants