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

[CONTINT-4412] Upgrade k8s dependencies #1445

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+1,998 −4,892
Open

[CONTINT-4412] Upgrade k8s dependencies #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e9e14d
[CONTINT-4412] Upgrade `k8s` dependencies
L3n41c Oct 1, 2024
4a3f1d5
Merge branch 'main' of github.com:DataDog/datadog-operator into lenai…
L3n41c Oct 7, 2024
93ce5e4
Fix tests
L3n41c Oct 8, 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
8 changes: 4 additions & 4 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ core,github.com/davecgh/go-spew/spew,ISC
core,github.com/emicklei/go-restful/v3,MIT
core,github.com/evanphx/json-patch/v5,BSD-3-Clause
core,github.com/fsnotify/fsnotify,BSD-3-Clause
core,github.com/fxamacker/cbor/v2,MIT
core,github.com/go-logr/logr,Apache-2.0
core,github.com/go-logr/zapr,Apache-2.0
core,github.com/go-openapi/jsonpointer,Apache-2.0
Expand All @@ -51,7 +52,6 @@ core,github.com/josharian/intern,MIT
core,github.com/json-iterator/go,MIT
core,github.com/magiconair/properties,BSD-2-Clause
core,github.com/mailru/easyjson,MIT
core,github.com/matttproud/golang_protobuf_extensions/pbutil,Apache-2.0
core,github.com/mitchellh/mapstructure,MIT
core,github.com/modern-go/concurrent,Apache-2.0
core,github.com/modern-go/reflect2,Apache-2.0
Expand All @@ -65,7 +65,6 @@ core,github.com/pmezard/go-difflib/difflib,BSD-3-Clause
core,github.com/prometheus/client_golang/prometheus,Apache-2.0
core,github.com/prometheus/client_model/go,Apache-2.0
core,github.com/prometheus/common,Apache-2.0
core,github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg,BSD-3-Clause
core,github.com/prometheus/procfs,Apache-2.0
core,github.com/richardartoul/molecule,MIT
core,github.com/richardartoul/molecule/src/codec,Apache-2.0
Expand All @@ -80,6 +79,7 @@ core,github.com/spf13/pflag,BSD-3-Clause
core,github.com/stretchr/objx,MIT
core,github.com/stretchr/testify,MIT
core,github.com/tinylib/msgp/msgp,MIT
core,github.com/x448/float16,MIT
core,github.com/zorkian/go-datadog-api,BSD-3-Clause
core,go.etcd.io/bbolt,MIT
core,go.uber.org/atomic,MIT
Expand Down Expand Up @@ -107,7 +107,6 @@ core,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions,Apache-2.0
core,k8s.io/apimachinery/pkg,Apache-2.0
core,k8s.io/apimachinery/third_party/forked/golang,BSD-3-Clause
core,k8s.io/client-go,Apache-2.0
core,k8s.io/component-base/config,Apache-2.0
core,k8s.io/klog/v2,Apache-2.0
core,k8s.io/kube-aggregator/pkg/apis/apiregistration,Apache-2.0
core,k8s.io/kube-openapi/pkg,Apache-2.0
Expand All @@ -118,4 +117,5 @@ core,k8s.io/utils/internal/third_party/forked/golang/net,BSD-3-Clause
core,sigs.k8s.io/controller-runtime,Apache-2.0
core,sigs.k8s.io/json,Apache-2.0
core,sigs.k8s.io/structured-merge-diff/v4,Apache-2.0
core,sigs.k8s.io/yaml,MIT
core,sigs.k8s.io/yaml,Apache-2.0
core,sigs.k8s.io/yaml/goyaml.v2,Apache-2.0
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ echo-img: ## Use `make -s echo-img` to get image string for other shell commands
##@ Tools
CONTROLLER_GEN = bin/$(PLATFORM)/controller-gen
$(CONTROLLER_GEN): Makefile ## Download controller-gen locally if necessary.
$(call go-get-tool,$@,sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
$(call go-get-tool,$@,sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3)

KUSTOMIZE = bin/$(PLATFORM)/kustomize
$(KUSTOMIZE): Makefile ## Download kustomize locally if necessary.
Expand Down Expand Up @@ -286,8 +286,8 @@ install-tools: bin/$(PLATFORM)/golangci-lint bin/$(PLATFORM)/operator-sdk bin/$(

.PHONY: generate-openapi
generate-openapi: bin/$(PLATFORM)/openapi-gen
bin/$(PLATFORM)/openapi-gen --logtostderr=true -o "." -i ./api/datadoghq/v1alpha1 -O zz_generated.openapi -p ./api/datadoghq/v1alpha1 -h ./hack/boilerplate.go.txt -r "-"
bin/$(PLATFORM)/openapi-gen --logtostderr=true -o "." -i ./api/datadoghq/v2alpha1 -O zz_generated.openapi -p ./api/datadoghq/v2alpha1 -h ./hack/boilerplate.go.txt -r "-"
bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v1alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v1alpha1 --go-header-file ./hack/boilerplate.go.txt
bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v2alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v2alpha1 --go-header-file ./hack/boilerplate.go.txt

.PHONY: preflight-redhat-container
preflight-redhat-container: bin/$(PLATFORM)/preflight
Expand Down Expand Up @@ -333,7 +333,7 @@ bin/$(PLATFORM)/yq: Makefile
hack/install-yq.sh v4.31.2

bin/$(PLATFORM)/golangci-lint: Makefile
hack/golangci-lint.sh -b "bin/$(PLATFORM)" v1.59.1
hack/golangci-lint.sh -b "bin/$(PLATFORM)" v1.61.0

bin/$(PLATFORM)/operator-sdk: Makefile
hack/install-operator-sdk.sh v1.34.1
Expand All @@ -350,7 +350,7 @@ bin/$(PLATFORM)/preflight: Makefile

bin/$(PLATFORM)/openapi-gen:
mkdir -p $(ROOT)/bin/$(PLATFORM)
GOBIN=$(ROOT)/bin/$(PLATFORM) go install k8s.io/kube-openapi/cmd/[email protected]20230717233707-2695361300d9
GOBIN=$(ROOT)/bin/$(PLATFORM) go install k8s.io/kube-openapi/cmd/[email protected]20240228011516-70dd3763d340

bin/$(PLATFORM)/kubebuilder:
./hack/install-kubebuilder.sh 4.1.1 ./bin/$(PLATFORM)
Expand Down
Loading
Loading