Skip to content

refactor: Move all helpers to common module #139

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 7, 2023
Merged

refactor: Move all helpers to common module #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion common/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ module github.com/d2iq-labs/capi-runtime-extensions/common
go 1.21

require (
github.com/go-logr/logr v1.2.4
github.com/onsi/gomega v1.27.10
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.2
gomodules.xyz/jsonpatch/v2 v2.4.0
k8s.io/apiextensions-apiserver v0.28.1
k8s.io/apimachinery v0.28.1
Expand All @@ -30,7 +32,6 @@ require (
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr 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
Expand All @@ -52,11 +53,13 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.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
github.com/valyala/fastjson v1.6.4 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions common/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA=
github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
Expand Down Expand Up @@ -275,6 +277,8 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand Down
0 common/pkg/handlers/interfaces.go → ...pi/clustertopology/handlers/interfaces.go
View file
Open in desktop
File renamed without changes.
0 common/pkg/handlers/lifecycle/interfaces.go → ...topology/handlers/lifecycle/interfaces.go
View file
Open in desktop
File renamed without changes.
0 common/pkg/handlers/mutation/interfaces.go → ...rtopology/handlers/mutation/interfaces.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...capi/clustertopology/patches/generator.go → ...capi/clustertopology/patches/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"

"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/matchers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/matchers"
)

func Generate[T runtime.Object](
Expand Down
0 ...clustertopology/patches/matchers/match.go → ...clustertopology/patches/matchers/match.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ertopology/patches/matchers/match_test.go → ...ertopology/patches/matchers/match_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"

"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/matchers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/matchers"
)

func TestMatchesSelector(t *testing.T) {
Expand Down
0 ...ertopology/patches/selectors/selectors.go → ...ertopology/patches/selectors/selectors.go
View file
Open in desktop
File renamed without changes.
0 ...api/clustertopology/variables/variable.go → ...api/clustertopology/variables/variable.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ustertopology/variables/variables_test.go → ...ustertopology/variables/variables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
. "github.com/onsi/gomega"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/variables"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
)

func TestGet(t *testing.T) {
Expand Down Expand Up @@ -70,7 +70,7 @@ func TestGet_ValidNestedFieldAsStruct(t *testing.T) {
}))
}

func TestGet_ValidNestedFieldAsScalar(t *testing.T) {
func TestGet_ValidNestedFieldAsPrimitive(t *testing.T) {
g := NewWithT(t)

sampleValue := []byte(`{"foo": {"bar": "baz"}}`)
Expand Down
0 pkg/k8s/annotations/annotations.go → common/pkg/k8s/annotations/annotations.go
View file
Open in desktop
File renamed without changes.
0 pkg/k8s/client/apply.go → common/pkg/k8s/client/apply.go
View file
Open in desktop
File renamed without changes.
0 pkg/k8s/parser/parser.go → common/pkg/k8s/parser/parser.go
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions pkg/k8s/parser/parser_test.go → common/pkg/k8s/parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/d2iq-labs/capi-runtime-extensions/pkg/k8s/parser"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/parser"
)

func dummyUnstructured(apiVersion, kind, namespace, name string) *unstructured.Unstructured {
func placeholderUnstructured(apiVersion, kind, namespace, name string) *unstructured.Unstructured {
u := &unstructured.Unstructured{}
u.SetAPIVersion(apiVersion)
u.SetKind(kind)
Expand Down Expand Up @@ -63,7 +63,7 @@ metadata:
namespace: a
name: b
`},
want: []client.Object{dummyUnstructured("some.api/v1", "Something", "a", "b")},
want: []client.Object{placeholderUnstructured("some.api/v1", "Something", "a", "b")},
}, {
name: "valid multiple k8s object YAML",
inputs: []string{`apiVersion: some.api/v1
Expand All @@ -79,8 +79,8 @@ metadata:
name: d
`},
want: []client.Object{
dummyUnstructured("some.api/v1", "Something", "a", "b"),
dummyUnstructured("another.api/v1", "SomethingElse", "c", "d"),
placeholderUnstructured("some.api/v1", "Something", "a", "b"),
placeholderUnstructured("another.api/v1", "SomethingElse", "c", "d"),
},
}, {
name: "valid multiple k8s object YAML including empty docs",
Expand All @@ -99,8 +99,8 @@ metadata:
---
`},
want: []client.Object{
dummyUnstructured("some.api/v1", "Something", "a", "b"),
dummyUnstructured("another.api/v1", "SomethingElse", "c", "d"),
placeholderUnstructured("some.api/v1", "Something", "a", "b"),
placeholderUnstructured("another.api/v1", "SomethingElse", "c", "d"),
},
}, {
name: "valid multiple k8s object YAML across multiple inputs",
Expand Down Expand Up @@ -129,10 +129,10 @@ metadata:
name: h`,
},
want: []client.Object{
dummyUnstructured("some.api/v1", "Something", "a", "b"),
dummyUnstructured("another.api/v1", "SomethingElse", "c", "d"),
dummyUnstructured("some.api/v2", "Something2", "e", "f"),
dummyUnstructured("another.api/v2", "SomethingElse2", "g", "h"),
placeholderUnstructured("some.api/v1", "Something", "a", "b"),
placeholderUnstructured("another.api/v1", "SomethingElse", "c", "d"),
placeholderUnstructured("some.api/v2", "Something2", "e", "f"),
placeholderUnstructured("another.api/v2", "SomethingElse2", "g", "h"),
},
}}

Expand Down
6 changes: 3 additions & 3 deletions common/pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"sigs.k8s.io/cluster-api/exp/runtime/server"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/lifecycle"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/lifecycle"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
)

type Server struct {
Expand Down
2 changes: 1 addition & 1 deletion common/pkg/testutils/capitest/patches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
)

type PatchTestDef struct {
Expand Down
2 changes: 1 addition & 1 deletion common/pkg/testutils/capitest/variables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/openapi"
)

Expand Down
12 changes: 6 additions & 6 deletions make/go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ test: ## Runs go tests for all modules in repository
ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
test: test.root
endif
ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
test: $(addprefix test.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
ifneq ($(words $(GO_SUBMODULES_NO_DOCS)),0)
test: $(addprefix test.,$(GO_SUBMODULES_NO_DOCS:/go.mod=))
endif

.PHONY: test.%
Expand All @@ -64,8 +64,8 @@ bench: ## Runs go benchmarks for all modules in repository
ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
bench: bench.root
endif
ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
bench: $(addprefix bench.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
ifneq ($(words $(GO_SUBMODULES_NO_DOCS)),0)
bench: $(addprefix bench.,$(GO_SUBMODULES_NO_DOCS:/go.mod=))
endif

.PHONY: bench.%
Expand Down Expand Up @@ -164,8 +164,8 @@ go-fix: ## Runs go fix for all modules in repository
ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
go-fix: go-fix.root
endif
ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
go-fix: $(addprefix go-fix.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
ifneq ($(words $(GO_SUBMODULES_NO_DOCS)),0)
go-fix: $(addprefix go-fix.,$(GO_SUBMODULES_NO_DOCS:/go.mod=))
endif

.PHONY: go-fix.%
Expand Down
2 changes: 1 addition & 1 deletion make/tag.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ifndef NEW_GIT_TAG
$(error Please specify git tag to create via NEW_GIT_TAG env var or make variable)
endif
$(foreach module,\
$(dir $(GO_SUBMODULES_NO_TOOLS)),\
$(dir $(GO_SUBMODULES_NO_DOCS)),\
git tag -s "$(module)$(NEW_GIT_TAG)" -a -m "$(module)$(NEW_GIT_TAG)";\
)
git tag -s "$(NEW_GIT_TAG)" -a -m "$(NEW_GIT_TAG)"
8 changes: 4 additions & 4 deletions pkg/handlers/auditpolicy/inject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/selectors"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/handlers/cni/calico/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/lifecycle"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/lifecycle"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/parser"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/cni"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/k8s/client"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/k8s/parser"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions pkg/handlers/extraapiservercertsans/inject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/selectors"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/variables"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/extraapiservercertsans/variables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/openapi/patterns"
)

Expand Down
10 changes: 5 additions & 5 deletions pkg/handlers/httpproxy/inject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/selectors"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/variables"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/httpproxy/variables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/servicelbgc/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"

"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/lifecycle"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/lifecycle"
)

type ServiceLoadBalancerGC struct {
Expand Down