Add nginx 1.11.3 | Resolve merge conflicts by moving dependency updates to separate commit #146
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Ricardo Katz <ricardo.katz@gmail.com>
…ernetes#11834) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#11837) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#11839) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…netes#11840) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ricardo Katz <ricardo.katz@gmail.com>
…1881) Signed-off-by: Seonghyeon Cho <seonghyeoncho96@gmail.com> Co-authored-by: Seonghyeon Cho <seonghyeoncho96@gmail.com>
…ernetes#11868) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: James Strong <strong.james.e@gmail.com> Co-authored-by: James Strong <strong.james.e@gmail.com>
…#11889) Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
…ernetes#11908) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1909) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…kubernetes#11913) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#11930) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ubernetes#11934) Co-authored-by: Ramiro Algozino <ramiro@sighup.io>
Co-authored-by: Nathan Baulch <nathan.baulch@gmail.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: longwuyuan <longwuyuan@gmail.com>
Co-authored-by: Damien Mehala <damien.mehala+github@gmail.com>
… all group (kubernetes#11957) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…2087) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Strong <strong.james.e@gmail.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* refactor rancher build process due to upstream changes * Remove drone
`go install ginkgo` followed by `which ginkgo` is newly added in the upstream repo. This is making the drone build fail for arm64 arch. The ginkgo library gets installed under $GOPATH/bin/linux_arm64 dir. This is unlike amd64 images which typically install go libraries under $GOPATH/bin. Since the previously mentioned dir is not in PATH, the command `which ginkgo` fails. I've added this location to PATH to fix the build failure. See upstream PRs linked below for more info: kubernetes#8566 kubernetes#8569
This was referenced Oct 14, 2024
kinarashah
approved these changes
Oct 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates
go generate, similar to thevendor updateprocess used inrancher/kubernetes. This will allow the automation to run go work sync and reduce merge conflicts in future.