Update the versions of a few tools

1. Update trivy version to v0.56.2
2. Update jnorwood/helm-docs image tag to v1.14.2
3. Update controller-gen version in codegen Dockerfile to v0.16.3

Signed-off-by: Lan Luo <[email protected]>

Makefile

@@ -97,7 +97,7 @@ bin:
 	GOOS=linux $(GO) build -o $(BINDIR) $(GOFLAGS) -ldflags '$(LDFLAGS)' antrea.io/antrea/cmd/...
 
 .trivy-bin:
-	curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b $@ v0.34.0
+	curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b $@ v0.56.2
 
 check-%:
 	@: $(if $(value $*),,$(error $* is undefined))

build/charts/Makefile

@@ -5,7 +5,7 @@ VERSION := $(shell head -n 1 ../../VERSION | cut -c 2-)
 
 .PHONY: helm-docs
 helm-docs:
-	docker run --rm --volume "$(CURDIR):/helm-docs" --user=$(USERID):$(GRPID) jnorwood/helm-docs:v1.7.0
+	docker run --rm --volume "$(CURDIR):/helm-docs" --user=$(USERID):$(GRPID) jnorwood/helm-docs:v1.14.2
 	sed -i.bak "s/0\.0\.0/$(VERSION)/g" antrea/README.md # replace version placeholder
 	sed -i.bak "s/-dev-informational/--dev-informational/g" antrea/README.md # fix img.shields.io badge URLs
 	sed -i.bak "s/0\.0\.0/$(VERSION)/g" flow-aggregator/README.md # replace version placeholder

build/charts/antrea-windows/README.md

@@ -22,4 +22,4 @@ Kubernetes: `>= 1.22.0-0`
 | includeOVS | bool | `true` | Enable running Windows OVS processes inside antrea-ovs container in antrea-agent Pod |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.7.0](https://github.com/norwoodj/helm-docs/releases/v1.7.0)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

build/charts/antrea/README.md

@@ -146,4 +146,4 @@ Kubernetes: `>= 1.19.0-0`
 | wireGuard.port | int | `51820` | Port for WireGuard to send and receive traffic. |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.7.0](https://github.com/norwoodj/helm-docs/releases/v1.7.0)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

build/charts/flow-aggregator/README.md

@@ -63,4 +63,4 @@ Kubernetes: `>= 1.19.0-0`
 | testing.coverage | bool | `false` | Enable code coverage measurement (used when testing Flow Aggregator only). |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.7.0](https://github.com/norwoodj/helm-docs/releases/v1.7.0)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

build/images/codegen/Dockerfile

@@ -48,7 +48,7 @@ RUN go install k8s.io/code-generator/cmd/client-gen@kubernetes-$K8S_VERSION && \
     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 && \
-    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
+    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3
 
 COPY --from=protoc /tmp/protoc/bin /usr/local/bin
 COPY --from=protoc /tmp/protoc/include /usr/local/include

build/images/codegen/README.md

@@ -22,8 +22,9 @@ Here is the table of codegen images that have been uploaded:
 
 | Tag                       | Change                                                                        |
 | :------------------------ | ----------------------------------------------------------------------------- |
+| kubernetes-1.31.1-build.1 | Upgraded controller-gen to v0.16.3                                            |
 | 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.31.1         | Upgraded K8s libraries to v1.31.1, 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                                   |
 | kubernetes-1.29.2-build.1 | Upgraded controller-gen to v0.14.0                                            |

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-build.0"
+IMAGE_NAME="antrea/codegen:kubernetes-1.31.1-build.1"
 
 # 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

multicluster/Makefile

@@ -54,9 +54,6 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CURDIR)/hack/generate-manifest.sh -m > build/yamls/antrea-multicluster-member.yml
 	$(CURDIR)/hack/update-checksum.sh
 
-generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt",year=$(YEAR) paths="./..."
-
 fmt: ## Run go fmt against code.
 	go fmt ./...
 

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-build.0"
+IMAGE_NAME="antrea/codegen:kubernetes-1.31.1-build.1"
 
 # 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