Skip to content

Commit

Permalink
remove config deprecations
Browse files Browse the repository at this point in the history
Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
  • Loading branch information
troy0820 committed Jan 11, 2024
1 parent ff81e15 commit 5c3d4ba
Show file tree
Hide file tree
Showing 26 changed files with 2 additions and 1,108 deletions.
11 changes: 1 addition & 10 deletions Makefile
Expand Up @@ -102,10 +102,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

.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 @@ -126,9 +122,4 @@ verify-modules: modules ## Verify go modules are up to date
echo "go module files are out of date, please run 'make modules'"; exit 1; \
fi

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

0 comments on commit 5c3d4ba

Please sign in to comment.