Skip to content

Remove workaround to add os.version to the manifest for Windows images #986

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

Merged

Conversation

mauriciopoppe
Copy link
Member

@mauriciopoppe mauriciopoppe commented May 12, 2022

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind bug

What this PR does / why we need it:

It looks like a recent version of docker in CI is adding os.version so the workaround to add it on our own is no longer needed, this was causing a double os.version to be added to the manifest as seen here:

I0512 18:36:46.423] {"Ref":"gcr.io/gce-cvm-upg-lat-1-3-ctl-skew/gcp-persistent-disk-csi-driver:d5486a25-280b-4d7e-a899-98a3f37b0818_ltsc2019","Descriptor":{"mediaType":"application/vnd.docker.distribution.manifest.v2+json","digest":"sha256:cb0b111aba51dfdfcf8fcdec778c20c3bf153c9180bcbaf597c7a5f58c886794","size":956,"platform":{"architecture":"amd64","os":"windows","os.version":"10.0.17763.2928",,"os.version":"10.0.17763.2928"}}, ...}

I'm commenting the part that performs the text replacement, if this works then eventually this file and its usages should be removed.

Which issue(s) this PR fixes:

Ref #982

Does this PR introduce a user-facing change?:

NONE

/assign @saikat-royc

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 12, 2022
@k8s-ci-robot k8s-ci-robot requested review from jingxu97 and saad-ali May 12, 2022 21:39
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 12, 2022
@mauriciopoppe
Copy link
Member Author

/cc @saikat-royc

@k8s-ci-robot k8s-ci-robot requested a review from saikat-royc May 12, 2022 21:39
@mauriciopoppe
Copy link
Member Author

/retest
/cc @mattcary

@k8s-ci-robot k8s-ci-robot requested a review from mattcary May 12, 2022 22:47
@mauriciopoppe
Copy link
Member Author

/retest

1 similar comment
@mauriciopoppe
Copy link
Member Author

/retest

@mattcary
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 19, 2022
@mauriciopoppe
Copy link
Member Author

@mattcary could you please approve this PR too?

@mattcary
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattcary, mauriciopoppe

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 May 19, 2022
@mauriciopoppe
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 93684bb into kubernetes-sigs:master May 23, 2022
k8s-ci-robot added a commit that referenced this pull request May 24, 2022
…86-upstream-release-1.7

Automated cherry pick of #986: Remove workaround to add os.version to the manifest for
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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. 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