Upgrade go.uber.org/mock/mockgen to v0.4.0 (#6477)

The version of the mockgen binary included in the codegen image should match the version of the go.uber.org/mock module that we use. There was a small change in formatting of generated files (extra empty line), which is why all generated mock files are updated as part of this PR... Signed-off-by: Antonin Bas <[email protected]>
antrea-io · Jun 26, 2024 · c0f964b · c0f964b
1 parent b03e894
commit c0f964b
Show file tree

Hide file tree

Showing 44 changed files with 72 additions and 31 deletions.
diff --git a/build/images/codegen/Dockerfile b/build/images/codegen/Dockerfile
@@ -46,7 +46,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.3.0 && \
+    go install go.uber.org/mock/mockgen@v0.4.0 && \
     go install google.golang.org/protobuf/cmd/[email protected] && \
     go install google.golang.org/grpc/cmd/[email protected] && \
     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.29.2-build.2 | Upgraded go.uber.org/mock/mockgen to v0.4.0                                   |
 | kubernetes-1.29.2-build.1 | Upgraded controller-gen to v0.14.0                                            |
 | kubernetes-1.29.2-build.0 | Upgraded protoc (v26.0), protoc-gen-go (v1.33.0), protoc-gen-go-grpc (v1.3.0) |
 | kubernetes-1.29.2         | Upgraded K8s libraries to v1.29.2                                             |

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.29.2-build.1"
+IMAGE_NAME="antrea/codegen:kubernetes-1.29.2-build.2"
 
 # 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.29.2-build.1"
+IMAGE_NAME="antrea/codegen:kubernetes-1.29.2-build.2"
 
 # 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/pkg/agent/cniserver/ipam/testing/mock_ipam.go b/pkg/agent/cniserver/ipam/testing/mock_ipam.go
diff --git a/pkg/agent/cniserver/testing/mock_cniserver.go b/pkg/agent/cniserver/testing/mock_cniserver.go
diff --git a/pkg/agent/flowexporter/connections/testing/mock_connections.go b/pkg/agent/flowexporter/connections/testing/mock_connections.go
diff --git a/pkg/agent/interfacestore/testing/mock_interfacestore.go b/pkg/agent/interfacestore/testing/mock_interfacestore.go
diff --git a/pkg/agent/ipassigner/testing/mock_ipassigner.go b/pkg/agent/ipassigner/testing/mock_ipassigner.go
diff --git a/pkg/agent/memberlist/mock_memberlist_test.go b/pkg/agent/memberlist/mock_memberlist_test.go
diff --git a/pkg/agent/memberlist/testing/mock_memberlist.go b/pkg/agent/memberlist/testing/mock_memberlist.go
diff --git a/pkg/agent/monitortool/testing/mock_monitortool.go b/pkg/agent/monitortool/testing/mock_monitortool.go
diff --git a/pkg/agent/multicast/testing/mock_multicast.go b/pkg/agent/multicast/testing/mock_multicast.go
diff --git a/pkg/agent/nodeportlocal/portcache/testing/mock_portcache.go b/pkg/agent/nodeportlocal/portcache/testing/mock_portcache.go
diff --git a/pkg/agent/nodeportlocal/rules/testing/mock_rules.go b/pkg/agent/nodeportlocal/rules/testing/mock_rules.go
diff --git a/pkg/agent/openflow/operations/testing/mock_operations.go b/pkg/agent/openflow/operations/testing/mock_operations.go
diff --git a/pkg/agent/openflow/testing/mock_openflow.go b/pkg/agent/openflow/testing/mock_openflow.go
diff --git a/pkg/agent/proxy/testing/mock_proxy.go b/pkg/agent/proxy/testing/mock_proxy.go
diff --git a/pkg/agent/querier/testing/mock_querier.go b/pkg/agent/querier/testing/mock_querier.go
diff --git a/pkg/agent/route/testing/mock_route.go b/pkg/agent/route/testing/mock_route.go
diff --git a/pkg/agent/secondarynetwork/podwatch/testing/mock_podwatch.go b/pkg/agent/secondarynetwork/podwatch/testing/mock_podwatch.go
diff --git a/pkg/agent/servicecidr/testing/mock_servicecidr.go b/pkg/agent/servicecidr/testing/mock_servicecidr.go
diff --git a/pkg/agent/types/testing/mock_types.go b/pkg/agent/types/testing/mock_types.go
diff --git a/pkg/agent/util/ipset/testing/mock_ipset.go b/pkg/agent/util/ipset/testing/mock_ipset.go
diff --git a/pkg/agent/util/iptables/testing/mock_iptables_linux.go b/pkg/agent/util/iptables/testing/mock_iptables_linux.go
diff --git a/pkg/agent/util/netlink/testing/mock_netlink_linux.go b/pkg/agent/util/netlink/testing/mock_netlink_linux.go
diff --git a/pkg/agent/util/winnet/testing/mock_net_windows.go b/pkg/agent/util/winnet/testing/mock_net_windows.go
diff --git a/pkg/agent/wireguard/testing/mock_wireguard.go b/pkg/agent/wireguard/testing/mock_wireguard.go
diff --git a/pkg/antctl/mock_antctl_test.go b/pkg/antctl/mock_antctl_test.go
diff --git a/pkg/controller/networkpolicy/testing/mock_networkpolicy.go b/pkg/controller/networkpolicy/testing/mock_networkpolicy.go
diff --git a/pkg/controller/querier/testing/mock_querier.go b/pkg/controller/querier/testing/mock_querier.go
diff --git a/pkg/flowaggregator/exporter/testing/mock_exporter.go b/pkg/flowaggregator/exporter/testing/mock_exporter.go