Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Support image formats with separate registry entry #2149

Merged
merged 4 commits into from Jul 2, 2019
Merged

Support image formats with separate registry entry #2149

merged 4 commits into from Jul 2, 2019

Conversation

hiddeco
Copy link
Member

@hiddeco hiddeco commented Jun 12, 2019 •
edited

To support the detection of image formats with a separate entry
for the registry domain, like the stable/redis chart has:

# Top level
registry: docker.io
image: foo/bar
tag: v1

# As a 'container' mapping
container:
  registry: docker.io
  image: foo/bar
  tag: v1

# Also valid
container:
  registry: docker.io
  image: foo/bar:v1

# In an image object
image:
  registry: docker.io
  repository: foo/bar
  tag: v1

Fixes #2144

squaremo
squaremo reviewed Jun 13, 2019
View reviewed changes
Copy link
Member

@squaremo squaremo left a comment

Choose a reason for hiding this comment

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

Code looks OK to me -- will need the update to kubeyaml, so it can be bumped here.

cluster/kubernetes/resource/fluxhelmrelease.go
@@ -119,6 +119,16 @@ func interpretAsContainer(m mapper) (image.Ref, ImageSetter, bool) {
// ```
imageRef, err := image.ParseRef(img)
if err == nil {
var reggy bool
Copy link
Member

Choose a reason for hiding this comment

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

😀

cluster/kubernetes/resource/fluxhelmrelease.go Outdated Show resolved Hide resolved
@hiddeco hiddeco mentioned this pull request Jun 14, 2019
Merged
@hiddeco hiddeco added the helm label Jun 14, 2019
@hiddeco hiddeco added this to the 1.14.0 milestone Jun 14, 2019
@hiddeco hiddeco mentioned this pull request Jun 19, 2019
Closed
@hiddeco hiddeco force-pushed the enhancement/additional-image-values-struct-hr branch 5 times, most recently from 541730c to a8127b5 Compare July 1, 2019 14:59
squaremo
squaremo approved these changes Jul 1, 2019
View reviewed changes
Copy link
Member

@squaremo squaremo left a comment

Choose a reason for hiding this comment

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

All present and correct, so far as I can tell.
There's no example of

image:
  registry: registry.com
  repository: org/app:tag

given in the docs, though it is supported; but I am fine with that, because it's a daft format :-)

@hiddeco
Support image formats with separate registry entry
90eacb3 
To support the detection of image formats with a separate entry
for the registry domain, like the stable/redis chart has:

image:
  registry: docker.io
  repository: foo/bar
  tag: v1

_or_

container:
  registry: docker.io
  image: foo/bar
  tag: v1

_also valid_

container:
  registry: docker.io
  image: foo/bar:v1
@hiddeco
Update kubeyaml to '0.6.1'
ee4f2f6 
Version 0.6.* of kubeyaml adds support for registry entries in
HelmReleases.
@hiddeco
Document new 'registry' image field support
aa76287
@hiddeco
Support more oddball image ref compositions
69c6fd4
@hiddeco hiddeco force-pushed the enhancement/additional-image-values-struct-hr branch from a8127b5 to 69c6fd4 Compare July 2, 2019 09:29
@hiddeco hiddeco merged commit e852837 into master Jul 2, 2019
@hiddeco hiddeco deleted the enhancement/additional-image-values-struct-hr branch July 2, 2019 10:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@squaremo squaremo squaremo approved these changes

Assignees
No one assigned
Labels
helm
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

Add another values structure
2 participants
@hiddeco @squaremo