Skip to content

Support dockerconfigjson with OCI HelmRepositories#725

Merged
stefanprodan merged 10 commits intomainfrom
oci-dockerconfig
May 24, 2022
Merged

Support dockerconfigjson with OCI HelmRepositories#725
stefanprodan merged 10 commits intomainfrom
oci-dockerconfig

Conversation

@makkes
Copy link
Copy Markdown
Member

@makkes makkes commented May 20, 2022 •
edited
Loading

@makkes makkes marked this pull request as draft May 20, 2022 20:19
@makkes makkes mentioned this pull request May 20, 2022
Merged
6 tasks
@makkes makkes force-pushed the oci-dockerconfig branch from 20b9962 to 1296423 Compare May 21, 2022 11:38
@stefanprodan stefanprodan added enhancement New feature or request area/helm Helm related issues and pull requests labels May 22, 2022
@makkes makkes self-assigned this May 22, 2022
hiddeco
hiddeco reviewed May 23, 2022
View reviewed changes
Comment thread controllers/helmrepository_controller_oci.go Outdated
@makkes makkes marked this pull request as ready for review May 23, 2022 13:08
souleb
souleb reviewed May 23, 2022
View reviewed changes
Comment thread internal/helm/registry/client.go Outdated
@makkes makkes mentioned this pull request May 23, 2022
Merged
@pjbgf pjbgf added this to the GA milestone May 23, 2022
@souleb
Copy link
Copy Markdown
Member

souleb commented May 23, 2022

LGTM.

@makkes makkes added the area/oci OCI related issues and pull requests label May 23, 2022
stefanprodan
stefanprodan reviewed May 23, 2022
View reviewed changes
Comment thread internal/helm/registry/auth.go
Max Jonas Werner added 10 commits May 24, 2022 10:31
fix nil pointer dereference
1070d12 
When the Secret referenced in an OCI HelmRepository doesn't contain a
username and password, the controller doesn't panic, anymore.

Signed-off-by: Max Jonas Werner <mail@makk.es>
dockerconfigjson for OCI registry authentication
bb4d886 
`loginOptionFromSecret` now derives username/password from a docker
config stored in Secrets of type "kubernetes.io/dockerconfigjson".

Signed-off-by: Max Jonas Werner <mail@makk.es>
better variable names; improved logging
ce072c7 
When setup of one of the two controller reconciling HelmRepositories
fails, it's now possible to judge from the log which setup call failed
by regarding the "type" log field.

Signed-off-by: Max Jonas Werner <mail@makk.es>
fix code formatting
d5e3c37 
Signed-off-by: Max Jonas Werner <mail@makk.es>
make tidy
ace21c5 
Signed-off-by: Max Jonas Werner <mail@makk.es>
introduce internal/helm/registry package
c795da2 
This new package holds all Helm OCI registry-specific code now so we
have a single location to look for such code which makes it easier to
find yourself around.

Signed-off-by: Max Jonas Werner <mail@makk.es>
document generateBuildResult
a3be7e5 
Signed-off-by: Max Jonas Werner <mail@makk.es>
fix import order
09a2458 
Signed-off-by: Max Jonas Werner <mail@makk.es>
fix func doc
7cfd94e 
Signed-off-by: Max Jonas Werner <mail@makk.es>
include Secret name in returned errors
bb569be 
Signed-off-by: Max Jonas Werner <mail@makk.es>
@stefanprodan
Copy link
Copy Markdown
Member

stefanprodan commented May 24, 2022

@makkes can you please rebase with main

@makkes
Copy link
Copy Markdown
Member Author

makkes commented May 24, 2022

@makkes can you please rebase with main

I'm at it

@makkes makkes force-pushed the oci-dockerconfig branch from b6a033c to bb569be Compare May 24, 2022 08:51
@makkes
Copy link
Copy Markdown
Member Author

makkes commented May 24, 2022

rebased and force-pushed

@makkes makkes requested review from souleb and stefanprodan May 24, 2022 08:52
stefanprodan
stefanprodan approved these changes May 24, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @makkes 🏅

@stefanprodan stefanprodan merged commit 351b21b into main May 24, 2022
@stefanprodan stefanprodan deleted the oci-dockerconfig branch May 24, 2022 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stefanprodan stefanprodan stefanprodan approved these changes

@darkowlzz darkowlzz Awaiting requested review from darkowlzz

@hiddeco hiddeco Awaiting requested review from hiddeco

@souleb souleb Awaiting requested review from souleb

Assignees

@makkes makkes

Labels

area/helm Helm related issues and pull requests area/oci OCI related issues and pull requests enhancement New feature or request

Projects

None yet

Milestone

Helm GA

Development

Successfully merging this pull request may close these issues.

5 participants

@makkes @souleb @stefanprodan @hiddeco @pjbgf