Skip to content

Add build rule for Windows container #489

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 21, 2020
Merged

Add build rule for Windows container #489

merged 1 commit into from
Apr 21, 2020

Conversation

jingxu97
Copy link
Contributor

@jingxu97 jingxu97 commented Apr 15, 2020 •
edited
Loading

Add build rule for windows container. Here we try to enable buildx for
buiding windows container image on a linux VM

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 api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Adds new build rules using docker buildx feature for allowing to build windows container image on either windows or linux node.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 15, 2020
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 15, 2020
@jingxu97 jingxu97 force-pushed the April/buildx branch 4 times, most recently from 0904417 to b5a9cc8 Compare April 15, 2020 22:25
msau42
msau42 reviewed Apr 15, 2020
View reviewed changes
Makefile Outdated
$(error "Must set environment variable GCE_PD_CSI_STAGING_VERSION to staging version")
endif
GOOS=windows go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERWINDOWSBINARY} ./cmd/
GOOS=windows go build -ldflags -X=main.vendorVersion=$(REV) -o bin/${DRIVERWINDOWSBINARY} ./cmd/
Copy link
Contributor

Choose a reason for hiding this comment

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

How come we use REV instead of STAGINGVERSION like the rest of the rules?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we changed it to use a default value getting from git

Makefile Outdated
@@ -44,6 +42,16 @@ ifndef GCE_PD_CSI_STAGING_VERSION
endif
docker build --build-arg TAG=$(STAGINGVERSION) -t $(STAGINGIMAGE):$(STAGINGVERSION) .

build-push-windows-container:
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this invoke gce-pd-driver-windows first?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, it just does the docker build

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe remove the "build" from the name?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

here build means docker build.
I see it is used in build the linux container?

@msau42
Copy link
Contributor

msau42 commented Apr 16, 2020

/lgtm
/approve
Can you also add a release note

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jingxu97, msau42

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 Apr 16, 2020
msau42
msau42 reviewed Apr 21, 2020
View reviewed changes
Dockerfile.Windows Outdated
@@ -0,0 +1,9 @@
ARG BASE_IMAGE
ARG IMAGE_TAG
Copy link
Contributor

Choose a reason for hiding this comment

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

A better name may be BASE_IMAGE_TAG

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ack and fixed

Dockerfile.Windows Outdated
ARG BASE_IMAGE
ARG IMAGE_TAG
FROM mcr.microsoft.com/windows/${BASE_IMAGE}:${IMAGE_TAG}
ENV CSI_PROXY_PIPE "\\\\.\\pipe\\csipipe"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we define the ENV here instead of in the Daemonset spec? Doesn't the pipe path change depending on which API endpint we're talking to?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right, it is not needed here. removed it

@jingxu97
Add build rule for Windows container
10026de 
Add build rule for windows container. Here we try to enable buildx for
buiding windows container image on a linux VM
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 21, 2020
@msau42
Copy link
Contributor

msau42 commented Apr 21, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 21, 2020
@k8s-ci-robot k8s-ci-robot merged commit 2cd5cf5 into kubernetes-sigs:master Apr 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msau42 msau42 msau42 left review comments

@davidz627 davidz627 Awaiting requested review from davidz627

@verult verult Awaiting requested review from verult

Assignees

@msau42 msau42

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jingxu97 @msau42 @k8s-ci-robot