Skip to content

Commit 097d20a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1521 from tormath1/tormath1/capi-upgrade
🌱 pull [email protected]
2 parents 8e8d359 + 3822684 commit 097d20a

23 files changed

+310
-339
lines changed

‎.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ issues:
172172
- stylecheck
173173
text: "ST1003: should not use underscores in Go names;"
174174
path: .*(api|types)\/.*\/.*conversion.*\.go$
175+
# Can be drop once kubernetes-sigs/cluster-api-provider-openstack#1326 is done.
176+
- linters:
177+
- staticcheck
178+
text: "SA1019"
175179

176180
run:
177181
timeout: 10m

‎api/v1alpha6/openstackmachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
177177
// SetFailure sets the OpenStackMachine status failure reason and failure message.
178178
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
179179
r.Status.FailureReason = &failureReason
180-
r.Status.FailureMessage = pointer.StringPtr(failureMessage.Error())
180+
r.Status.FailureMessage = pointer.String(failureMessage.Error())
181181
}
182182

183183
func init() {

‎api/v1alpha7/openstackmachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
175175
// SetFailure sets the OpenStackMachine status failure reason and failure message.
176176
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
177177
r.Status.FailureReason = &failureReason
178-
r.Status.FailureMessage = pointer.StringPtr(failureMessage.Error())
178+
r.Status.FailureMessage = pointer.String(failureMessage.Error())
179179
}
180180

181181
func init() {

‎controllers/openstackcluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,5 +604,5 @@ func (r *OpenStackClusterReconciler) SetupWithManager(ctx context.Context, mgr c
604604
func handleUpdateOSCError(openstackCluster *infrav1.OpenStackCluster, message error) {
605605
err := capierrors.UpdateClusterError
606606
openstackCluster.Status.FailureReason = &err
607-
openstackCluster.Status.FailureMessage = pointer.StringPtr(message.Error())
607+
openstackCluster.Status.FailureMessage = pointer.String(message.Error())
608608
}

‎controllers/openstackmachine_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
343343

344344
// TODO(sbueringer) From CAPA: TODO(ncdc): move this validation logic into a validating webhook (for us: create validation logic in webhook)
345345

346-
openStackMachine.Spec.ProviderID = pointer.StringPtr(fmt.Sprintf("openstack:///%s", instanceStatus.ID()))
347-
openStackMachine.Spec.InstanceID = pointer.StringPtr(instanceStatus.ID())
346+
openStackMachine.Spec.ProviderID = pointer.String(fmt.Sprintf("openstack:///%s", instanceStatus.ID()))
347+
openStackMachine.Spec.InstanceID = pointer.String(instanceStatus.ID())
348348

349349
state := instanceStatus.State()
350350
openStackMachine.Status.InstanceState = &state
@@ -590,7 +590,7 @@ func (r *OpenStackMachineReconciler) requeueOpenStackMachinesForUnpausedCluster(
590590
}
591591

592592
func (r *OpenStackMachineReconciler) requestsForCluster(ctx context.Context, log logr.Logger, namespace, name string) []ctrl.Request {
593-
labels := map[string]string{clusterv1.ClusterLabelName: name}
593+
labels := map[string]string{clusterv1.ClusterNameLabel: name}
594594
machineList := &clusterv1.MachineList{}
595595
if err := r.Client.List(ctx, machineList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
596596
log.Error(err, "Failed to get owned Machines, skipping mapping.")

‎controllers/openstackmachine_controller_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func getDefaultOpenStackCluster() *infrav1.OpenStackCluster {
6363
func getDefaultMachine() *clusterv1.Machine {
6464
return &clusterv1.Machine{
6565
Spec: clusterv1.MachineSpec{
66-
FailureDomain: pointer.StringPtr(failureDomain),
66+
FailureDomain: pointer.String(failureDomain),
6767
},
6868
}
6969
}
@@ -87,7 +87,7 @@ func getDefaultOpenStackMachine() *infrav1.OpenStackMachine {
8787
ServerMetadata: map[string]string{
8888
"test-metadata": "test-value",
8989
},
90-
ConfigDrive: pointer.BoolPtr(true),
90+
ConfigDrive: pointer.Bool(true),
9191
ServerGroupID: serverGroupUUID,
9292
},
9393
}
@@ -103,8 +103,8 @@ func getDefaultInstanceSpec() *compute.InstanceSpec {
103103
Metadata: map[string]string{
104104
"test-metadata": "test-value",
105105
},
106-
ConfigDrive: *pointer.BoolPtr(true),
107-
FailureDomain: *pointer.StringPtr(failureDomain),
106+
ConfigDrive: *pointer.Bool(true),
107+
FailureDomain: *pointer.String(failureDomain),
108108
ServerGroupID: serverGroupUUID,
109109
Tags: []string{"test-tag"},
110110
}
@@ -137,7 +137,7 @@ func Test_machineToInstanceSpec(t *testing.T) {
137137
machine: func() *clusterv1.Machine {
138138
m := getDefaultMachine()
139139
m.Labels = map[string]string{
140-
clusterv1.MachineControlPlaneLabelName: "true",
140+
clusterv1.MachineControlPlaneLabel: "true",
141141
}
142142
return m
143143
},

‎go.mod

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,128 +4,132 @@ go 1.19
44

55
require (
66
github.com/davecgh/go-spew v1.1.1
7-
github.com/go-logr/logr v1.2.3
7+
github.com/go-logr/logr v1.2.4
88
github.com/golang/mock v1.6.0
99
github.com/google/gofuzz v1.2.0
1010
github.com/gophercloud/gophercloud v1.3.0
1111
github.com/gophercloud/utils v0.0.0-20221207145018-e8fba78967ca
1212
github.com/hashicorp/go-version v1.4.0
13-
github.com/onsi/ginkgo/v2 v2.7.0
14-
github.com/onsi/gomega v1.24.1
13+
github.com/onsi/ginkgo/v2 v2.9.2
14+
github.com/onsi/gomega v1.27.6
1515
github.com/pkg/errors v0.9.1
16-
github.com/prometheus/client_golang v1.13.0
16+
github.com/prometheus/client_golang v1.14.0
1717
github.com/spf13/pflag v1.0.5
18-
golang.org/x/crypto v0.3.0
19-
golang.org/x/text v0.7.0
18+
golang.org/x/crypto v0.7.0
19+
golang.org/x/text v0.8.0
2020
gopkg.in/ini.v1 v1.67.0
21-
k8s.io/api v0.25.0
22-
k8s.io/apiextensions-apiserver v0.25.0
23-
k8s.io/apimachinery v0.25.0
24-
k8s.io/client-go v0.25.0
25-
k8s.io/component-base v0.25.0
26-
k8s.io/klog/v2 v2.80.1
27-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
28-
sigs.k8s.io/cluster-api v1.3.1
29-
sigs.k8s.io/cluster-api/test v1.3.1
30-
sigs.k8s.io/controller-runtime v0.13.1
21+
k8s.io/api v0.26.3
22+
k8s.io/apiextensions-apiserver v0.26.3
23+
k8s.io/apimachinery v0.26.3
24+
k8s.io/client-go v0.26.3
25+
k8s.io/component-base v0.26.3
26+
k8s.io/klog/v2 v2.90.1
27+
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
28+
sigs.k8s.io/cluster-api v1.4.1
29+
sigs.k8s.io/cluster-api/test v1.4.1
30+
sigs.k8s.io/controller-runtime v0.14.6
3131
sigs.k8s.io/yaml v1.3.0
3232
)
3333

3434
require (
35+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3536
github.com/BurntSushi/toml v1.0.0 // indirect
3637
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3738
github.com/Masterminds/goutils v1.1.1 // indirect
3839
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3940
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4041
github.com/Microsoft/go-winio v0.5.0 // indirect
4142
github.com/alessio/shellescape v1.4.1 // indirect
42-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
43-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
43+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
44+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4445
github.com/beorn7/perks v1.0.1 // indirect
4546
github.com/blang/semver v3.5.1+incompatible // indirect
4647
github.com/blang/semver/v4 v4.0.0 // indirect
47-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
48-
github.com/coredns/caddy v1.1.0 // indirect
49-
github.com/coredns/corefile-migration v1.0.18 // indirect
48+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
49+
github.com/coredns/caddy v1.1.1 // indirect
50+
github.com/coredns/corefile-migration v1.0.20 // indirect
5051
github.com/docker/distribution v2.8.1+incompatible // indirect
5152
github.com/docker/docker v20.10.21+incompatible // indirect
5253
github.com/docker/go-connections v0.4.0 // indirect
5354
github.com/docker/go-units v0.4.0 // indirect
5455
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
55-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
56+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
5657
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5758
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5859
github.com/fsnotify/fsnotify v1.6.0 // indirect
5960
github.com/go-logr/zapr v1.2.3 // indirect
60-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
61-
github.com/go-openapi/jsonreference v0.20.0 // indirect
61+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
62+
github.com/go-openapi/jsonreference v0.20.2 // indirect
6263
github.com/go-openapi/swag v0.22.3 // indirect
63-
github.com/gobuffalo/flect v0.3.0 // indirect
64+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
65+
github.com/gobuffalo/flect v1.0.2 // indirect
6466
github.com/gogo/protobuf v1.3.2 // indirect
6567
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
66-
github.com/golang/protobuf v1.5.2 // indirect
67-
github.com/google/cel-go v0.12.4 // indirect
68+
github.com/golang/protobuf v1.5.3 // indirect
69+
github.com/google/cel-go v0.14.0 // indirect
6870
github.com/google/gnostic v0.6.9 // indirect
6971
github.com/google/go-cmp v0.5.9 // indirect
70-
github.com/google/go-github/v45 v45.2.0 // indirect
72+
github.com/google/go-github/v48 v48.2.0 // indirect
7173
github.com/google/go-querystring v1.1.0 // indirect
74+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
7275
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
7376
github.com/google/uuid v1.3.0 // indirect
7477
github.com/hashicorp/hcl v1.0.0 // indirect
75-
github.com/huandu/xstrings v1.3.3 // indirect
76-
github.com/imdario/mergo v0.3.13 // indirect
77-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
78+
github.com/huandu/xstrings v1.4.0 // indirect
79+
github.com/imdario/mergo v0.3.15 // indirect
80+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7881
github.com/josharian/intern v1.0.0 // indirect
7982
github.com/json-iterator/go v1.1.12 // indirect
80-
github.com/magiconair/properties v1.8.6 // indirect
83+
github.com/magiconair/properties v1.8.7 // indirect
8184
github.com/mailru/easyjson v0.7.7 // indirect
82-
github.com/mattn/go-isatty v0.0.16 // indirect
83-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
85+
github.com/mattn/go-isatty v0.0.17 // indirect
86+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8487
github.com/mitchellh/copystructure v1.2.0 // indirect
8588
github.com/mitchellh/go-homedir v1.1.0 // indirect
8689
github.com/mitchellh/mapstructure v1.5.0 // indirect
8790
github.com/mitchellh/reflectwalk v1.0.2 // indirect
91+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
8892
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8993
github.com/modern-go/reflect2 v1.0.2 // indirect
9094
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9195
github.com/opencontainers/go-digest v1.0.0 // indirect
9296
github.com/opencontainers/image-spec v1.0.2 // indirect
9397
github.com/pelletier/go-toml v1.9.5 // indirect
94-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
95-
github.com/prometheus/client_model v0.2.0 // indirect
96-
github.com/prometheus/common v0.37.0 // indirect
97-
github.com/prometheus/procfs v0.8.0 // indirect
98+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
99+
github.com/prometheus/client_model v0.3.0 // indirect
100+
github.com/prometheus/common v0.42.0 // indirect
101+
github.com/prometheus/procfs v0.9.0 // indirect
98102
github.com/shopspring/decimal v1.3.1 // indirect
99103
github.com/sirupsen/logrus v1.8.1 // indirect
100-
github.com/spf13/afero v1.9.2 // indirect
104+
github.com/spf13/afero v1.9.3 // indirect
101105
github.com/spf13/cast v1.5.0 // indirect
102-
github.com/spf13/cobra v1.6.1 // indirect
106+
github.com/spf13/cobra v1.7.0 // indirect
103107
github.com/spf13/jwalterweatherman v1.1.0 // indirect
104-
github.com/spf13/viper v1.13.0 // indirect
105-
github.com/stoewer/go-strcase v1.2.0 // indirect
106-
github.com/subosito/gotenv v1.4.1 // indirect
107-
github.com/valyala/fastjson v1.6.3 // indirect
108-
go.uber.org/atomic v1.7.0 // indirect
109-
go.uber.org/multierr v1.6.0 // indirect
110-
go.uber.org/zap v1.21.0 // indirect
111-
golang.org/x/net v0.7.0 // indirect
112-
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
113-
golang.org/x/sys v0.5.0 // indirect
114-
golang.org/x/term v0.5.0 // indirect
115-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
108+
github.com/spf13/viper v1.15.0 // indirect
109+
github.com/stoewer/go-strcase v1.3.0 // indirect
110+
github.com/subosito/gotenv v1.4.2 // indirect
111+
github.com/valyala/fastjson v1.6.4 // indirect
112+
go.uber.org/atomic v1.10.0 // indirect
113+
go.uber.org/multierr v1.11.0 // indirect
114+
go.uber.org/zap v1.24.0 // indirect
115+
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
116+
golang.org/x/net v0.8.0 // indirect
117+
golang.org/x/oauth2 v0.6.0 // indirect
118+
golang.org/x/sys v0.7.0 // indirect
119+
golang.org/x/term v0.7.0 // indirect
120+
golang.org/x/time v0.3.0 // indirect
121+
golang.org/x/tools v0.7.0 // indirect
116122
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
117123
google.golang.org/appengine v1.6.7 // indirect
118-
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
119-
google.golang.org/protobuf v1.28.1 // indirect
124+
google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd // indirect
125+
google.golang.org/protobuf v1.30.0 // indirect
120126
gopkg.in/inf.v0 v0.9.1 // indirect
121127
gopkg.in/yaml.v2 v2.4.0 // indirect
122128
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
k8s.io/apiserver v0.25.0 // indirect
124-
k8s.io/cluster-bootstrap v0.25.0 // indirect
125-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
126-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
129+
k8s.io/apiserver v0.26.3 // indirect
130+
k8s.io/cluster-bootstrap v0.26.3 // indirect
131+
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect
132+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
127133
sigs.k8s.io/kind v0.17.0 // indirect
128134
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
129135
)
130-
131-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.0

0 commit comments

Comments
 (0)