Skip to content

client: Allow setting image labels on Pull()#1551

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
mlaventure:client-pull-set-labels
Sep 28, 2017
Merged

client: Allow setting image labels on Pull()#1551
dmcgowan merged 1 commit intocontainerd:masterfrom
mlaventure:client-pull-set-labels

Conversation

@mlaventure
Copy link
Copy Markdown
Contributor

Signed-off-by: Kenfe-Mickael Laventure [email protected]

@mlaventure mlaventure force-pushed the client-pull-set-labels branch 2 times, most recently from 4aa6580 to d4fd19e Compare September 23, 2017 17:47
@codecov-io
Copy link
Copy Markdown

codecov-io commented Sep 23, 2017

Codecov Report

Merging #1551 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1551   +/-   ##
=======================================
  Coverage   42.36%   42.36%           
=======================================
  Files          24       24           
  Lines        3368     3368           
=======================================
  Hits         1427     1427           
  Misses       1612     1612           
  Partials      329      329

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 20c6211...ccc574f. Read the comment docs.

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

LGTM, should we have the same stuff for Import() as well?

@mlaventure
Copy link
Copy Markdown
Contributor Author

@AkihiroSuda probably, yes. Will add it, thanks.

Comment thread client.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Couldn't this be part of the Opts?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I thought about it for Import.

Here, I found it weird to have it as part of a type called RemoteOpts, I guess I can rename it to PullOpts, lemme take a pass at it

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@crosbymichael done. Lemme know if you prefer it that way, then I'll squash the commits.

Comment thread client_opts.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could we just add Labels to RemoteContext? Many of the values on there are already pull specific, I don't think it makes sense to split the options just for the labels without splitting them all. We had a unified push/pull type to keep the options simpler and used the WithPull* nomenclature to differentiate. The fact that this necessitates WithPullRemoteOpt indicates to me that it should not exist.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sure

@mlaventure mlaventure force-pushed the client-pull-set-labels branch from 556324b to b8349d8 Compare September 25, 2017 17:22
@estesp
Copy link
Copy Markdown
Member

estesp commented Sep 25, 2017

several of your client.Pull changes from the first implementation now have a nil parameter that needs to be removed.

@mlaventure mlaventure force-pushed the client-pull-set-labels branch from b8349d8 to 1b6e178 Compare September 25, 2017 17:33
@mlaventure
Copy link
Copy Markdown
Contributor Author

@estesp yes, just noticed, it's should be fixed 😇

@mlaventure mlaventure force-pushed the client-pull-set-labels branch from 1b6e178 to 83cad51 Compare September 26, 2017 17:58
@mlaventure
Copy link
Copy Markdown
Contributor Author

rebased and squashed

Comment thread import.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this a stray m or does it mean something? 😇

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

dang, yes it is. Probably a failed emacs command 😅

Thanks for noticing

@mlaventure mlaventure force-pushed the client-pull-set-labels branch from 83cad51 to a0e1d21 Compare September 26, 2017 18:45
Comment thread client.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Clarify that this only applies to the image record and not transitive resources.

@stevvooe
Copy link
Copy Markdown
Member

LGTM

I'm assuming this is to avoid the transactional problems of labels after pull.

@mlaventure mlaventure force-pushed the client-pull-set-labels branch from a0e1d21 to df82159 Compare September 27, 2017 22:05
@dmcgowan
Copy link
Copy Markdown
Member

LGTM

@dmcgowan dmcgowan merged commit 70b353d into containerd:master Sep 28, 2017
mauriciovasquezbernal pushed a commit to kinvolk/containerd that referenced this pull request Nov 13, 2020
…9.0-rc.4

vendor: kubernetes 1.19.0 rc.4 and dependencies
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants