Skip to content

Commit

Permalink
Update remaining images to use ubuntu:22.04 base image (#4499)
Browse files Browse the repository at this point in the history
We also update the Vagrant-based test infra to use Ubuntu 22.04 as the
Node OS. Because Ubuntu 22.04 ships with crgroup v2, we need to
configure containerd to use the systemd cgroup driver.

Signed-off-by: Antonin Bas <abas@vmware.com>
  • Loading branch information
antoninbas authored Dec 20, 2022
1 parent 165e11f commit 07bb793
Show file tree
Hide file tree
Showing 19 changed files with 270 additions and 42 deletions.
2 changes: 1 addition & 1 deletion build/images/Dockerfile.octant.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ WORKDIR /antrea/plugins/octant

RUN make octant-plugins

FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="A docker image to deploy octant and antrea related octant plugins."
Expand Down
2 changes: 1 addition & 1 deletion build/images/Dockerfile.simulator.build.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY . /antrea
RUN make antrea-agent-simulator


FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="The Docker image to deploy the Antrea simulator."
Expand Down
2 changes: 1 addition & 1 deletion build/images/codegen/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

ARG GO_VERSION
FROM ubuntu:20.04 as protoc
FROM ubuntu:22.04 as protoc

RUN apt-get update && \
apt-get install -y --no-install-recommends wget ca-certificates unzip
Expand Down
3 changes: 2 additions & 1 deletion build/images/codegen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Here is the table of codegen images that have been uploaded:

| Tag | Change |
| :----------------------------- | --------------------------------------- |
| kubernetes-1.24.0-build.1 | Upgraded Go to v1.19 |
| kubernetes-1.24.0-build.2 | Upgraded base image to ubuntu:22.04 |
| kubernetes-1.24.0-build.1 | Upgraded Go to v1.19 |
| kubernetes-1.24.0-build.0 | Add controller-gen v0.9.0 |
| kubernetes-1.24.0 | Upgraded K8s libraries to v1.24.0 |
| kubernetes-1.21.0-build.1 | Upgraded protoc-gen-go to v1.5.2 |
Expand Down
4 changes: 2 additions & 2 deletions build/images/ethtool/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="A Docker image based on Ubuntu 20.04 which includes ethtool, ip tools and iptables."
LABEL description="A Docker image based on Ubuntu 22.04 which includes ethtool, ip tools and iptables."

# See https://github.com/kubernetes-sigs/iptables-wrappers
# /iptables-wrapper-installer.sh will have permissions of 600.
Expand Down
2 changes: 1 addition & 1 deletion build/images/ethtool/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# images/ethtool

This Docker image is a very lightweight image based on Ubuntu 20.04 which
This Docker image is a very lightweight image based on Ubuntu 22.04 which
includes ethtool, the ip tools and iptables.

If you need to build a new version of the image locally, you can run the following:
Expand Down
2 changes: 1 addition & 1 deletion build/images/flow-aggregator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN make flow-aggregator antctl-linux
RUN mv bin/antctl-linux bin/antctl

# Chose this base image so that a shell is available for users to exec into the container, run antctl and run tools like pprof easily
FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="The docker image for the flow aggregator"
Expand Down
2 changes: 1 addition & 1 deletion build/images/flow-aggregator/Dockerfile.coverage
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ COPY . /antrea
RUN make flow-aggregator antctl-linux flow-aggregator-instr-binary antctl-instr-binary
RUN mv bin/antctl-linux bin/antctl

FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="The docker image for the flow aggregator with code coverage measurement enabled for testing purposes."
Expand Down
4 changes: 2 additions & 2 deletions build/images/perftool/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="A Docker image based on Ubuntu 20.04 which is used for performance tests."
LABEL description="A Docker image based on Ubuntu 22.04 which is used for performance tests."

RUN apt-get update && \
apt-get install -y --no-install-recommends apache2-utils iperf3 && \
Expand Down
2 changes: 1 addition & 1 deletion build/images/perftool/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# images/perftool

This Docker image is a very lightweight image based on Ubuntu 20.04 which
This Docker image is a very lightweight image based on Ubuntu 22.04 which
includes the apache2-utils and iperf3 packages.

If you need to build a new version of the image and push it to Dockerhub, you
Expand Down
2 changes: 1 addition & 1 deletion build/images/wireguard-go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ RUN git clone https://git.zx2c4.com/wireguard-tools && \
make && \
make install

FROM ubuntu:20.04
FROM ubuntu:22.04
COPY --from=builder /usr/bin/wireguard-go /usr/bin/wg /usr/bin/
2 changes: 1 addition & 1 deletion build/images/wireguard-go/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# images/wireguard-go

This Docker image is a very lightweight image based on Ubuntu 20.04 which
This Docker image is a very lightweight image based on Ubuntu 22.04 which
includes WireGuard golang implementation and wireguard-tools. It can be used
for Kind clusters for tests when injected as a sidecar to antrea-agent.
The version is available at <https://github.com/WireGuard/wireguard-go/releases>.
Expand Down
4 changes: 2 additions & 2 deletions docs/cookbooks/multus/build/cni-dhcp-daemon/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:20.04 as cni-binary
FROM ubuntu:22.04 as cni-binary

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="A Docker which runs the dhcp daemon from the containernetworking project."
Expand All @@ -26,7 +26,7 @@ ENV CNI_PLUGINS="./dhcp"
RUN mkdir -p /opt/cni/bin && \
wget -q -O - https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS

FROM ubuntu:20.04
FROM ubuntu:22.04

COPY --from=cni-binary /opt/cni/bin/* /usr/local/bin

Expand Down
2 changes: 1 addition & 1 deletion docs/cookbooks/multus/resources/dhcp-daemon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
hostNetwork: true
initContainers:
- name: sock-cleanup
image: ubuntu:20.04
image: ubuntu:22.04
command: ["rm", "-f", "/run/cni/dhcp.sock"]
volumeMounts:
- name: run
Expand Down
2 changes: 1 addition & 1 deletion hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -o errexit
set -o pipefail

ANTREA_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
IMAGE_NAME="antrea/codegen:kubernetes-1.24.0-build.1"
IMAGE_NAME="antrea/codegen:kubernetes-1.24.0-build.2"

function docker_run() {
docker pull ${IMAGE_NAME}
Expand Down
2 changes: 1 addition & 1 deletion multicluster/build/images/Dockerfile.build.coverage
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY . /antrea

RUN cd multicluster && make antrea-mc-instr-binary

FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
LABEL description="The Docker image to deploy the Antrea Multicluster controller with code coverage measurement enabled (used for testing)."
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/infra/vagrant/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ else
end

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu/focal64"
config.vm.box = "ubuntu/jammy64"

config.vm.provider "virtualbox" do |v|
v.memory = MEMORY
Expand Down
Loading

0 comments on commit 07bb793

Please sign in to comment.