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

images: Removes OS Version workaround for manifest list images #103156

Merged

Conversation

claudiubelu
Copy link
Contributor

@claudiubelu claudiubelu commented Jun 24, 2021

What type of PR is this?

/kind cleanup

/sig testing
/sig windows

What this PR does / why we need it:

For manifest lists containing Windows images, it is important to also have the os.version annotation set, as it is needed by the Windows nodes, so they can pull the appropriate image from the list.

Previously, the docker manifest CLI did not have the capability to set it, so, we had to set it outselves in the manifest list's image JSON file. This is no longer necessary since docker 20.10.0, which includes docker manifest annotate --os-version.

The docker installed in the image gcr.io/k8s-testimages/gcb-docker-gcloud:v20210622-762366a satisfies this version requirement.

Docker CLI PR: docker/cli#2578

Pause image logs: https://paste.ubuntu.com/p/dS9tKWqYsw/

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


For manifest lists containing Windows images, it is important to also have the "os.version"
annotation set, as it is needed by the Windows nodes, so they can pull the appropriate image
from the list.

Previously, the docker manifest CLI did not have the capability to set it, so, we had to set
it outselves in the manifest list's image JSON file. This is no longer necessary since
docker 20.10.0, which includes docker manifest annotate --os-version.

The docker installed in the image gcr.io/k8s-testimages/gcb-docker-gcloud:v20210622-762366a
satisfies this version requirement.
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. sig/windows Categorizes an issue or PR as relevant to SIG Windows. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 24, 2021
@k8s-ci-robot
Copy link
Contributor

@claudiubelu: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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-priority Indicates a PR lacks a `priority/foo` label and requires one. area/test labels Jun 24, 2021
@dims
Copy link
Member

dims commented Jun 24, 2021

@BenTheElder @cblecker Any concern over the new minimum docker version dependency?

@BenTheElder
Copy link
Member

I think this is reasonable, most developers are not building the test images anyhow, I'm not sure exactly where we should draw the line for the core images which lots of people are building all the time for development in addition to downstream distros, but for test images mostly built by CI this seems fine without getting too into the weeds.

I think there's a discussion to be had somewhere about what docker version is reasonable to require, along with the buildx issue

@claudiubelu
Copy link
Contributor Author

I think this is reasonable, most developers are not building the test images anyhow, I'm not sure exactly where we should draw the line for the core images which lots of people are building all the time for development in addition to downstream distros, but for test images mostly built by CI this seems fine without getting too into the weeds.

I think there's a discussion to be had somewhere about what docker version is reasonable to require, along with the buildx issue

FWIW, the image gcr.io/k8s-testimages/gcb-docker-gcloud:v20210622-762366a can also be used to build those images, that's how I did it, if you check the pause image logs. The gcb-docker-gcloud image can also be individually built if needed (I had to build that for myself some time ago). The image will contain the appropriate docker CLI version for this.

@immuzz immuzz added this to Backlog (v 1.23) in SIG-Windows Jul 1, 2021
@marosset
Copy link
Contributor

/milestone v1.23

@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Jul 29, 2021
@marosset marosset moved this from Backlog (v 1.23) to In Review (v1.23) in SIG-Windows Jul 29, 2021
Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: claudiubelu, spiffxp

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 Aug 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit 8b9f028 into kubernetes:master Aug 12, 2021
SIG-Windows automation moved this from In Review (v1.23) to Done (v1.23) Aug 12, 2021
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. area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/testing Categorizes an issue or PR as relevant to SIG Testing. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
SIG-Windows
  
Done (v1.23)
Development

Successfully merging this pull request may close these issues.

None yet

6 participants