Update mockgen to v0.5.0 in codegen image (#6759)

* Update mockgen to v0.5.0 in codegen image * Code generation * Update multicluster/test/mocks/mock_controller_runtime_manager.go Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
antrea-io · Oct 22, 2024 · 83d37c0 · 83d37c0
1 parent 5062aae
commit 83d37c0
Show file tree

Hide file tree

Showing 46 changed files with 2,043 additions and 2,046 deletions.
diff --git a/build/images/codegen/Dockerfile b/build/images/codegen/Dockerfile
@@ -44,7 +44,7 @@ RUN go install k8s.io/code-generator/cmd/client-gen@kubernetes-$K8S_VERSION && \
     go install k8s.io/kube-openapi/cmd/openapi-gen@$KUBEOPENAPI_VERSION && \
     go install k8s.io/code-generator/cmd/go-to-protobuf@kubernetes-$K8S_VERSION && \
     go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo@kubernetes-$K8S_VERSION && \
-    go install go.uber.org/mock/mockgen@v0.4.0 && \
+    go install go.uber.org/mock/mockgen@v0.5.0 && \
     go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.33.0 && \
     go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 && \
     go install golang.org/x/tools/cmd/goimports@latest && \

diff --git a/build/images/codegen/README.md b/build/images/codegen/README.md
@@ -22,6 +22,7 @@ Here is the table of codegen images that have been uploaded:
 
 | Tag                       | Change                                                                        |
 | :------------------------ | ----------------------------------------------------------------------------- |
+| kubernetes-1.31.1-build.0 | Upgraded go.uber.org/mock/mockgen to v0.5.0                                   |
 | kubernetes-1.31.1         | Upgraded K8s libraries to v1.31.1, controller-gen to v0.16.3, ubuntu to 24.04 |
 | kubernetes-1.29.2-build.3 | Upgraded Go to v1.23                                                          |
 | kubernetes-1.29.2-build.2 | Upgraded go.uber.org/mock/mockgen to v0.4.0                                   |

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -22,7 +22,7 @@ function echoerr {
 }
 
 ANTREA_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
-IMAGE_NAME="antrea/codegen:kubernetes-1.31.1"
+IMAGE_NAME="antrea/codegen:kubernetes-1.31.1-build.0"
 
 # We will use git clone to make a working copy of the repository into a
 # temporary directory. This requires that all changes have been committed

diff --git a/multicluster/controllers/multicluster/commonarea/mock_remote_common_area.go b/multicluster/controllers/multicluster/commonarea/mock_remote_common_area.go
diff --git a/multicluster/controllers/multicluster/leader/mock_membercluster_status_manager.go b/multicluster/controllers/multicluster/leader/mock_membercluster_status_manager.go
diff --git a/multicluster/hack/update-codegen.sh b/multicluster/hack/update-codegen.sh
@@ -22,7 +22,7 @@ function echoerr {
 }
 
 ANTREA_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )"
-IMAGE_NAME="antrea/codegen:kubernetes-1.31.1"
+IMAGE_NAME="antrea/codegen:kubernetes-1.31.1-build.0"
 
 # We will use git clone to make a working copy of the repository into a
 # temporary directory. This requires that all changes have been committed

diff --git a/multicluster/test/mocks/mock_controller_runtime_manager.go b/multicluster/test/mocks/mock_controller_runtime_manager.go
diff --git a/pkg/agent/bgp/testing/mock_bgp.go b/pkg/agent/bgp/testing/mock_bgp.go
diff --git a/pkg/agent/cniserver/ipam/testing/mock_ipam.go b/pkg/agent/cniserver/ipam/testing/mock_ipam.go