antrea-io · tnqn · Mar 28, 2023 · Dec 19, 2022
diff --git a/build/images/Dockerfile.octant.ubuntu b/build/images/Dockerfile.octant.ubuntu
@@ -24,7 +24,7 @@ WORKDIR /antrea/plugins/octant
 #14 87.20 make: *** [Makefile:16: octant-plugins] Error 2
 RUN CGO_ENABLED=0 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."

diff --git a/build/images/Dockerfile.simulator.build.ubuntu b/build/images/Dockerfile.simulator.build.ubuntu
@@ -12,7 +12,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."

diff --git a/build/images/codegen/Dockerfile b/build/images/codegen/Dockerfile
@@ -1,5 +1,5 @@
 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

diff --git a/build/images/codegen/README.md b/build/images/codegen/README.md
@@ -20,6 +20,9 @@ Here is the table of codegen images that have been uploaded:
 
 | Tag                            | Change                                  |
 | :----------------------------- | --------------------------------------- |
+| 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        |
 | kubernetes-1.21.0-build.0      | Upgraded Go to v1.17                    |

diff --git a/build/images/ethtool/Dockerfile b/build/images/ethtool/Dockerfile
@@ -1,7 +1,21 @@
-FROM ubuntu:20.04
+# Copyright 2022 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.
+
+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."
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ethtool iproute2 iptables && \

diff --git a/build/images/ethtool/README.md b/build/images/ethtool/README.md
@@ -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:

diff --git a/build/images/flow-aggregator/Dockerfile b/build/images/flow-aggregator/Dockerfile
@@ -9,7 +9,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"

diff --git a/build/images/flow-aggregator/Dockerfile.coverage b/build/images/flow-aggregator/Dockerfile.coverage
@@ -8,7 +8,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."

diff --git a/build/images/perftool/Dockerfile b/build/images/perftool/Dockerfile
@@ -1,7 +1,21 @@
-FROM ubuntu:20.04
+# Copyright 2022 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.
+
+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 && \

diff --git a/build/images/perftool/README.md b/build/images/perftool/README.md
@@ -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

diff --git a/build/images/wireguard-go/Dockerfile b/build/images/wireguard-go/Dockerfile
@@ -15,5 +15,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/
diff --git a/build/images/wireguard-go/README.md b/build/images/wireguard-go/README.md
@@ -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>.

diff --git a/docs/cookbooks/multus/build/cni-dhcp-daemon/Dockerfile b/docs/cookbooks/multus/build/cni-dhcp-daemon/Dockerfile
@@ -1,4 +1,18 @@
-FROM ubuntu:20.04 as cni-binary
+# Copyright 2022 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.
+
+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."
@@ -12,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
 

diff --git a/docs/cookbooks/multus/resources/dhcp-daemon.yml b/docs/cookbooks/multus/resources/dhcp-daemon.yml
@@ -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

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -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"
+IMAGE_NAME="antrea/codegen:kubernetes-1.24.0-build.0"
 
 function docker_run() {
   docker pull ${IMAGE_NAME}

diff --git a/multicluster/build/images/Dockerfile.build.coverage b/multicluster/build/images/Dockerfile.build.coverage
@@ -11,7 +11,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)."

diff --git a/test/e2e/infra/vagrant/Vagrantfile b/test/e2e/infra/vagrant/Vagrantfile
@@ -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