mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #104451 from claudiubelu/test-images/windows-server-2022
test images: Adds Windows Server 2022 to the BASEIMAGEs
This commit is contained in:
commit
f4e1558af0
@ -6,3 +6,4 @@ linux/s390x=s390x/busybox:1.29
|
|||||||
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
||||||
windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
|
windows/amd64/2004=mcr.microsoft.com/windows/nanoserver:2004
|
||||||
windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
|
windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
|
||||||
|
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
||||||
|
@ -39,7 +39,7 @@ declare -A QEMUARCHS=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["pp
|
|||||||
# NOTE(claudiub): In the test image build jobs, this script is not being run in a git repository,
|
# NOTE(claudiub): In the test image build jobs, this script is not being run in a git repository,
|
||||||
# which would cause git log to fail. Instead, we can use the GIT_COMMIT_ID set in cloudbuild.yaml.
|
# which would cause git log to fail. Instead, we can use the GIT_COMMIT_ID set in cloudbuild.yaml.
|
||||||
GIT_COMMIT_ID=$(git log -1 --format=%h || echo "${GIT_COMMIT_ID}")
|
GIT_COMMIT_ID=$(git log -1 --format=%h || echo "${GIT_COMMIT_ID}")
|
||||||
windows_os_versions=(1809 2004 20H2)
|
windows_os_versions=(1809 2004 20H2 ltsc2022)
|
||||||
declare -A WINDOWS_OS_VERSIONS_MAP
|
declare -A WINDOWS_OS_VERSIONS_MAP
|
||||||
|
|
||||||
initWindowsOsVersions() {
|
initWindowsOsVersions() {
|
||||||
@ -269,7 +269,7 @@ bin() {
|
|||||||
golang:"${GOLANG_VERSION}" \
|
golang:"${GOLANG_VERSION}" \
|
||||||
/bin/bash -c "\
|
/bin/bash -c "\
|
||||||
cd /go/src/k8s.io/kubernetes/test/images/${SRC_DIR} && \
|
cd /go/src/k8s.io/kubernetes/test/images/${SRC_DIR} && \
|
||||||
CGO_ENABLED=0 ${arch_prefix} GOOS=${OS} GOARCH=${ARCH} go build -a -installsuffix cgo --ldflags \"-w ${LD_FLAGS}\" -o ${TARGET}/${SRC} ./$(dirname "${SRC}")"
|
CGO_ENABLED=0 ${arch_prefix} GOOS=${OS} GOARCH=${ARCH} go build -a -installsuffix cgo --ldflags \"-w ${LD_FLAGS:-}\" -o ${TARGET}/${SRC} ./$(dirname "${SRC}")"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
linux/amd64/1809=mcr.microsoft.com/windows/servercore:ltsc2019
|
linux/amd64/1809=mcr.microsoft.com/windows/servercore:ltsc2019
|
||||||
linux/amd64/2004=mcr.microsoft.com/windows/servercore:2004
|
linux/amd64/2004=mcr.microsoft.com/windows/servercore:2004
|
||||||
linux/amd64/20H2=mcr.microsoft.com/windows/servercore:20H2
|
linux/amd64/20H2=mcr.microsoft.com/windows/servercore:20H2
|
||||||
|
linux/amd64/ltsc2022=mcr.microsoft.com/windows/servercore:ltsc2022
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
ARG OS_VERSION
|
ARG BASEIMAGE
|
||||||
FROM --platform=windows/amd64 mcr.microsoft.com/windows/servercore:$OS_VERSION as prep
|
FROM --platform=windows/amd64 $BASEIMAGE as prep
|
||||||
FROM scratch
|
FROM scratch
|
||||||
|
|
||||||
COPY --from=prep /Windows/System32/en-US/nltest.exe.mui /Windows/System32/en-US/nltest.exe.mui
|
COPY --from=prep /Windows/System32/en-US/nltest.exe.mui /Windows/System32/en-US/nltest.exe.mui
|
||||||
|
Loading…
Reference in New Issue
Block a user