-
Notifications
You must be signed in to change notification settings - Fork 375
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use Different Images for Agent and Controller
Fixes #5691. Modified the code to build separate images for antrea-agent and antrea-controller, because there are many resources that are not required by controller and are required by agent only, and unified image for both creates a burden when starting antrea-controller and thus it takes time to start. For this reason I have create separate images for antrea-agent and antrea-controller. Signed-off-by: Pulkit Jain <[email protected]>
- Loading branch information
Pulkit Jain
committed
Jan 4, 2024
1 parent
0204fbc
commit a604e31
Showing
24 changed files
with
316 additions
and
70 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
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
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,44 @@ | ||
| # Copyright 2024 Antrea 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 GO_VERSION | ||
| ARG BUILD_TAG | ||
| FROM golang:${GO_VERSION} as antrea-build | ||
|
|
||
| WORKDIR /antrea | ||
|
|
||
| COPY go.mod /antrea/go.mod | ||
|
|
||
| RUN go mod download | ||
|
|
||
| COPY . /antrea | ||
|
|
||
| RUN make antrea-agent antrea-cni antrea-agent-instr-binary | ||
| # Disable CGO for antctl in case it is copied outside of the container image. It | ||
| # also reduces the size of the binary and aligns with how we distribute antctl | ||
| # in release assets. | ||
| RUN CGO_ENABLED=0 make antctl-linux antctl-instr-binary | ||
| RUN mv bin/antctl-linux bin/antctl | ||
|
|
||
| FROM antrea/base-ubuntu:${BUILD_TAG} | ||
|
|
||
| LABEL maintainer="Antrea <[email protected]>" | ||
| LABEL description="The Docker image to deploy the Antrea CNI with code coverage measurement enabled (used for testing)." | ||
|
|
||
| USER root | ||
|
|
||
| COPY build/images/scripts/* /usr/local/bin/ | ||
| COPY --from=antrea-build /antrea/bin/* /usr/local/bin/ | ||
| COPY --from=antrea-build /antrea/test/e2e/coverage/controller-arg-file / | ||
| COPY --from=antrea-build /antrea/test/e2e/coverage/agent-arg-file / |
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,42 @@ | ||
| # Copyright 2024 Antrea 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 GO_VERSION | ||
| ARG BUILD_TAG | ||
| FROM golang:${GO_VERSION} as antrea-build | ||
|
|
||
| WORKDIR /antrea | ||
|
|
||
| COPY go.mod /antrea/go.mod | ||
|
|
||
| RUN go mod download | ||
|
|
||
| COPY . /antrea | ||
|
|
||
| RUN make antrea-agent antrea-cni | ||
| # Disable CGO for antctl in case it is copied outside of the container image. It | ||
| # also reduces the size of the binary and aligns with how we distribute antctl | ||
| # in release assets. | ||
| RUN CGO_ENABLED=0 make antctl-linux | ||
| RUN mv bin/antctl-linux bin/antctl | ||
|
|
||
| FROM antrea/base-ubuntu:${BUILD_TAG} | ||
|
|
||
| LABEL maintainer="Antrea <[email protected]>" | ||
| LABEL description="The Docker image to deploy the Antrea CNI." | ||
|
|
||
| USER root | ||
|
|
||
| COPY build/images/scripts/* /usr/local/bin/ | ||
| COPY --from=antrea-build /antrea/bin/* /usr/local/bin/ |
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,46 @@ | ||
| # Copyright 2024 Antrea 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 GO_VERSION | ||
| ARG BUILD_TAG | ||
| FROM golang:${GO_VERSION} as antrea-build | ||
|
|
||
| WORKDIR /antrea | ||
|
|
||
| COPY go.mod /antrea/go.mod | ||
|
|
||
| RUN go mod download | ||
|
|
||
| COPY . /antrea | ||
|
|
||
| RUN make antrea-controller | ||
| # Disable CGO for antctl in case it is copied outside of the container image. It | ||
| # also reduces the size of the binary and aligns with how we distribute antctl | ||
| # in release assets. | ||
| RUN CGO_ENABLED=0 make antctl-linux | ||
| RUN mv bin/antctl-linux bin/antctl | ||
|
|
||
| FROM ubuntu:22.04 | ||
|
|
||
| LABEL maintainer="Antrea <[email protected]>" | ||
| LABEL description="The Docker image to deploy the Antrea CNI." | ||
|
|
||
| USER root | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y --no-install-recommends openssl | ||
|
|
||
| COPY build/images/scripts/* /usr/local/bin/ | ||
| COPY --from=antrea-build /antrea/bin/antctl /usr/local/bin/ | ||
| COPY --from=antrea-build /antrea/bin/antrea-controller /usr/local/bin/ |
Oops, something went wrong.