Flux oci support 6: implement Update OCI repo and integration tests #5113
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
✅ Deploy Preview for kubeapps-dev canceled.Built without sensitive environment variables
|
antgamdia
approved these changes
Jul 25, 2022
| @@ -261,7 +261,14 @@ func (r *OCIRegistry) downloadChart(chart *repo.ChartVersion) (*bytes.Buffer, er | |||
|
|
|||
| // trim the oci scheme prefix if needed | |||
| getThis := strings.TrimPrefix(u.String(), fmt.Sprintf("%s://", registry.OCIScheme)) | |||
| return r.helmGetter.Get(getThis, clientOpts...) | |||
| log.Infof("about to call helmGetter.Get(%s)", getThis) | |||
There was a problem hiding this comment.
Not sure if this log should be a debug-level one ?
There was a problem hiding this comment.
all these pesky log messages will be gone by end of next week. They're here only while I was actively working on this feature. See my 2nd action item in #5007 (comment). I just haven't got to it yet
There was a problem hiding this comment.
Ah, great, no problem then. Thanks for the pointer!
| @@ -5,88 +5,283 @@ | |||
|
|
|||
| # this is used to build an image that can be used to stand-up a pod that serves static test-data in | |||
| # local kind cluster. Used by the integration tests. This script needs to be run once before the running | |||
| # the test(s) | |||
| # the test(s). This script requires GitHub CLI (gh) to be installed locally. On MacOS you can | |||
| # install it via 'brew install gh' | |||
There was a problem hiding this comment.
I'd also add the link to the releases page:
https://github.com/cli/cli/releases
There was a problem hiding this comment.
will do. Thank you for the review!
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.
The goal of this PR was to implement Update() for OCI helm repositories. I expected
flux source-controller to notify my code if the remote OCI repository contents changes,
like it does with a regular HTTP helm repository.
Like most of my PRs, this was test-driven. The plan was:
that was failing due to production code I had yet to write
(i.e. not implemented Update)
That was the plan. Unfortunately it did not work out due to reasons beyond my
control. For the integration test to be reproducible, I needed to have "my own"
OCI registry the contents of which I can modify (i.e add or delete chart versions)
and I don't have to worry about others making changes to it. In addition to serving this integration test having "my own" registry would be a big stop toward resolving an outstanding dependency to GitHub registry which is not in my ownership, so any chart version hard-coded in the test are subject to change
The PR reflects all my attempts to do so:
https://helm.sh/docs/topics/registries/ and have the integration test use that.
That effort failed due to Flux fails to login to HTTP OCI registry where helm CLI logs in fluxcd/source-controller#805
Add support for insecure registries in HelmRepositories of Type oci fluxcd/source-controller#807 and How can I push chart to an insecure OCI registry with helm v3 helm/helm#6324
GitHub. I set up access control so others can read, but not modify the repo contents.
The setup worked but the integration test was ultimately blocked due to flux not supporting
the use case I had in mind. Requested feature: flux OCI helm repositories notice when tags on remote registry change fluxcd/source-controller#839.
This discussion is ongoing. I did not want to discard my work so far, because all the scenarios
should be valid once the dependent issues are resolved
Update 7/25: added an integration test for what is arguably more important scenario that works fine:
i.e. flux server-side is auto-upgrading to latest chart when it is pushed to remote