forked from kubernetes/kubernetes
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds support for building Windows pause image
We can use docker buildx in order to build and push Windows images from the same Linux node, as long as the Dockerfile does not have any RUN commands in the Windows step. We also need to create a non-default builder instance in order to be able to build and push Windows images. The Windows images have to be built and pushed directly to the registry. Because of this, the make target "push" has been removed (the target "all" will build and push the images). We need wincat for a few kubectl proxy scenarios. For Windows containers without Hyper-V isolation, the host OS Version and the Container OS Version need to match, which is why we added multiple Windows OS Versions to the building process. Adds support for Windows OS Versions: 1809, 1903, 1909, 2004. Bumps pause image version to 3.4. Co-Authored-By: Claudiu Belu <cbelu@cloudbasesolutions.com> Co-Authored-By: Ben Moss <bmoss@pivotal.io> Signed-off-by: Leah Hanson <lhanson@pivotal.io>
- Loading branch information
1 parent
14a1106
commit 82ac28c
Showing
11 changed files
with
281 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # Copyright 2020 The Kubernetes Authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| ARG BASE | ||
| FROM ${BASE} | ||
| ARG ARCH | ||
| ADD bin/pause-windows-${ARCH}.exe /pause.exe | ||
| ADD windows/wincat.exe /Windows/System32/wincat.exe | ||
|
|
||
| # NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH, | ||
| # which is not desirable. See: https://github.com/moby/buildkit/issues/1560 | ||
| # TODO(claudiub): remove this once the issue has been resolved. | ||
| ENV PATH="C:\Windows\system32;C:\Windows;" | ||
| ENTRYPOINT ["/pause.exe"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| Copyright 2020 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| #include <windows.h> | ||
| #include <stdio.h> | ||
|
|
||
| BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) | ||
| { | ||
| switch (fdwCtrlType) | ||
| { | ||
| case CTRL_C_EVENT: | ||
| fprintf(stderr, "Shutting down, got signal\n"); | ||
| exit(0); | ||
|
|
||
| case CTRL_BREAK_EVENT: | ||
| fprintf(stderr, "Shutting down, got signal\n"); | ||
| exit(0); | ||
|
|
||
| default: | ||
| return FALSE; | ||
| } | ||
| } | ||
|
|
||
| int main(void) | ||
| { | ||
| if (SetConsoleCtrlHandler(CtrlHandler, TRUE)) | ||
| { | ||
| Sleep(INFINITE); | ||
| } | ||
| else | ||
| { | ||
| printf("\nERROR: Could not set control handler\n"); | ||
| return 1; | ||
| } | ||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = ["wincat.go"], | ||
| importpath = "k8s.io/kubernetes/build/pause/windows/wincat", | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| go_binary( | ||
| name = "windows", | ||
| embed = [":go_default_library"], | ||
| visibility = ["//visibility:public"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "package-srcs", | ||
| srcs = glob(["**"]), | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "all-srcs", | ||
| srcs = [":package-srcs"], | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:public"], | ||
| ) |
Oops, something went wrong.