build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, … (

#1251) * build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, sigs.k8s.io/controller-runtime,github.com/onsi/gomega * fix: update ResourceRequirements to VolumeResourceRequirements for storage Signed-off-by: jiuxia211 <[email protected]> * update dockerfile Signed-off-by: jiuxia211 <[email protected]> * fix: generate-groups.sh removed error Signed-off-by: jiuxia211 <[email protected]> * update envtest for Makefile Signed-off-by: jiuxia211 <[email protected]> * fix: make verify-coodegen error Signed-off-by: jiuxia211 <[email protected]> * update go version of workflows Signed-off-by: jiuxia211 <[email protected]> * fix: unsuitable go version Signed-off-by: jiuxia211 <[email protected]> --------- Signed-off-by: jiuxia211 <[email protected]>
fluent · Jul 24, 2024 · ffb0121 · ffb0121
1 parent eeb5bfd
commit ffb0121
Show file tree

Hide file tree

Showing 53 changed files with 13,477 additions and 3,128 deletions.
diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
@@ -188,7 +188,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:
@@ -232,7 +232,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
@@ -234,7 +234,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:
@@ -276,7 +276,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:
@@ -341,7 +341,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -46,7 +46,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:
@@ -84,7 +84,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0 
 
       - uses: actions/cache@v4
         with:
@@ -115,7 +115,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:
@@ -149,7 +149,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.0
 
       - uses: actions/cache@v4
         with:

diff --git a/Makefile b/Makefile
@@ -63,10 +63,17 @@ vet: ## Run go vet against code.
 	go vet ./...
 
 ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
-test: manifests generate fmt vet ## Run tests.
-	mkdir -p ${ENVTEST_ASSETS_DIR}
-	test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.8.3/hack/setup-envtest.sh
-	source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./apis/... -coverprofile cover.out
+
+install-setup-envtest: ## Install the setup-envtest tool if it is not already installed
+	if ! command -v setup-envtest &> /dev/null; then \
+	    go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest; \
+	fi
+
+setup-envtest: install-setup-envtest ## Download and set up the envtest binary
+	source <(setup-envtest use -p env) 
+
+test: manifests generate fmt vet setup-envtest ## Run tests.
+	go test ./apis/... -coverprofile cover.out
 
 ##@ Build
 
@@ -159,9 +166,9 @@ KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: go-deps ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
 
-CODE_GENERATOR = $(shell go env GOPATH)/pkg/mod/k8s.io/code-generator@v0.26.1
+CODE_GENERATOR = $(shell go env GOPATH)/pkg/mod/k8s.io/code-generator@v0.30.3
 code-generator: go-deps ## Download code-generator locally if necessary
-	$(call go-get-tool,$(CODE_GENERATOR),k8s.io/code-generator@v0.26.1)
+	$(call go-get-tool,$(CODE_GENERATOR),k8s.io/code-generator@v0.30.3)
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -178,7 +185,7 @@ rm -rf $$TMP_DIR ;\
 endef
 
 go-deps: # download go dependencies
-	go get k8s.io/code-generator@v0.26.1
+	go get k8s.io/code-generator@v0.30.3
 	go mod download
 
 docs-update: # update api docs

diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
@@ -351,10 +351,15 @@ spec:
                               description: The key to select.
                               type: string
                             name:
+                              default: ""
                               description: |-
                                 Name of the referent.
-                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
                                 TODO: Add other useful fields. apiVersion, kind, uid?
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                               type: string
                             optional:
                               description: Specify whether the ConfigMap or its key

diff --git a/...ent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/...ent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -79,11 +79,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -123,11 +125,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -167,11 +171,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -216,11 +222,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -260,11 +268,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
@@ -234,10 +234,15 @@ spec:
                                       be a valid secret key.
                                     type: string
                                   name:
+                                    default: ""
                                     description: |-
                                       Name of the referent.
-                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
                                       TODO: Add other useful fields. apiVersion, kind, uid?
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                                     type: string
                                   optional:
                                     description: Specify whether the Secret or its