Skip to content

Commit 289fdf4

Browse files
abaysabays
authored
Merge pull request #554 from openstack-k8s-operators/renovate/k8s.io
Update k8s.io to v0.28.13
2 parents 0ae9f7f + 7b917a0 commit 289fdf4

15 files changed

Lines changed: 65 additions & 65 deletions

File tree

‎modules/certmanager/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240122120141-2eff3281aef1
1212
go.uber.org/zap v1.27.0
1313
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
14-
k8s.io/api v0.28.12
15-
k8s.io/apimachinery v0.28.12
16-
k8s.io/client-go v0.28.12
14+
k8s.io/api v0.28.13
15+
k8s.io/apimachinery v0.28.13
16+
k8s.io/client-go v0.28.13
1717
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
1818
sigs.k8s.io/controller-runtime v0.16.6
1919
)
@@ -67,8 +67,8 @@ require (
6767
gopkg.in/inf.v0 v0.9.1 // indirect
6868
gopkg.in/yaml.v2 v2.4.0 // indirect
6969
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/apiextensions-apiserver v0.28.12 // indirect
71-
k8s.io/component-base v0.28.12 // indirect
70+
k8s.io/apiextensions-apiserver v0.28.13 // indirect
71+
k8s.io/component-base v0.28.13 // indirect
7272
k8s.io/klog/v2 v2.110.1 // indirect
7373
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
7474
sigs.k8s.io/gateway-api v0.6.0 // indirect

‎modules/certmanager/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,16 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
197197
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
198198
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
199199
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
200-
k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ=
201-
k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ=
202-
k8s.io/apiextensions-apiserver v0.28.12 h1:6GA64rylk5q0mbXfHHFVgfL1jx/4p6RU+Y+ni2DUuZc=
203-
k8s.io/apiextensions-apiserver v0.28.12/go.mod h1:Len29ySvb/fnrXvioTxg2l6iFi97B53Bm3/jBMBllCE=
204-
k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0=
205-
k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
206-
k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec=
207-
k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE=
208-
k8s.io/component-base v0.28.12 h1:ZNq6QFFGCPjaAzWqYHaQRoAY5seoK3vP0pZOjgxOzNc=
209-
k8s.io/component-base v0.28.12/go.mod h1:8zI5TmGuHX6R5Lay61Ox7wb+dsEENl0NBmVSiHMQu1c=
200+
k8s.io/api v0.28.13 h1:0Sw8MjdkmrJAF/uVv09HXSZ3cQauVyZHQWKt8hiiKo4=
201+
k8s.io/api v0.28.13/go.mod h1:7hlRF5wArzXf0qbRRT2TMtHRa5SHBEVJhA02JpTxj9Q=
202+
k8s.io/apiextensions-apiserver v0.28.13 h1:+Q3jtMXBxvURuW0tzW1UsZMPud3T4OvgVPuI/uQUEQ8=
203+
k8s.io/apiextensions-apiserver v0.28.13/go.mod h1:yThTxyuc0ba1rXKZNK2aQNIbFxmGcU+CPc8YB40IGj0=
204+
k8s.io/apimachinery v0.28.13 h1:0O2mk2i0Yi+xkron0lK//biI21F1eGXb4eXECLU5v7g=
205+
k8s.io/apimachinery v0.28.13/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
206+
k8s.io/client-go v0.28.13 h1:kHgFOxWwAsa8VxL6Oylo10V6euobub9Jo0wyEWrhrWk=
207+
k8s.io/client-go v0.28.13/go.mod h1:IudvInbWfd+6WLreEVnBnZJCGFaSROCFbny9jFTkk7g=
208+
k8s.io/component-base v0.28.13 h1:hNgX2QcMt7Z5vy/9MB2rodbvBJj6H4Jq1JZDqGvVuf8=
209+
k8s.io/component-base v0.28.13/go.mod h1:G37g+bIAcjV2cAMEpFG2SEN7NgRFMizqSksOLpPN2bM=
210210
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
211211
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
212212
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=

‎modules/common/condition/funcs.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ func (conditions *Conditions) Mirror(t Type) *Condition {
337337
cg := g[groupOrder(*TrueCondition(ReadyCondition, "foo"))]
338338
if len(cg.conditions) > 0 && cg.conditions.IsTrue(ReadyCondition) {
339339
c := cg.conditions.Get(ReadyCondition)
340-
mirrorCondition := TrueCondition(t, c.Message)
340+
mirrorCondition := TrueCondition(t, "%s", c.Message)
341341
mirrorCondition.LastTransitionTime = c.LastTransitionTime
342342

343343
return mirrorCondition
@@ -355,19 +355,19 @@ func (conditions *Conditions) Mirror(t Type) *Condition {
355355
c := (*cl)[0]
356356

357357
if c.Status == corev1.ConditionTrue {
358-
mirrorCondition = TrueCondition(t, c.Message)
358+
mirrorCondition = TrueCondition(t, "%s", c.Message)
359359
mirrorCondition.LastTransitionTime = c.LastTransitionTime
360360
break
361361
}
362362

363363
if c.Status == corev1.ConditionFalse {
364-
mirrorCondition = FalseCondition(t, c.Reason, c.Severity, c.Message)
364+
mirrorCondition = FalseCondition(t, c.Reason, c.Severity, "%s", c.Message)
365365
mirrorCondition.LastTransitionTime = c.LastTransitionTime
366366
break
367367
}
368368

369369
if c.Status == corev1.ConditionUnknown {
370-
mirrorCondition = UnknownCondition(t, c.Reason, c.Message)
370+
mirrorCondition = UnknownCondition(t, c.Reason, "%s", c.Message)
371371
mirrorCondition.LastTransitionTime = c.LastTransitionTime
372372
break
373373
}

‎modules/common/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
go.uber.org/zap v1.27.0
1414
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
1515
gopkg.in/yaml.v3 v3.0.1
16-
k8s.io/api v0.28.12
17-
k8s.io/apimachinery v0.28.12
18-
k8s.io/client-go v0.28.12
16+
k8s.io/api v0.28.13
17+
k8s.io/apimachinery v0.28.13
18+
k8s.io/client-go v0.28.13
1919
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2020
sigs.k8s.io/controller-runtime v0.16.6
2121
)
@@ -65,8 +65,8 @@ require (
6565
google.golang.org/protobuf v1.34.1 // indirect
6666
gopkg.in/inf.v0 v0.9.1 // indirect
6767
gopkg.in/yaml.v2 v2.4.0 // indirect
68-
k8s.io/apiextensions-apiserver v0.28.12 // indirect
69-
k8s.io/component-base v0.28.12 // indirect
68+
k8s.io/apiextensions-apiserver v0.28.13 // indirect
69+
k8s.io/component-base v0.28.13 // indirect
7070
k8s.io/klog/v2 v2.110.1 // indirect
7171
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
7272
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎modules/common/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,16 +195,16 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
195195
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
196196
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
197197
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
198-
k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ=
199-
k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ=
200-
k8s.io/apiextensions-apiserver v0.28.12 h1:6GA64rylk5q0mbXfHHFVgfL1jx/4p6RU+Y+ni2DUuZc=
201-
k8s.io/apiextensions-apiserver v0.28.12/go.mod h1:Len29ySvb/fnrXvioTxg2l6iFi97B53Bm3/jBMBllCE=
202-
k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0=
203-
k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
204-
k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec=
205-
k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE=
206-
k8s.io/component-base v0.28.12 h1:ZNq6QFFGCPjaAzWqYHaQRoAY5seoK3vP0pZOjgxOzNc=
207-
k8s.io/component-base v0.28.12/go.mod h1:8zI5TmGuHX6R5Lay61Ox7wb+dsEENl0NBmVSiHMQu1c=
198+
k8s.io/api v0.28.13 h1:0Sw8MjdkmrJAF/uVv09HXSZ3cQauVyZHQWKt8hiiKo4=
199+
k8s.io/api v0.28.13/go.mod h1:7hlRF5wArzXf0qbRRT2TMtHRa5SHBEVJhA02JpTxj9Q=
200+
k8s.io/apiextensions-apiserver v0.28.13 h1:+Q3jtMXBxvURuW0tzW1UsZMPud3T4OvgVPuI/uQUEQ8=
201+
k8s.io/apiextensions-apiserver v0.28.13/go.mod h1:yThTxyuc0ba1rXKZNK2aQNIbFxmGcU+CPc8YB40IGj0=
202+
k8s.io/apimachinery v0.28.13 h1:0O2mk2i0Yi+xkron0lK//biI21F1eGXb4eXECLU5v7g=
203+
k8s.io/apimachinery v0.28.13/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
204+
k8s.io/client-go v0.28.13 h1:kHgFOxWwAsa8VxL6Oylo10V6euobub9Jo0wyEWrhrWk=
205+
k8s.io/client-go v0.28.13/go.mod h1:IudvInbWfd+6WLreEVnBnZJCGFaSROCFbny9jFTkk7g=
206+
k8s.io/component-base v0.28.13 h1:hNgX2QcMt7Z5vy/9MB2rodbvBJj6H4Jq1JZDqGvVuf8=
207+
k8s.io/component-base v0.28.13/go.mod h1:G37g+bIAcjV2cAMEpFG2SEN7NgRFMizqSksOLpPN2bM=
208208
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
209209
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
210210
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=

‎modules/openstack/domain.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (o *OpenStack) CreateDomain(log logr.Logger, d Domain) (string, error) {
3838
}
3939
domainID = domain.ID
4040
} else {
41-
return domainID, fmt.Errorf(fmt.Sprintf("Multiple domains named \"%s\" found", d.Name))
41+
return domainID, fmt.Errorf("Multiple domains named \"%s\" found", d.Name)
4242
}
4343

4444
return domainID, nil

‎modules/openstack/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ require (
5454
gopkg.in/inf.v0 v0.9.1 // indirect
5555
gopkg.in/yaml.v2 v2.4.0 // indirect
5656
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/api v0.28.12 // indirect
58-
k8s.io/apiextensions-apiserver v0.28.12 // indirect
59-
k8s.io/apimachinery v0.28.12 // indirect
60-
k8s.io/client-go v0.28.12 // indirect
61-
k8s.io/component-base v0.28.12 // indirect
57+
k8s.io/api v0.28.13 // indirect
58+
k8s.io/apiextensions-apiserver v0.28.13 // indirect
59+
k8s.io/apimachinery v0.28.13 // indirect
60+
k8s.io/client-go v0.28.13 // indirect
61+
k8s.io/component-base v0.28.13 // indirect
6262
k8s.io/klog/v2 v2.110.1 // indirect
6363
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
6464
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect

‎modules/openstack/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,16 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
174174
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
175175
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
176176
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
177-
k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ=
178-
k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ=
179-
k8s.io/apiextensions-apiserver v0.28.12 h1:6GA64rylk5q0mbXfHHFVgfL1jx/4p6RU+Y+ni2DUuZc=
180-
k8s.io/apiextensions-apiserver v0.28.12/go.mod h1:Len29ySvb/fnrXvioTxg2l6iFi97B53Bm3/jBMBllCE=
181-
k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0=
182-
k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
183-
k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec=
184-
k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE=
185-
k8s.io/component-base v0.28.12 h1:ZNq6QFFGCPjaAzWqYHaQRoAY5seoK3vP0pZOjgxOzNc=
186-
k8s.io/component-base v0.28.12/go.mod h1:8zI5TmGuHX6R5Lay61Ox7wb+dsEENl0NBmVSiHMQu1c=
177+
k8s.io/api v0.28.13 h1:0Sw8MjdkmrJAF/uVv09HXSZ3cQauVyZHQWKt8hiiKo4=
178+
k8s.io/api v0.28.13/go.mod h1:7hlRF5wArzXf0qbRRT2TMtHRa5SHBEVJhA02JpTxj9Q=
179+
k8s.io/apiextensions-apiserver v0.28.13 h1:+Q3jtMXBxvURuW0tzW1UsZMPud3T4OvgVPuI/uQUEQ8=
180+
k8s.io/apiextensions-apiserver v0.28.13/go.mod h1:yThTxyuc0ba1rXKZNK2aQNIbFxmGcU+CPc8YB40IGj0=
181+
k8s.io/apimachinery v0.28.13 h1:0O2mk2i0Yi+xkron0lK//biI21F1eGXb4eXECLU5v7g=
182+
k8s.io/apimachinery v0.28.13/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
183+
k8s.io/client-go v0.28.13 h1:kHgFOxWwAsa8VxL6Oylo10V6euobub9Jo0wyEWrhrWk=
184+
k8s.io/client-go v0.28.13/go.mod h1:IudvInbWfd+6WLreEVnBnZJCGFaSROCFbny9jFTkk7g=
185+
k8s.io/component-base v0.28.13 h1:hNgX2QcMt7Z5vy/9MB2rodbvBJj6H4Jq1JZDqGvVuf8=
186+
k8s.io/component-base v0.28.13/go.mod h1:G37g+bIAcjV2cAMEpFG2SEN7NgRFMizqSksOLpPN2bM=
187187
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
188188
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
189189
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=

‎modules/openstack/limits.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (o *OpenStack) CreateLimit(
8686
}
8787
limitID = createdLimits[0].ID
8888
} else {
89-
return limitID, fmt.Errorf(fmt.Sprintf("multiple limits named \"%s\" found", l.ResourceName))
89+
return limitID, fmt.Errorf("multiple limits named \"%s\" found", l.ResourceName)
9090
}
9191

9292
return limitID, nil
@@ -156,7 +156,7 @@ func (o *OpenStack) CreateOrUpdateRegisteredLimit(
156156
}
157157
limitID = createdLimits[0].ID
158158
} else {
159-
return limitID, fmt.Errorf(fmt.Sprintf("multiple limits named \"%s\" found", l.ResourceName))
159+
return limitID, fmt.Errorf("multiple limits named \"%s\" found", l.ResourceName)
160160
}
161161

162162
return limitID, nil

‎modules/openstack/project.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (o *OpenStack) CreateProject(
6262
}
6363
projectID = project.ID
6464
} else {
65-
return projectID, fmt.Errorf(fmt.Sprintf("multiple projects named \"%s\" found", p.Name))
65+
return projectID, fmt.Errorf("multiple projects named \"%s\" found", p.Name)
6666
}
6767

6868
return projectID, nil
@@ -84,9 +84,9 @@ func (o *OpenStack) GetProject(
8484
}
8585

8686
if len(allProjects) == 0 {
87-
return nil, fmt.Errorf(fmt.Sprintf("%s %s", projectName, ProjectNotFound))
87+
return nil, fmt.Errorf("%s %s", projectName, ProjectNotFound)
8888
} else if len(allProjects) > 1 {
89-
return nil, fmt.Errorf(fmt.Sprintf("multiple project named \"%s\" found", projectName))
89+
return nil, fmt.Errorf("multiple project named \"%s\" found", projectName)
9090
}
9191

9292
return &allProjects[0], nil

0 commit comments

Comments
 (0)