Skip to content

Windows Server 20H2 and 2004 support, configurable base layer versions. #691

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
merged 1 commit into from
Jan 7, 2021

Conversation

jeremyje
Copy link
Contributor

@jeremyje jeremyje commented Jan 6, 2021

What type of PR is this?

/kind feature

What this PR does / why we need it:
Newer versions of Kubernetes will support Windows Server 2004 and 20H2.
This PR also adds the support to pick a specific tag within a release band so that builds across CI runs can be consistent.
Lastly, this PR also changes the tagging for the OS specific images in the multi-arch build. There's a small chance this can cause some disruption but it's low. This change was necessary because of the 20H2 version suffix. The capital H is rejected in the image name but ok for tag. This change does reduce the image repository count so there's a benefit to moving the OS suffix from the image name to the tag.

Which issue(s) this PR fixes:

Fixes #690

Special notes for your reviewer:

This change needs to go in relatively soon because Windows Server 1909 will be EOL in a few months and we'll need some lead time to release this.

Does this PR introduce a user-facing change?:

Added Support for Windows Server 2004 and 20H2.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 6, 2021
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 6, 2021
@jeremyje
Copy link
Contributor Author

jeremyje commented Jan 6, 2021

/priority important-soon

@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Jan 6, 2021
@jeremyje
Copy link
Contributor Author

jeremyje commented Jan 6, 2021

I tested this change with make GCE_PD_CSI_STAGING_IMAGE=gcr.io/jeremyje/gcp-pd-csi-driver build-and-push-multi-arch here are the results.

image

Manifest:

{
   "schemaVersion": 2,
   "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
   "manifests": [
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 956,
         "digest": "sha256:28f9ff140efac8617e665149c71e270e1771f8b644003e49698d639bf6632087",
         "platform": {
            "architecture": "amd64",
            "os": "windows",
            "os.version": "10.0.18363.1256"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 956,
         "digest": "sha256:7ffbc35721878eac9551dc25863e50a079b1aa91cb222c1384a8df83b796e401",
         "platform": {
            "architecture": "amd64",
            "os": "windows",
            "os.version": "10.0.19041.685"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 956,
         "digest": "sha256:0d5c58db6e28261a0f484285268112b8d118e57c292be5e90b9c84bfe60ee69c",
         "platform": {
            "architecture": "amd64",
            "os": "windows",
            "os.version": "10.0.19042.685"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 1162,
         "digest": "sha256:f1e227381e5b1fdc2ca3573e40b12c5887c38b5f035414b3827f7e85868f7706",
         "platform": {
            "architecture": "amd64",
            "os": "linux"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 956,
         "digest": "sha256:ccd39798df5fefcbce467bdd14cbe4a1081d2fe1a44ffca88bca32f4c41d4f78",
         "platform": {
            "architecture": "amd64",
            "os": "windows",
            "os.version": "10.0.17763.1637"
         }
      }
   ]
}

@jeremyje jeremyje changed the title Add Windows 2004 and 20H2 support and ability to specify a specific t… Windows Server 20H2 and 2004 support, configurable base layer versions. Jan 6, 2021
@msau42
Copy link
Contributor

msau42 commented Jan 6, 2021

/assign @jingxu97

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

mattcary commented Jan 7, 2021

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jan 7, 2021
@k8s-ci-robot k8s-ci-robot merged commit 95ffc20 into kubernetes-sigs:master Jan 7, 2021
@jeremyje jeremyje deleted the winver branch January 7, 2021 04:20
k8s-ci-robot added a commit that referenced this pull request Jan 8, 2021
…pstream-release-1.2

Automated cherry pick of #691: Add Windows 2004 and 20H2 support and ability to specify a
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/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Support for Windows 2004 and 20H2.
5 participants