Skip to content

Commit 3367210

Browse files
sbueringersbueringer
committed
fixups
1 parent 712285b commit 3367210

File tree

10 files changed

+99
-91
lines changed

10 files changed

+99
-91
lines changed

‎controlplane/kubeadm/internal/webhooks/scale_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ func TestKubeadmControlPlaneValidateScale(t *testing.T) {
136136
name string
137137
admissionRequest admission.Request
138138
expectRespAllowed bool
139-
expectRespReason string
139+
expectRespMessage string
140140
}{
141141
{
142142
name: "should return error when trying to scale to zero",
143143
expectRespAllowed: false,
144-
expectRespReason: "replicas cannot be 0",
144+
expectRespMessage: "replicas cannot be 0",
145145
admissionRequest: admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{
146146
UID: uuid.NewUUID(),
147147
Kind: metav1.GroupVersionKind{Group: "autoscaling", Version: "v1", Kind: "Scale"},
@@ -152,7 +152,7 @@ func TestKubeadmControlPlaneValidateScale(t *testing.T) {
152152
{
153153
name: "should return error when trying to scale to even number of replicas with managed etcd",
154154
expectRespAllowed: false,
155-
expectRespReason: "replicas cannot be an even number when etcd is stacked",
155+
expectRespMessage: "replicas cannot be an even number when etcd is stacked",
156156
admissionRequest: admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{
157157
UID: uuid.NewUUID(),
158158
Kind: metav1.GroupVersionKind{Group: "autoscaling", Version: "v1", Kind: "Scale"},
@@ -163,7 +163,7 @@ func TestKubeadmControlPlaneValidateScale(t *testing.T) {
163163
{
164164
name: "should allow odd number of replicas with managed etcd",
165165
expectRespAllowed: true,
166-
expectRespReason: "",
166+
expectRespMessage: "",
167167
admissionRequest: admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{
168168
UID: uuid.NewUUID(),
169169
Kind: metav1.GroupVersionKind{Group: "autoscaling", Version: "v1", Kind: "Scale"},
@@ -174,7 +174,7 @@ func TestKubeadmControlPlaneValidateScale(t *testing.T) {
174174
{
175175
name: "should allow even number of replicas with external etcd",
176176
expectRespAllowed: true,
177-
expectRespReason: "",
177+
expectRespMessage: "",
178178
admissionRequest: admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{
179179
UID: uuid.NewUUID(),
180180
Kind: metav1.GroupVersionKind{Group: "autoscaling", Version: "v1", Kind: "Scale"},
@@ -185,7 +185,7 @@ func TestKubeadmControlPlaneValidateScale(t *testing.T) {
185185
{
186186
name: "should allow odd number of replicas with external etcd",
187187
expectRespAllowed: true,
188-
expectRespReason: "",
188+
expectRespMessage: "",
189189
admissionRequest: admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{
190190
UID: uuid.NewUUID(),
191191
Kind: metav1.GroupVersionKind{Group: "autoscaling", Version: "v1", Kind: "Scale"},
@@ -208,7 +208,7 @@ func TestKubeadmControlPlaneValidateScale(t *testing.T) {
208208

209209
resp := scaleHandler.Handle(context.Background(), tt.admissionRequest)
210210
g.Expect(resp.Allowed).Should(Equal(tt.expectRespAllowed))
211-
g.Expect(string(resp.Result.Reason)).Should(Equal(tt.expectRespReason))
211+
g.Expect(resp.Result.Message).Should(Equal(tt.expectRespMessage))
212212
})
213213
}
214214
}

‎go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ require (
3333
golang.org/x/net v0.5.0 // indirect
3434
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
3535
google.golang.org/grpc v1.52.0
36-
k8s.io/api v0.26.0
37-
k8s.io/apiextensions-apiserver v0.26.0
38-
k8s.io/apimachinery v0.26.0
39-
k8s.io/apiserver v0.26.0
40-
k8s.io/client-go v0.26.0
36+
k8s.io/api v0.26.1
37+
k8s.io/apiextensions-apiserver v0.26.1
38+
k8s.io/apimachinery v0.26.1
39+
k8s.io/apiserver v0.26.1
40+
k8s.io/client-go v0.26.1
4141
k8s.io/cluster-bootstrap v0.25.0
42-
k8s.io/component-base v0.26.0
42+
k8s.io/component-base v0.26.1
4343
k8s.io/klog/v2 v2.90.0
4444
k8s.io/kubectl v0.25.0
4545
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
46-
sigs.k8s.io/controller-runtime v0.13.1-0.20230126193828-4a538741e9ae
46+
sigs.k8s.io/controller-runtime v0.13.1-0.20230126204625-80c18945360d
4747
sigs.k8s.io/yaml v1.3.0
4848
)
4949

@@ -74,7 +74,7 @@ require (
7474
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7575
github.com/golang/protobuf v1.5.2 // indirect
7676
github.com/google/btree v1.0.1 // indirect
77-
github.com/google/cel-go v0.12.5 // indirect
77+
github.com/google/cel-go v0.12.6 // indirect
7878
github.com/google/go-querystring v1.1.0 // indirect
7979
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8080
github.com/google/uuid v1.3.0 // indirect

‎go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
235235
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
236236
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
237237
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
238-
github.com/google/cel-go v0.12.5 h1:DmzaiSgoaqGCjtpPQWl26/gND+yRpim56H1jCVev6d8=
239-
github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
238+
github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
239+
github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
240240
github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
241241
github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
242242
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -992,22 +992,22 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
992992
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
993993
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
994994
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
995-
k8s.io/api v0.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I=
996-
k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
997-
k8s.io/apiextensions-apiserver v0.26.0 h1:Gy93Xo1eg2ZIkNX/8vy5xviVSxwQulsnUdQ00nEdpDo=
998-
k8s.io/apiextensions-apiserver v0.26.0/go.mod h1:7ez0LTiyW5nq3vADtK6C3kMESxadD51Bh6uz3JOlqWQ=
999-
k8s.io/apimachinery v0.26.0 h1:1feANjElT7MvPqp0JT6F3Ss6TWDwmcjLypwoPpEf7zg=
1000-
k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
1001-
k8s.io/apiserver v0.26.0 h1:q+LqIK5EZwdznGZb8bq0+a+vCqdeEEe4Ux3zsOjbc4o=
1002-
k8s.io/apiserver v0.26.0/go.mod h1:aWhlLD+mU+xRo+zhkvP/gFNbShI4wBDHS33o0+JGI84=
995+
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
996+
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
997+
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
998+
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
999+
k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
1000+
k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
1001+
k8s.io/apiserver v0.26.1 h1:6vmnAqCDO194SVCPU3MU8NcDgSqsUA62tBUSWrFXhsc=
1002+
k8s.io/apiserver v0.26.1/go.mod h1:wr75z634Cv+sifswE9HlAo5FQ7UoUauIICRlOE+5dCg=
10031003
k8s.io/cli-runtime v0.25.0 h1:XBnTc2Fi+w818jcJGzhiJKQuXl8479sZ4FhtV5hVJ1Q=
10041004
k8s.io/cli-runtime v0.25.0/go.mod h1:bHOI5ZZInRHhbq12OdUiYZQN8ml8aKZLwQgt9QlLINw=
1005-
k8s.io/client-go v0.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8=
1006-
k8s.io/client-go v0.26.0/go.mod h1:I2Sh57A79EQsDmn7F7ASpmru1cceh3ocVT9KlX2jEZg=
1005+
k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
1006+
k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
10071007
k8s.io/cluster-bootstrap v0.25.0 h1:KJ2/r0dV+bLfTK5EBobAVKvjGel3N4Qqh3bvnzh9qPk=
10081008
k8s.io/cluster-bootstrap v0.25.0/go.mod h1:x/TCtY3EiuR/rODkA3SvVQT3uSssQLf9cXcmSjdDTe0=
1009-
k8s.io/component-base v0.26.0 h1:0IkChOCohtDHttmKuz+EP3j3+qKmV55rM9gIFTXA7Vs=
1010-
k8s.io/component-base v0.26.0/go.mod h1:lqHwlfV1/haa14F/Z5Zizk5QmzaVf23nQzCwVOQpfC8=
1009+
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
1010+
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
10111011
k8s.io/klog/v2 v2.90.0 h1:VkTxIV/FjRXn1fgNNcKGM8cfmL1Z33ZjXRTVxKCoF5M=
10121012
k8s.io/klog/v2 v2.90.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
10131013
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
@@ -1019,8 +1019,8 @@ k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt
10191019
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
10201020
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10211021
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1022-
sigs.k8s.io/controller-runtime v0.13.1-0.20230126193828-4a538741e9ae h1:EX/PsVVsre0kS1FWTiwqK7HUGcx/uiweaBu0wOcYzT0=
1023-
sigs.k8s.io/controller-runtime v0.13.1-0.20230126193828-4a538741e9ae/go.mod h1:02yx6lc8hZR86B6ab7aqiXZe/ibqk8p3+TTRIXyQkEw=
1022+
sigs.k8s.io/controller-runtime v0.13.1-0.20230126204625-80c18945360d h1:ppL60uS4w2++jDNN/ff5v5Gr+Me0XDm0JG5JI7vLCSU=
1023+
sigs.k8s.io/controller-runtime v0.13.1-0.20230126204625-80c18945360d/go.mod h1:BJ3SRFOjSMsr/dVwh6XA8ryXgiEWcsraoM5l8rFhzHA=
10241024
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
10251025
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
10261026
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=

‎hack/tools/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ require (
1616
golang.org/x/tools v0.2.0
1717
google.golang.org/api v0.107.0
1818
helm.sh/helm/v3 v3.10.3
19-
k8s.io/api v0.26.0
20-
k8s.io/apiextensions-apiserver v0.26.0
21-
k8s.io/apimachinery v0.26.0
22-
k8s.io/client-go v0.26.0
19+
k8s.io/api v0.26.1
20+
k8s.io/apiextensions-apiserver v0.26.1
21+
k8s.io/apimachinery v0.26.1
22+
k8s.io/client-go v0.26.1
2323
k8s.io/klog/v2 v2.90.0
2424
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
2525
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
2626
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
2727
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
28-
sigs.k8s.io/controller-runtime v0.13.1-0.20230126193828-4a538741e9ae
28+
sigs.k8s.io/controller-runtime v0.13.1-0.20230126204625-80c18945360d
2929
sigs.k8s.io/controller-tools v0.10.0
3030
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d
3131
sigs.k8s.io/kustomize/api v0.12.1
@@ -74,7 +74,7 @@ require (
7474
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7575
github.com/golang/protobuf v1.5.2 // indirect
7676
github.com/google/btree v1.0.1 // indirect
77-
github.com/google/cel-go v0.12.5 // indirect
77+
github.com/google/cel-go v0.12.6 // indirect
7878
github.com/google/gnostic v0.6.9 // indirect
7979
github.com/google/go-cmp v0.5.9 // indirect
8080
github.com/google/go-github/v48 v48.2.0 // indirect
@@ -148,10 +148,10 @@ require (
148148
gopkg.in/ini.v1 v1.67.0 // indirect
149149
gopkg.in/yaml.v2 v2.4.0 // indirect
150150
gopkg.in/yaml.v3 v3.0.1 // indirect
151-
k8s.io/apiserver v0.26.0 // indirect
151+
k8s.io/apiserver v0.26.1 // indirect
152152
k8s.io/cli-runtime v0.25.2 // indirect
153153
k8s.io/cluster-bootstrap v0.25.0 // indirect
154-
k8s.io/component-base v0.26.0 // indirect
154+
k8s.io/component-base v0.26.1 // indirect
155155
oras.land/oras-go v1.2.0 // indirect
156156
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
157157
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect

‎hack/tools/go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
239239
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
240240
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
241241
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
242-
github.com/google/cel-go v0.12.5 h1:DmzaiSgoaqGCjtpPQWl26/gND+yRpim56H1jCVev6d8=
243-
github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
242+
github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
243+
github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
244244
github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
245245
github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
246246
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -987,22 +987,22 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
987987
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
988988
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
989989
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
990-
k8s.io/api v0.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I=
991-
k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
992-
k8s.io/apiextensions-apiserver v0.26.0 h1:Gy93Xo1eg2ZIkNX/8vy5xviVSxwQulsnUdQ00nEdpDo=
993-
k8s.io/apiextensions-apiserver v0.26.0/go.mod h1:7ez0LTiyW5nq3vADtK6C3kMESxadD51Bh6uz3JOlqWQ=
994-
k8s.io/apimachinery v0.26.0 h1:1feANjElT7MvPqp0JT6F3Ss6TWDwmcjLypwoPpEf7zg=
995-
k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
996-
k8s.io/apiserver v0.26.0 h1:q+LqIK5EZwdznGZb8bq0+a+vCqdeEEe4Ux3zsOjbc4o=
997-
k8s.io/apiserver v0.26.0/go.mod h1:aWhlLD+mU+xRo+zhkvP/gFNbShI4wBDHS33o0+JGI84=
990+
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
991+
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
992+
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
993+
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
994+
k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
995+
k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
996+
k8s.io/apiserver v0.26.1 h1:6vmnAqCDO194SVCPU3MU8NcDgSqsUA62tBUSWrFXhsc=
997+
k8s.io/apiserver v0.26.1/go.mod h1:wr75z634Cv+sifswE9HlAo5FQ7UoUauIICRlOE+5dCg=
998998
k8s.io/cli-runtime v0.25.2 h1:XOx+SKRjBpYMLY/J292BHTkmyDffl/qOx3YSuFZkTuc=
999999
k8s.io/cli-runtime v0.25.2/go.mod h1:OQx3+/0st6x5YpkkJQlEWLC73V0wHsOFMC1/roxV8Oc=
1000-
k8s.io/client-go v0.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8=
1001-
k8s.io/client-go v0.26.0/go.mod h1:I2Sh57A79EQsDmn7F7ASpmru1cceh3ocVT9KlX2jEZg=
1000+
k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
1001+
k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
10021002
k8s.io/cluster-bootstrap v0.25.0 h1:KJ2/r0dV+bLfTK5EBobAVKvjGel3N4Qqh3bvnzh9qPk=
10031003
k8s.io/cluster-bootstrap v0.25.0/go.mod h1:x/TCtY3EiuR/rODkA3SvVQT3uSssQLf9cXcmSjdDTe0=
1004-
k8s.io/component-base v0.26.0 h1:0IkChOCohtDHttmKuz+EP3j3+qKmV55rM9gIFTXA7Vs=
1005-
k8s.io/component-base v0.26.0/go.mod h1:lqHwlfV1/haa14F/Z5Zizk5QmzaVf23nQzCwVOQpfC8=
1004+
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
1005+
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
10061006
k8s.io/klog/v2 v2.90.0 h1:VkTxIV/FjRXn1fgNNcKGM8cfmL1Z33ZjXRTVxKCoF5M=
10071007
k8s.io/klog/v2 v2.90.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
10081008
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
@@ -1014,8 +1014,8 @@ oras.land/oras-go v1.2.0/go.mod h1:pFNs7oHp2dYsYMSS82HaX5l4mpnGO7hbpPN6EWH2ltc=
10141014
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
10151015
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10161016
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1017-
sigs.k8s.io/controller-runtime v0.13.1-0.20230126193828-4a538741e9ae h1:EX/PsVVsre0kS1FWTiwqK7HUGcx/uiweaBu0wOcYzT0=
1018-
sigs.k8s.io/controller-runtime v0.13.1-0.20230126193828-4a538741e9ae/go.mod h1:02yx6lc8hZR86B6ab7aqiXZe/ibqk8p3+TTRIXyQkEw=
1017+
sigs.k8s.io/controller-runtime v0.13.1-0.20230126204625-80c18945360d h1:ppL60uS4w2++jDNN/ff5v5Gr+Me0XDm0JG5JI7vLCSU=
1018+
sigs.k8s.io/controller-runtime v0.13.1-0.20230126204625-80c18945360d/go.mod h1:BJ3SRFOjSMsr/dVwh6XA8ryXgiEWcsraoM5l8rFhzHA=
10191019
sigs.k8s.io/controller-tools v0.10.0 h1:0L5DTDTFB67jm9DkfrONgTGmfc/zYow0ZaHyppizU2U=
10201020
sigs.k8s.io/controller-tools v0.10.0/go.mod h1:uvr0EW6IsprfB0jpQq6evtKy+hHyHCXNfdWI5ONPx94=
10211021
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

‎internal/controllers/cluster/cluster_controller_phases_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ func TestClusterReconcilePhases(t *testing.T) {
137137
}
138138
r := &Reconciler{
139139
Client: c,
140+
scheme: c.Scheme(),
141+
mapper: c.RESTMapper(),
140142
}
141143

142144
res, err := r.reconcileInfrastructure(ctx, tt.cluster)
@@ -478,8 +480,12 @@ func TestClusterReconcilePhases_reconcileFailureDomains(t *testing.T) {
478480
objs = append(objs, &unstructured.Unstructured{Object: tt.infraRef})
479481
}
480482

483+
c := fake.NewClientBuilder().WithObjects(objs...).Build()
484+
481485
r := &Reconciler{
482-
Client: fake.NewClientBuilder().WithObjects(objs...).Build(),
486+
Client: c,
487+
scheme: c.Scheme(),
488+
mapper: c.RESTMapper(),
483489
}
484490

485491
_, err := r.reconcileInfrastructure(ctx, tt.cluster)

0 commit comments

Comments
 (0)