Skip to content
This repository has been archived by the owner on Dec 5, 2023. It is now read-only.

fix(csi-external-resizer): make patch for v1.1.0+ compatibility #204

Merged
merged 1 commit into from
Feb 22, 2021

Conversation

zamnuts
Copy link
Contributor

@zamnuts zamnuts commented Feb 22, 2021

In the upstream build.make, line 74 was pushed to line 79 and the FULL_LDFLAGS abstraction was introduced.
See kubernetes-csi/external-resizer#122

Signed-off-by: Andrew Zammit [email protected]

Description

csi-external-resizer failing run #40 because patching with build.make.patch is rejecting:

#18 2.591 patching file release-tools/build.make
#18 2.592 Hunk #1 FAILED at 74.
#18 2.593 1 out of 1 hunk FAILED -- saving rejects to file release-tools/build.make.rej
#18 ERROR: executor failed running [/bin/sh -c git clone --depth 1 -b "v${VERSION}" https://github.com/kubernetes-csi/external-resizer.git .      && patch -u release-tools/build.make -i /build.make.patch && GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') make build]: exit code: 1

This is due to change in upstream build.make as of v1.1.0 introduced by kubernetes-csi/external-resizer#122

Partial issue #205.

Checklist

  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • All pre-commit hook validation passed successfully.
  • All commits contain a well-written commit description including a title, description, and a Fixes: #XXX line if the commit addresses a particular GitHub issue.
  • All workflow validation and compliance checks are passing.

Notes

Untested, so I'm not sure if this is the only thing required for v1.1.0+ compat. The diff was generated from a manual file change, i.e. the original patch was not modified by hand.

@zamnuts zamnuts changed the title fix(cs-external-resizer): make patch for v1.1.0+ compatibility fix(csi-external-resizer): make patch for v1.1.0+ compatibility Feb 22, 2021
In the upstream build.make, line 74 was pushed to line 79 and the FULL_LDFLAGS abstraction was introduced.
See kubernetes-csi/external-resizer#122

Signed-off-by: Andrew Zammit <[email protected]>
@xunholy
Copy link
Member

xunholy commented Feb 22, 2021

Thanks @zamnuts for contributing to this latest fix it's greatly appreciated!

@xunholy xunholy merged commit 43cb207 into raspbernetes:master Feb 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants