Skip to content

Commit

Permalink
Upgrade k8s.io/* to v0.28, sigs.k8s.io/controller-runtime to `v…
Browse files Browse the repository at this point in the history 
…0.16` (#14)

* [prerequisite] Drop the unused client field from the actuators

* [prerequisite] Drop dependency injection funcs

* Upgrade `k8s.io/*` to `v0.28`, `sigs.k8s.io/controller-runtime` to `v0.16`

* Adapt to the breaking change in the manager.Options struct

* Adapt to the breaking change how the watch is being set up

* Use the upstream fake client instead of a custom fake manager

* Drop unit tests for AddNewControllerToManager

* Use k8s.io/utils/ptr instead of the deprecated k8s.io/utils/pointer pkg

* Use the upstream fake client instead of the custom fake client

* Drop the custom fake client

* Drop the fake manager

* Use consistent naming for the manager

* Drop custom OpenAPIConfig instead of the default one from custom-metrics-apiserver

See #8 (comment)

* Adapt to the breaking change how the cache is restricted to object with label selectors
  • Loading branch information
@ialidzhikov
ialidzhikov authored Apr 10, 2024
1 parent 25738b8 commit 7346aef
Show file tree
Hide file tree
Showing 29 changed files with 412 additions and 3,184 deletions.
13 changes: 1 addition & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,10 @@ tidy:
clean:
@$(REPO_ROOT)/third_party/gardener/gardener/hack/clean.sh ./cmd/... ./pkg/...

.PHONY: check-generate
check-generate:
echo "Code generation is currently not implemented"
# @$(REPO_ROOT)/third_party/gardener/gardener/hack/check-generate.sh $(REPO_ROOT)

.PHONY: check
check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
@$(REPO_ROOT)/third_party/gardener/gardener/hack/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/...

.PHONY: generate
generate: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(YQ)
echo "Code generation is currently not implemented"
# @$(REPO_ROOT)/third_party/gardener/gardener/hack/generate.sh ./cmd/... ./pkg/...
# $(MAKE) format

.PHONY: format
format: $(GOIMPORTS) $(GOIMPORTSREVISER)
@$(REPO_ROOT)/third_party/gardener/gardener/hack/format.sh ./cmd ./pkg
Expand All @@ -115,7 +104,7 @@ test-clean:
verify: check format test

.PHONY: verify-extended
verify-extended: check-generate check format test-cov test-clean
verify-extended: check format test-cov test-clean

# skaffold dev and debug clean up deployed modules by default, disable this
debug: export SKAFFOLD_CLEANUP = false
Expand Down
18 changes: 9 additions & 9 deletions cmd/gardener-custom-metrics/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"k8s.io/component-base/version"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
kmgr "sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/manager"

"github.com/gardener/gardener-custom-metrics/pkg/app"
"github.com/gardener/gardener-custom-metrics/pkg/ha"
Expand Down Expand Up @@ -75,7 +75,7 @@ func getRootCommand() *cobra.Command {
// completeAppCLIOptions completes initialisation based on application-level CLI options.
// Upon error, any of the returned Logger, Manager, and HAService may be nil.
func completeAppCLIOptions(
ctx context.Context, appOptions *app.CLIOptions) (*logr.Logger, kmgr.Manager, *ha.HAService, error) {
ctx context.Context, appOptions *app.CLIOptions) (*logr.Logger, manager.Manager, *ha.HAService, error) {

if err := appOptions.Complete(); err != nil {
return nil, nil, nil, fmt.Errorf("completing application level CLI options: %w", err)
Expand All @@ -91,15 +91,15 @@ func completeAppCLIOptions(
return &log, nil, nil, fmt.Errorf("create client set: %w", err)
}
log.V(app.VerbosityVerbose).Info("Creating controller manager")
manager, err := kmgr.New(appOptions.RestOptions.Completed().Config, appOptions.Completed().ManagerOptions())
mgr, err := manager.New(appOptions.RestOptions.Completed().Config, appOptions.Completed().ManagerOptions())
if err != nil {
return &log, nil, nil, fmt.Errorf("creating controller manager: %w", err)
}

// Create HA service
haService := ha.NewHAService(manager, appOptions.Namespace, appOptions.AccessIPAddress, appOptions.AccessPort, log)
haService := ha.NewHAService(mgr.GetAPIReader(), mgr.GetClient(), appOptions.Namespace, appOptions.AccessIPAddress, appOptions.AccessPort, log)

return &log, manager, haService, nil
return &log, mgr, haService, nil
}

// completeInputServiceCLIOptions completes initialisation based on CLI options related to input data processing.
Expand All @@ -113,20 +113,20 @@ func completeInputServiceCLIOptions(options *input.CLIOptions, log logr.Logger)
}

// completeMetircsProviderServiceCLIOptions completes initialisation based on CLI options related to metrics serving.
// It returns a [kmgr.Runnable] which can be executed under the supervision of a controller manager.
// It returns a [manager.Runnable] which can be executed under the supervision of a controller manager.
//
// The onFailedFunc parameter is a function which will be called by the [kmgr.Runnable] if it fails.
// The onFailedFunc parameter is a function which will be called by the [manager.Runnable] if it fails.
func completeMetircsProviderServiceCLIOptions(
metricsService *metrics_provider.MetricsProviderService,
inputService input.InputDataService,
log logr.Logger,
onFailedFunc context.CancelFunc) (kmgr.RunnableFunc, error) {
onFailedFunc context.CancelFunc) (manager.RunnableFunc, error) {

if err := metricsService.CompleteCLIConfiguration(inputService.DataSource(), log); err != nil {
return nil, fmt.Errorf("configure metrics adapter based on command line arguments: %w", err)
}

var metricsProviderRunnable kmgr.RunnableFunc = func(ctx context.Context) error {
var metricsProviderRunnable manager.RunnableFunc = func(ctx context.Context) error {
if err := metricsService.Run(ctx.Done()); err != nil {
log.V(app.VerbosityError).Error(err, "Failed to run custom metrics adapter")
onFailedFunc()
Expand Down
140 changes: 71 additions & 69 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,109 +5,111 @@ go 1.22.0
require (
github.com/go-logr/logr v1.2.4
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.8
github.com/spf13/cobra v1.6.1
github.com/onsi/gomega v1.27.10
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
go.uber.org/atomic v1.7.0
go.uber.org/zap v1.21.0
go.uber.org/atomic v1.10.0
go.uber.org/zap v1.25.0
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
golang.org/x/time v0.3.0
golang.org/x/tools v0.9.3
k8s.io/api v0.23.17
k8s.io/apimachinery v0.23.17
k8s.io/apiserver v0.23.17
k8s.io/client-go v0.23.17
k8s.io/component-base v0.23.17
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
k8s.io/metrics v0.23.17
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/controller-runtime v0.11.2
sigs.k8s.io/custom-metrics-apiserver v1.23.0
k8s.io/api v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/apiserver v0.28.3
k8s.io/client-go v0.28.3
k8s.io/component-base v0.28.3
k8s.io/metrics v0.28.1
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.16.5
sigs.k8s.io/custom-metrics-apiserver v1.28.0
)

require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/PuerkitoBio/purell v1.2.0 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/emicklei/go-restful-swagger12 v0.0.0-20201014110547-68ccff494617 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/zapr v1.2.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.11.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.31.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/spf13/afero v1.9.4 // indirect
github.com/stretchr/testify v1.8.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
k8s.io/klog/v2 v2.60.1 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kms v0.28.3 // indirect
k8s.io/kube-openapi v0.0.0-20230901164831-6c774f458599 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 7346aef

Please sign in to comment.