Skip to content

Commit 9d0392c

Browse files
committed
remove config deprecations
Signed-off-by: Troy Connor <[email protected]>
1 parent 93ac176 commit 9d0392c

24 files changed

+2
-1105
lines changed

Makefile

+1-10
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ modules: ## Runs go mod to ensure modules are up to date.
102102
cd $(ENVTEST_DIR); go mod tidy
103103
cd $(SCRATCH_ENV_DIR); go mod tidy
104104

105-
.PHONY: generate
106-
generate: $(CONTROLLER_GEN) ## Runs controller-gen for internal types for config file
107-
$(CONTROLLER_GEN) object paths="./pkg/config/v1alpha1/...;./examples/configfile/custom/v1alpha1/..."
108-
109105
## --------------------------------------
110106
## Cleanup / Verification
111107
## --------------------------------------
@@ -126,9 +122,4 @@ verify-modules: modules ## Verify go modules are up to date
126122
echo "go module files are out of date, please run 'make modules'"; exit 1; \
127123
fi
128124

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

alias.go

-8
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

-7
This file was deleted.

examples/configfile/builtin/controller.go

-74
This file was deleted.

examples/configfile/builtin/main.go

-72
This file was deleted.

examples/configfile/custom/config.yaml

-8
This file was deleted.

examples/configfile/custom/controller.go

-74
This file was deleted.

examples/configfile/custom/main.go

-78
This file was deleted.

0 commit comments

Comments
 (0)