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

Update flux and all controllers to the GA RC1 #2143

Merged
merged 7 commits into from
May 15, 2023

Conversation

jaxesn
Copy link
Member

@jaxesn jaxesn commented May 3, 2023

Issue #, if available:

Description of changes:

This updates the flux components to the new 2.0.0-rc.1 which is their GA RC. Best to probably review this by commit, each component is updated in its own commit.

Most updates are pretty straightforward, just the standard go version, git_tag, attribution and checksums updates.

source-controller was a bigger change, but luckily it was really just removing old bits now that the source-controller does not rely on libgit. This allowed the removal of some of the cgo handling which I also did in this PR in the last commit. Upstream is still building source-controller with cgo due a perf concern in one of the dependencies. From what I can tell this was resolved in their 0.3 release. Flux has a custom fork of go-git which uses this dependency. They have not yet pulled in this 0.3 version, but I suspect will since the maintainer of sha1cd is closely involved with flux as well. Either way, the 0.2.3 version of this lib does support building with cgo=0 which I think is good enough for our use case. Removing the cgo building simplifies our process here a lot! I left the custom buildspec so that we dont have to change codebuild yet and can support building from main and the release branch. @abhay-krishna let me know thoughts here?

The last commit also includes some improvements to run--in-docker, mainly for running on linux and standardizes our run-cgo-docker code to use the same run-in-docker script. At this point, we should be able to build everything via the run-in-docker targets on both Mac and Linux (al2) except for actually pushing images to ecr registries (I just havent worked out to handle the auth tokens and don't think this is a critical workflow).

Note: eks-anywhere-cli-tools-tooling-presubmit is going to fail due to it needing the new build of flux. I will override this before merging.

Follow up: After we merge and cut a release, we can remove the libgit/libssh from the minimal-base-git. We will keep the base image since kustomize-controller bases off of it for git/gnugp.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added do-not-merge/hold size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 3, 2023
@jaxesn jaxesn force-pushed the jgw/update-flux-components branch 7 times, most recently from 645916c to feafd38 Compare May 5, 2023 19:18
@abhay-krishna
Copy link
Member

/lgtm
/override eks-anywhere-cli-tools-tooling-presubmit

@eks-distro-bot
Copy link
Collaborator

@abhay-krishna: Overrode contexts on behalf of abhay-krishna: eks-anywhere-cli-tools-tooling-presubmit

In response to this:

/lgtm
/override eks-anywhere-cli-tools-tooling-presubmit

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@abhay-krishna
Copy link
Member

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhay-krishna

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

jaxesn added 7 commits May 15, 2023 11:14
- Removes old cgo handling specific to source-controller and libgit
which was removed in the latest source-controller version
- Improve local docker workflow for linux and reuse run-in-docker
for cgo building, only used locally
- Add option to upload output to prow artifacts during presubmits
to track down issues easier
@jaxesn jaxesn force-pushed the jgw/update-flux-components branch from feafd38 to ed97952 Compare May 15, 2023 16:43
@abhay-krishna
Copy link
Member

/lgtm
/override eks-anywhere-cli-tools-tooling-presubmit

@eks-distro-bot
Copy link
Collaborator

@abhay-krishna: Overrode contexts on behalf of abhay-krishna: eks-anywhere-cli-tools-tooling-presubmit

In response to this:

/lgtm
/override eks-anywhere-cli-tools-tooling-presubmit

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@abhay-krishna
Copy link
Member

/unhold

@eks-distro-bot eks-distro-bot merged commit 56b8eb8 into aws:main May 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants