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.

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

⚠️ Remove deprecated manager options #2648

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions Makefile
Expand Up @@ -116,10 +116,6 @@ modules: ## Runs go mod to ensure modules are up to date.
cd $(ENVTEST_DIR); go mod tidy
cd $(SCRATCH_ENV_DIR); go mod tidy

sbueringer marked this conversation as resolved.
Show resolved Hide resolved
.PHONY: generate
generate: $(CONTROLLER_GEN) ## Runs controller-gen for internal types for config file
$(CONTROLLER_GEN) object paths="./pkg/config/v1alpha1/...;./examples/configfile/custom/v1alpha1/..."

## --------------------------------------
## Cleanup / Verification
## --------------------------------------
Expand All @@ -146,9 +142,4 @@ APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
verify-apidiff: $(GO_APIDIFF) ## Check for API differences
$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible

.PHONY: verify-generate
verify-generate: generate ## Verify generated files are up to date
@if !(git diff --quiet HEAD); then \
git diff; \
echo "generated files are out of date, run make generate"; exit 1; \
fi

8 changes: 0 additions & 8 deletions alias.go
Expand Up @@ -21,7 +21,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client/config"
cfg "sigs.k8s.io/controller-runtime/pkg/config"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -96,13 +95,6 @@ var (
// * $HOME/.kube/config if exists.
GetConfig = config.GetConfig

// ConfigFile returns the cfg.File function for deferred config file loading,
// this is passed into Options{}.From() to populate the Options fields for
// the manager.
//
// Deprecated: This is deprecated in favor of using Options directly.
ConfigFile = cfg.File

// NewControllerManagedBy returns a new controller builder that will be started by the provided Manager.
NewControllerManagedBy = builder.ControllerManagedBy

Expand Down
7 changes: 0 additions & 7 deletions examples/configfile/builtin/config.yaml

This file was deleted.

74 changes: 0 additions & 74 deletions examples/configfile/builtin/controller.go

This file was deleted.

72 changes: 0 additions & 72 deletions examples/configfile/builtin/main.go

This file was deleted.

8 changes: 0 additions & 8 deletions examples/configfile/custom/config.yaml

This file was deleted.

74 changes: 0 additions & 74 deletions examples/configfile/custom/controller.go

This file was deleted.

78 changes: 0 additions & 78 deletions examples/configfile/custom/main.go

This file was deleted.