Skip to content

Commit c76e4b1

Browse files
jimmidysonjimmidyson
authored
refactor: Move all helpers to common module (#139)
1 parent 311b734 commit c76e4b1

File tree

27 files changed

+59
-52
lines changed

27 files changed

+59
-52
lines changed

‎common/go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ module github.com/d2iq-labs/capi-runtime-extensions/common
66
go 1.21
77

88
require (
9+
github.com/go-logr/logr v1.2.4
910
github.com/onsi/gomega v1.27.10
1011
github.com/spf13/pflag v1.0.5
12+
github.com/stretchr/testify v1.8.2
1113
gomodules.xyz/jsonpatch/v2 v2.4.0
1214
k8s.io/apiextensions-apiserver v0.28.1
1315
k8s.io/apimachinery v0.28.1
@@ -30,7 +32,6 @@ require (
3032
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3133
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3234
github.com/fsnotify/fsnotify v1.6.0 // indirect
33-
github.com/go-logr/logr v1.2.4 // indirect
3435
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3536
github.com/go-openapi/jsonreference v0.20.2 // indirect
3637
github.com/go-openapi/swag v0.22.3 // indirect
@@ -52,11 +53,13 @@ require (
5253
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5354
github.com/opencontainers/go-digest v1.0.0 // indirect
5455
github.com/pkg/errors v0.9.1 // indirect
56+
github.com/pmezard/go-difflib v1.0.0 // indirect
5557
github.com/prometheus/client_golang v1.16.0 // indirect
5658
github.com/prometheus/client_model v0.4.0 // indirect
5759
github.com/prometheus/common v0.44.0 // indirect
5860
github.com/prometheus/procfs v0.10.1 // indirect
5961
github.com/stoewer/go-strcase v1.2.0 // indirect
62+
github.com/valyala/fastjson v1.6.4 // indirect
6063
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
6164
golang.org/x/net v0.13.0 // indirect
6265
golang.org/x/oauth2 v0.10.0 // indirect

‎common/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+
8585
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
8686
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
8787
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
88+
github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA=
89+
github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
8890
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
8991
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
9092
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -275,6 +277,8 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
275277
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
276278
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
277279
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
280+
github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
281+
github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
278282
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
279283
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
280284
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎common/pkg/handlers/interfaces.go renamed to ‎common/pkg/capi/clustertopology/handlers/interfaces.go

File renamed without changes.

‎common/pkg/handlers/lifecycle/interfaces.go renamed to ‎common/pkg/capi/clustertopology/handlers/lifecycle/interfaces.go

File renamed without changes.

‎common/pkg/handlers/mutation/interfaces.go renamed to ‎common/pkg/capi/clustertopology/handlers/mutation/interfaces.go

File renamed without changes.

‎pkg/capi/clustertopology/patches/generator.go renamed to ‎common/pkg/capi/clustertopology/patches/generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1313
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1414

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

1818
func Generate[T runtime.Object](

‎pkg/capi/clustertopology/patches/matchers/match.go renamed to ‎common/pkg/capi/clustertopology/patches/matchers/match.go

File renamed without changes.

‎pkg/capi/clustertopology/patches/matchers/match_test.go renamed to ‎common/pkg/capi/clustertopology/patches/matchers/match_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1414
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1515

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

1919
func TestMatchesSelector(t *testing.T) {

‎pkg/capi/clustertopology/patches/selectors/selectors.go renamed to ‎common/pkg/capi/clustertopology/patches/selectors/selectors.go

File renamed without changes.

‎pkg/capi/clustertopology/variables/variable.go renamed to ‎common/pkg/capi/clustertopology/variables/variable.go

File renamed without changes.

‎pkg/capi/clustertopology/variables/variables_test.go renamed to ‎common/pkg/capi/clustertopology/variables/variables_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
. "github.com/onsi/gomega"
1010
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1111

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

1515
func TestGet(t *testing.T) {
@@ -70,7 +70,7 @@ func TestGet_ValidNestedFieldAsStruct(t *testing.T) {
7070
}))
7171
}
7272

73-
func TestGet_ValidNestedFieldAsScalar(t *testing.T) {
73+
func TestGet_ValidNestedFieldAsPrimitive(t *testing.T) {
7474
g := NewWithT(t)
7575

7676
sampleValue := []byte(`{"foo": {"bar": "baz"}}`)

‎pkg/k8s/annotations/annotations.go renamed to ‎common/pkg/k8s/annotations/annotations.go

File renamed without changes.

‎pkg/k8s/client/apply.go renamed to ‎common/pkg/k8s/client/apply.go

File renamed without changes.

‎pkg/k8s/parser/parser.go renamed to ‎common/pkg/k8s/parser/parser.go

File renamed without changes.

‎pkg/k8s/parser/parser_test.go renamed to ‎common/pkg/k8s/parser/parser_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1414
"sigs.k8s.io/controller-runtime/pkg/client"
1515

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

19-
func dummyUnstructured(apiVersion, kind, namespace, name string) *unstructured.Unstructured {
19+
func placeholderUnstructured(apiVersion, kind, namespace, name string) *unstructured.Unstructured {
2020
u := &unstructured.Unstructured{}
2121
u.SetAPIVersion(apiVersion)
2222
u.SetKind(kind)
@@ -63,7 +63,7 @@ metadata:
6363
namespace: a
6464
name: b
6565
`},
66-
want: []client.Object{dummyUnstructured("some.api/v1", "Something", "a", "b")},
66+
want: []client.Object{placeholderUnstructured("some.api/v1", "Something", "a", "b")},
6767
}, {
6868
name: "valid multiple k8s object YAML",
6969
inputs: []string{`apiVersion: some.api/v1
@@ -79,8 +79,8 @@ metadata:
7979
name: d
8080
`},
8181
want: []client.Object{
82-
dummyUnstructured("some.api/v1", "Something", "a", "b"),
83-
dummyUnstructured("another.api/v1", "SomethingElse", "c", "d"),
82+
placeholderUnstructured("some.api/v1", "Something", "a", "b"),
83+
placeholderUnstructured("another.api/v1", "SomethingElse", "c", "d"),
8484
},
8585
}, {
8686
name: "valid multiple k8s object YAML including empty docs",
@@ -99,8 +99,8 @@ metadata:
9999
---
100100
`},
101101
want: []client.Object{
102-
dummyUnstructured("some.api/v1", "Something", "a", "b"),
103-
dummyUnstructured("another.api/v1", "SomethingElse", "c", "d"),
102+
placeholderUnstructured("some.api/v1", "Something", "a", "b"),
103+
placeholderUnstructured("another.api/v1", "SomethingElse", "c", "d"),
104104
},
105105
}, {
106106
name: "valid multiple k8s object YAML across multiple inputs",
@@ -129,10 +129,10 @@ metadata:
129129
name: h`,
130130
},
131131
want: []client.Object{
132-
dummyUnstructured("some.api/v1", "Something", "a", "b"),
133-
dummyUnstructured("another.api/v1", "SomethingElse", "c", "d"),
134-
dummyUnstructured("some.api/v2", "Something2", "e", "f"),
135-
dummyUnstructured("another.api/v2", "SomethingElse2", "g", "h"),
132+
placeholderUnstructured("some.api/v1", "Something", "a", "b"),
133+
placeholderUnstructured("another.api/v1", "SomethingElse", "c", "d"),
134+
placeholderUnstructured("some.api/v2", "Something2", "e", "f"),
135+
placeholderUnstructured("another.api/v2", "SomethingElse2", "g", "h"),
136136
},
137137
}}
138138

‎common/pkg/server/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"sigs.k8s.io/cluster-api/exp/runtime/server"
1414
ctrl "sigs.k8s.io/controller-runtime"
1515

16-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
17-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/lifecycle"
18-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
16+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
17+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/lifecycle"
18+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
1919
)
2020

2121
type Server struct {

‎common/pkg/testutils/capitest/patches.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
2222
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
2323

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

2727
type PatchTestDef struct {

‎common/pkg/testutils/capitest/variables.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1616
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1717

18-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
18+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
1919
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/openapi"
2020
)
2121

‎make/go.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ test: ## Runs go tests for all modules in repository
4040
ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
4141
test: test.root
4242
endif
43-
ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
44-
test: $(addprefix test.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
43+
ifneq ($(words $(GO_SUBMODULES_NO_DOCS)),0)
44+
test: $(addprefix test.,$(GO_SUBMODULES_NO_DOCS:/go.mod=))
4545
endif
4646

4747
.PHONY: test.%
@@ -64,8 +64,8 @@ bench: ## Runs go benchmarks for all modules in repository
6464
ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
6565
bench: bench.root
6666
endif
67-
ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
68-
bench: $(addprefix bench.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
67+
ifneq ($(words $(GO_SUBMODULES_NO_DOCS)),0)
68+
bench: $(addprefix bench.,$(GO_SUBMODULES_NO_DOCS:/go.mod=))
6969
endif
7070

7171
.PHONY: bench.%
@@ -164,8 +164,8 @@ go-fix: ## Runs go fix for all modules in repository
164164
ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
165165
go-fix: go-fix.root
166166
endif
167-
ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
168-
go-fix: $(addprefix go-fix.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
167+
ifneq ($(words $(GO_SUBMODULES_NO_DOCS)),0)
168+
go-fix: $(addprefix go-fix.,$(GO_SUBMODULES_NO_DOCS:/go.mod=))
169169
endif
170170

171171
.PHONY: go-fix.%

‎make/tag.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ifndef NEW_GIT_TAG
77
$(error Please specify git tag to create via NEW_GIT_TAG env var or make variable)
88
endif
99
$(foreach module,\
10-
$(dir $(GO_SUBMODULES_NO_TOOLS)),\
10+
$(dir $(GO_SUBMODULES_NO_DOCS)),\
1111
git tag -s "$(module)$(NEW_GIT_TAG)" -a -m "$(module)$(NEW_GIT_TAG)";\
1212
)
1313
git tag -s "$(NEW_GIT_TAG)" -a -m "$(NEW_GIT_TAG)"

‎pkg/handlers/auditpolicy/inject.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
ctrl "sigs.k8s.io/controller-runtime"
1818
"sigs.k8s.io/controller-runtime/pkg/client"
1919

20-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
21-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
22-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches"
23-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/selectors"
20+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
21+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
22+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
23+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
2424
)
2525

2626
const (

‎pkg/handlers/cni/calico/handler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2424
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2525

26-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
27-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/lifecycle"
26+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
27+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/lifecycle"
28+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client"
29+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/parser"
2830
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/cni"
29-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/k8s/client"
30-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/k8s/parser"
3131
)
3232

3333
const (

‎pkg/handlers/extraapiservercertsans/inject.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
ctrl "sigs.k8s.io/controller-runtime"
1818
"sigs.k8s.io/controller-runtime/pkg/client"
1919

20-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
21-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
22-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches"
23-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/selectors"
24-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/variables"
20+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
21+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
22+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
23+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
24+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
2525
)
2626

2727
const (

‎pkg/handlers/extraapiservercertsans/variables.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1010
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1111

12-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
13-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
12+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
13+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
1414
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/openapi/patterns"
1515
)
1616

‎pkg/handlers/httpproxy/inject.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
ctrl "sigs.k8s.io/controller-runtime"
2222
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2323

24-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
25-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
26-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches"
27-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/patches/selectors"
28-
"github.com/d2iq-labs/capi-runtime-extensions/pkg/capi/clustertopology/variables"
24+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
25+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
26+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
27+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
28+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
2929
)
3030

3131
const (

‎pkg/handlers/httpproxy/variables.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1010
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1111

12-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
13-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/mutation"
12+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
13+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
1414
)
1515

1616
var (

‎pkg/handlers/servicelbgc/handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
ctrl "sigs.k8s.io/controller-runtime"
1414
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
1515

16-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers"
17-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/handlers/lifecycle"
16+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
17+
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/lifecycle"
1818
)
1919

2020
type ServiceLoadBalancerGC struct {

0 commit comments

Comments
 (0)