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

fix: asset task copy docker image #10767

Merged
merged 1 commit into from
Feb 11, 2021

Conversation

johanneswuerbach
Copy link
Contributor

@johanneswuerbach johanneswuerbach commented Feb 8, 2021

Otherwise kops update cluster --name XYZ --yes --phase assets fails with:

panic: assignment to entry in nil map

goroutine 216 [running]:
k8s.io/kops/vendor/github.com/docker/docker/api/types/filters.Args.Add(...)
	vendor/github.com/docker/docker/api/types/filters/parse.go:133
k8s.io/kops/upup/pkg/fi/assettasks.(*dockerAPI).findImage(0x4000186128, 0x362192f, 0x14, 0x0, 0x0, 0x22)
	upup/pkg/fi/assettasks/docker_api.go:65 +0x2fc
k8s.io/kops/upup/pkg/fi/assettasks.(*CopyDockerImage).Render(0x4001204fc0, 0x4001292d20, 0x0, 0x4001204fc0, 0x4000a1a140, 0x0, 0x0)
	upup/pkg/fi/assettasks/copydockerimage.go:136 +0x1f4

Ideally this would be test covered, but it seems it wasn't before so I'm not sure how to test this.

This seems to have been introduced in #10193, which was back-ported to kops 1.19 were we ran into this.

@k8s-ci-robot
Copy link
Contributor

Hi @johanneswuerbach. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 8, 2021
@johanneswuerbach
Copy link
Contributor Author

/assign @rifelpet

@olemarkus
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 8, 2021
@rifelpet
Copy link
Member

Thanks for the fix, I'll see about getting this covered under e2e testing

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 11, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johanneswuerbach, rifelpet

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 11, 2021
@k8s-ci-robot k8s-ci-robot merged commit c00e561 into kubernetes:master Feb 11, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Feb 11, 2021
@rifelpet rifelpet modified the milestones: v1.20, v1.21 Feb 11, 2021
k8s-ci-robot added a commit that referenced this pull request Feb 11, 2021
…67-origin-release-1.19

Automated cherry pick of #10767: fix: asset task copy docker image
k8s-ci-robot added a commit that referenced this pull request Feb 11, 2021
…67-origin-release-1.20

Automated cherry pick of #10767: fix: asset task copy docker image
@johanneswuerbach johanneswuerbach deleted the fix-cp-docker-img branch February 11, 2021 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants