Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 8 commits into from
Jul 24, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c47bd31
build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, …
jiuxia211 Jul 21, 2024
a673c89
fix: update ResourceRequirements to VolumeResourceRequirements for st…
jiuxia211 Jul 21, 2024
7342a64
update dockerfile
jiuxia211 Jul 21, 2024
c6b9184
fix: generate-groups.sh removed error
jiuxia211 Jul 21, 2024
333cc7e
update envtest for Makefile
jiuxia211 Jul 21, 2024
e680a09
fix: make verify-coodegen error
jiuxia211 Jul 23, 2024
115391f
update go version of workflows
jiuxia211 Jul 23, 2024
8c5b6e2
fix: unsuitable go version
jiuxia211 Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-fb-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,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:
Expand Down Expand Up @@ -190,7 +190,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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-fd-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,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:
Expand Down Expand Up @@ -218,7 +218,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:
Expand Down Expand Up @@ -283,7 +283,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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
21 changes: 14 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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))))
Expand All @@ -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
Expand Down
7 changes: 6 additions & 1 deletion charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions ...ent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading