Skip to content

Commit 7c157c8

Browse files
jimmidysonjimmidyson
authored
build: controller-runtime v0.17.2 (#440)
1 parent bb378ba commit 7c157c8

File tree

15 files changed

+299
-103
lines changed

15 files changed

+299
-103
lines changed

‎.github/dependabot.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ updates:
1717
patterns:
1818
- "k8s.io*"
1919
- "sigs.k8s.io*"
20-
# Remove this ignore once #402 is resolved.
21-
ignore:
22-
- dependency-name: "sigs.k8s.io/controller-runtime"
2320

2421
- package-ecosystem: "gomod"
2522
directory: "/common"
@@ -30,9 +27,6 @@ updates:
3027
patterns:
3128
- "k8s.io*"
3229
- "sigs.k8s.io*"
33-
# Remove this ignore once #402 is resolved.
34-
ignore:
35-
- dependency-name: "sigs.k8s.io/controller-runtime"
3630

3731
- package-ecosystem: "gomod"
3832
directory: "/api"
@@ -43,9 +37,6 @@ updates:
4337
patterns:
4438
- "k8s.io*"
4539
- "sigs.k8s.io*"
46-
# Remove this ignore once #402 is resolved.
47-
ignore:
48-
- dependency-name: "sigs.k8s.io/controller-runtime"
4940

5041
- package-ecosystem: "gomod"
5142
directory: "/hack/third-party/capa"

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
REPO_ROOT := $(CURDIR)
55

66
# Versions for tools that are not managed by devbox.
7-
ENVTEST_VERSION=1.27.x
7+
ENVTEST_VERSION=1.29.x
88

99
include make/all.mk

‎api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
k8s.io/apimachinery v0.29.2
1414
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
1515
sigs.k8s.io/cluster-api v1.6.3
16-
sigs.k8s.io/controller-runtime v0.17.0
16+
sigs.k8s.io/controller-runtime v0.17.2
1717
)
1818

1919
require (

‎api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,8 +830,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
830830
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
831831
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo=
832832
sigs.k8s.io/cluster-api v1.6.3/go.mod h1:4FzfgPPiYaFq8X9F9j2SvmggH/4OOLEDgVJuWDqKLig=
833-
sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s=
834-
sigs.k8s.io/controller-runtime v0.17.0/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
833+
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
834+
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
835835
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
836836
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
837837
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=

‎common/go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ go 1.21
88
replace github.com/d2iq-labs/capi-runtime-extensions/api => ../api
99

1010
require (
11-
github.com/avast/retry-go/v4 v4.5.1
1211
github.com/d2iq-labs/capi-runtime-extensions/api v0.0.0-00010101000000-000000000000
1312
github.com/evanphx/json-patch/v5 v5.9.0
1413
github.com/go-logr/logr v1.4.1
@@ -19,10 +18,9 @@ require (
1918
k8s.io/api v0.29.2
2019
k8s.io/apiextensions-apiserver v0.29.2
2120
k8s.io/apimachinery v0.29.2
22-
k8s.io/client-go v0.29.2
2321
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2422
sigs.k8s.io/cluster-api v1.6.3
25-
sigs.k8s.io/controller-runtime v0.17.1
23+
sigs.k8s.io/controller-runtime v0.17.2
2624
)
2725

2826
require (
@@ -33,7 +31,6 @@ require (
3331
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3432
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3533
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
36-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3734
github.com/fsnotify/fsnotify v1.7.0 // indirect
3835
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3936
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -77,6 +74,7 @@ require (
7774
gopkg.in/yaml.v2 v2.4.0 // indirect
7875
gopkg.in/yaml.v3 v3.0.1 // indirect
7976
k8s.io/apiserver v0.29.2 // indirect
77+
k8s.io/client-go v0.29.2 // indirect
8078
k8s.io/cluster-bootstrap v0.29.1 // indirect
8179
k8s.io/component-base v0.29.2 // indirect
8280
k8s.io/klog/v2 v2.120.1 // indirect

‎common/go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h
22
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
33
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY=
44
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
5-
github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
6-
github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
75
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
86
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
97
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -266,8 +264,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
266264
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
267265
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo=
268266
sigs.k8s.io/cluster-api v1.6.3/go.mod h1:4FzfgPPiYaFq8X9F9j2SvmggH/4OOLEDgVJuWDqKLig=
269-
sigs.k8s.io/controller-runtime v0.17.1 h1:V1dQELMGVk46YVXXQUbTFujU7u4DQj6YUj9Rb6cuzz8=
270-
sigs.k8s.io/controller-runtime v0.17.1/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
267+
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
268+
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
271269
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
272270
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
273271
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎common/pkg/k8s/client/fakessa/client.go

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

‎go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
sigs.k8s.io/cluster-api v1.6.3
3232
sigs.k8s.io/cluster-api-addon-provider-helm v0.1.1-alpha.1
3333
sigs.k8s.io/cluster-api/test v1.6.3
34-
sigs.k8s.io/controller-runtime v0.17.1
34+
sigs.k8s.io/controller-runtime v0.17.2
3535
sigs.k8s.io/yaml v1.4.0
3636
)
3737

@@ -47,7 +47,6 @@ require (
4747
github.com/alessio/shellescape v1.4.1 // indirect
4848
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
4949
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
50-
github.com/avast/retry-go/v4 v4.5.1 // indirect
5150
github.com/beorn7/perks v1.0.1 // indirect
5251
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5352
github.com/cloudflare/circl v1.3.7 // indirect

‎go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h
6464
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
6565
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY=
6666
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
67-
github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
68-
github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
6967
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
7068
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
7169
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -812,8 +810,8 @@ sigs.k8s.io/cluster-api-addon-provider-helm v0.1.1-alpha.1 h1:HfBfswOZk/oUsNfkp5
812810
sigs.k8s.io/cluster-api-addon-provider-helm v0.1.1-alpha.1/go.mod h1:SgeAkpyhAzK5GBPeqfYHbThpMptSXVhDcLyWbM6UTik=
813811
sigs.k8s.io/cluster-api/test v1.6.3 h1:ZCboLCTpKWzSbf+f7MpQT7EN8aeH9DNhJC1T9/vAuAM=
814812
sigs.k8s.io/cluster-api/test v1.6.3/go.mod h1:AKs25dgW6AnyGaQBoWuXfWnBs+FT7vJmAI/aox64DEI=
815-
sigs.k8s.io/controller-runtime v0.17.1 h1:V1dQELMGVk46YVXXQUbTFujU7u4DQj6YUj9Rb6cuzz8=
816-
sigs.k8s.io/controller-runtime v0.17.1/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
813+
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
814+
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
817815
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
818816
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
819817
sigs.k8s.io/kind v0.20.0 h1:f0sc3v9mQbGnjBUaqSFST1dwIuiikKVGgoTwpoP33a8=

‎make/go.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ define go_test
2525
-- \
2626
-covermode=atomic \
2727
-coverprofile=coverage.out \
28-
-race \
2928
-short \
3029
-v \
3130
$(if $(GOTEST_RUN),-run "$(GOTEST_RUN)") \

‎pkg/handlers/aws/mutation/metapatch_handler_test.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ package mutation
66
import (
77
"testing"
88

9-
"k8s.io/client-go/rest"
109
"sigs.k8s.io/controller-runtime/pkg/manager"
1110

1211
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1312
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
14-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client/fakessa"
1513
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/mutation/ami"
1614
amitests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/mutation/ami/tests"
1715
calicotests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/mutation/cni/calico/tests"
@@ -57,12 +55,7 @@ func workerPatchGeneratorFunc() func() mutation.GeneratePatches {
5755
func TestGeneratePatches(t *testing.T) {
5856
t.Parallel()
5957

60-
mgr, _ := manager.New(
61-
&rest.Config{},
62-
manager.Options{
63-
NewClient: fakessa.NewClient,
64-
},
65-
)
58+
mgr := testEnv.Manager
6659

6760
regiontests.TestGeneratePatches(
6861
t,

‎pkg/handlers/aws/mutation/suite_test.go

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright 2024 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package mutation
5+
6+
import (
7+
"fmt"
8+
"testing"
9+
10+
ctrl "sigs.k8s.io/controller-runtime"
11+
12+
"github.com/d2iq-labs/capi-runtime-extensions/test/helpers"
13+
)
14+
15+
var (
16+
testEnv *helpers.TestEnvironment
17+
ctx = ctrl.SetupSignalHandler()
18+
)
19+
20+
func TestMain(m *testing.M) {
21+
setup()
22+
defer teardown()
23+
m.Run()
24+
}
25+
26+
func setup() {
27+
testEnvConfig := helpers.NewTestEnvironmentConfiguration()
28+
var err error
29+
testEnv, err = testEnvConfig.Build()
30+
if err != nil {
31+
panic(err)
32+
}
33+
go func() {
34+
fmt.Println("Starting the manager")
35+
if err := testEnv.StartManager(ctx); err != nil {
36+
panic(fmt.Sprintf("Failed to start the envtest manager: %v", err))
37+
}
38+
}()
39+
}
40+
41+
func teardown() {
42+
if err := testEnv.Stop(); err != nil {
43+
panic(fmt.Sprintf("Failed to stop envtest: %v", err))
44+
}
45+
}

‎pkg/handlers/docker/mutation/metapatch_handler_test.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ package mutation
66
import (
77
"testing"
88

9-
"k8s.io/client-go/rest"
109
"sigs.k8s.io/controller-runtime/pkg/manager"
1110

1211
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
13-
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client/fakessa"
1412
dockerclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/clusterconfig"
1513
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/mutation/customimage"
1614
customimagetests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/mutation/customimage/tests"
@@ -47,12 +45,7 @@ func workerPatchGeneratorFunc() func() mutation.GeneratePatches {
4745
func TestGeneratePatches(t *testing.T) {
4846
t.Parallel()
4947

50-
mgr, _ := manager.New(
51-
&rest.Config{},
52-
manager.Options{
53-
NewClient: fakessa.NewClient,
54-
},
55-
)
48+
mgr := testEnv.Manager
5649

5750
customimagetests.TestControlPlaneGeneratePatches(
5851
t,

‎pkg/handlers/docker/mutation/suite_test.go

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright 2024 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package mutation
5+
6+
import (
7+
"fmt"
8+
"testing"
9+
10+
ctrl "sigs.k8s.io/controller-runtime"
11+
12+
"github.com/d2iq-labs/capi-runtime-extensions/test/helpers"
13+
)
14+
15+
var (
16+
testEnv *helpers.TestEnvironment
17+
ctx = ctrl.SetupSignalHandler()
18+
)
19+
20+
func TestMain(m *testing.M) {
21+
setup()
22+
defer teardown()
23+
m.Run()
24+
}
25+
26+
func setup() {
27+
testEnvConfig := helpers.NewTestEnvironmentConfiguration()
28+
var err error
29+
testEnv, err = testEnvConfig.Build()
30+
if err != nil {
31+
panic(err)
32+
}
33+
go func() {
34+
fmt.Println("Starting the manager")
35+
if err := testEnv.StartManager(ctx); err != nil {
36+
panic(fmt.Sprintf("Failed to start the envtest manager: %v", err))
37+
}
38+
}()
39+
}
40+
41+
func teardown() {
42+
if err := testEnv.Stop(); err != nil {
43+
panic(fmt.Sprintf("Failed to stop envtest: %v", err))
44+
}
45+
}

0 commit comments

Comments
 (0)