Skip to content

Commit 0470607

Browse files
authored
⚠️ Remove deprecated manager options (#2648)
* remove options.AndFrom deprecation Signed-off-by: Troy Connor <troy0820@users.noreply.github.com> * remove config deprecations Signed-off-by: Troy Connor <troy0820@users.noreply.github.com> * remove make target verify-generate Signed-off-by: Troy Connor <troy0820@users.noreply.github.com> --------- Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
1 parent 67b27f2 commit 0470607

29 files changed

+2
-1466
lines changed

Makefile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ modules: ## Runs go mod to ensure modules are up to date.
116116
cd $(ENVTEST_DIR); go mod tidy
117117
cd $(SCRATCH_ENV_DIR); go mod tidy
118118

119-
.PHONY: generate
120-
generate: $(CONTROLLER_GEN) ## Runs controller-gen for internal types for config file
121-
$(CONTROLLER_GEN) object paths="./pkg/config/v1alpha1/...;./examples/configfile/custom/v1alpha1/..."
122-
123119
## --------------------------------------
124120
## Cleanup / Verification
125121
## --------------------------------------
@@ -146,9 +142,4 @@ APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
146142
verify-apidiff: $(GO_APIDIFF) ## Check for API differences
147143
$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible
148144

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

alias.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"k8s.io/apimachinery/pkg/runtime/schema"
2222
"sigs.k8s.io/controller-runtime/pkg/builder"
2323
"sigs.k8s.io/controller-runtime/pkg/client/config"
24-
cfg "sigs.k8s.io/controller-runtime/pkg/config"
2524
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2625
"sigs.k8s.io/controller-runtime/pkg/log"
2726
"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -96,13 +95,6 @@ var (
9695
// * $HOME/.kube/config if exists.
9796
GetConfig = config.GetConfig
9897

99-
// ConfigFile returns the cfg.File function for deferred config file loading,
100-
// this is passed into Options{}.From() to populate the Options fields for
101-
// the manager.
102-
//
103-
// Deprecated: This is deprecated in favor of using Options directly.
104-
ConfigFile = cfg.File
105-
10698
// NewControllerManagedBy returns a new controller builder that will be started by the provided Manager.
10799
NewControllerManagedBy = builder.ControllerManagedBy
108100

examples/configfile/builtin/config.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

examples/configfile/builtin/controller.go

Lines changed: 0 additions & 74 deletions
This file was deleted.

examples/configfile/builtin/main.go

Lines changed: 0 additions & 72 deletions
This file was deleted.

examples/configfile/custom/config.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/configfile/custom/controller.go

Lines changed: 0 additions & 74 deletions
This file was deleted.

examples/configfile/custom/main.go

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)