Skip to content

Commit d19e411

Browse files
tobiasgiesek8s-infra-cherrypick-robot
tobiasgiese
authored and
k8s-infra-cherrypick-robot
committed
Bump CAPI to v1.3.0
During this bump we must upgrade Golang to 1.19 as well. Signed-off-by: Tobias Giese <[email protected]>
1 parent 33f0888 commit d19e411

16 files changed

+229
-364
lines changed

‎Containerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# media type: "application/vnd.oci.image.layer.v1.tar+gzip"
2525

2626
# Build the manager binary
27-
FROM golang:1.18.3 as builder
27+
FROM golang:1.19.3 as builder
2828
WORKDIR /workspace
2929

3030
# Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
# Build the manager binary
18-
FROM golang:1.18.3 as builder
18+
FROM golang:1.19.3 as builder
1919
WORKDIR /workspace
2020

2121
# Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ e2e-image: docker-build
183183

184184
# Pull all the images references in test/e2e/data/e2e_conf.yaml
185185
test-e2e-image-prerequisites:
186-
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.2.4
187-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.2.4
188-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.2.4
186+
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.3.0
187+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.3.0
188+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.3.0
189189
docker pull quay.io/jetstack/cert-manager-cainjector:v1.8.2
190190
docker pull quay.io/jetstack/cert-manager-webhook:v1.8.2
191191
docker pull quay.io/jetstack/cert-manager-controller:v1.8.2

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: openstackclusters.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: openstackclustertemplates.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: openstackmachines.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: openstackmachinetemplates.infrastructure.cluster.x-k8s.io
99
spec:

‎go.mod‎

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
module sigs.k8s.io/cluster-api-provider-openstack
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/davecgh/go-spew v1.1.1
8-
github.com/go-logr/logr v1.2.0
8+
github.com/go-logr/logr v1.2.3
99
github.com/golang/mock v1.6.0
1010
github.com/google/gofuzz v1.2.0
1111
github.com/gophercloud/gophercloud v1.1.0
1212
github.com/gophercloud/utils v0.0.0-20221128194715-5caf33c866da
1313
github.com/hashicorp/go-version v1.4.0
1414
github.com/onsi/ginkgo v1.16.5
15-
github.com/onsi/gomega v1.18.1
15+
github.com/onsi/gomega v1.24.1
1616
github.com/pkg/errors v0.9.1
17-
github.com/prometheus/client_golang v1.12.1
17+
github.com/prometheus/client_golang v1.13.0
1818
github.com/spf13/pflag v1.0.5
19-
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
19+
golang.org/x/crypto v0.1.0
2020
golang.org/x/text v0.4.0
21-
gopkg.in/ini.v1 v1.66.4
22-
k8s.io/api v0.24.2
23-
k8s.io/apiextensions-apiserver v0.24.2
24-
k8s.io/apimachinery v0.24.2
25-
k8s.io/client-go v0.24.2
26-
k8s.io/component-base v0.24.2
27-
k8s.io/klog/v2 v2.60.1
28-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
29-
sigs.k8s.io/cluster-api v1.2.4
30-
sigs.k8s.io/cluster-api/test v1.2.4
31-
sigs.k8s.io/controller-runtime v0.12.3
21+
gopkg.in/ini.v1 v1.67.0
22+
k8s.io/api v0.25.0
23+
k8s.io/apiextensions-apiserver v0.25.0
24+
k8s.io/apimachinery v0.25.0
25+
k8s.io/client-go v0.25.0
26+
k8s.io/component-base v0.25.0
27+
k8s.io/klog/v2 v2.80.1
28+
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
29+
sigs.k8s.io/cluster-api v1.3.0
30+
sigs.k8s.io/cluster-api/test v1.3.0
31+
sigs.k8s.io/controller-runtime v0.13.1
3232
sigs.k8s.io/yaml v1.3.0
3333
)
3434

@@ -39,47 +39,47 @@ require (
3939
github.com/Masterminds/semver/v3 v3.1.1 // indirect
4040
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
4141
github.com/Microsoft/go-winio v0.5.0 // indirect
42-
github.com/PuerkitoBio/purell v1.1.1 // indirect
43-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4442
github.com/alessio/shellescape v1.4.1 // indirect
45-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
43+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
4644
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4745
github.com/beorn7/perks v1.0.1 // indirect
46+
github.com/blang/semver/v4 v4.0.0 // indirect
4847
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4948
github.com/coredns/caddy v1.1.0 // indirect
50-
github.com/coredns/corefile-migration v1.0.17 // indirect
49+
github.com/coredns/corefile-migration v1.0.18 // indirect
5150
github.com/docker/distribution v2.8.1+incompatible // indirect
52-
github.com/docker/docker v20.10.17+incompatible // indirect
51+
github.com/docker/docker v20.10.21+incompatible // indirect
5352
github.com/docker/go-connections v0.4.0 // indirect
5453
github.com/docker/go-units v0.4.0 // indirect
5554
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
56-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
57-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
55+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
56+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5857
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
59-
github.com/fsnotify/fsnotify v1.5.4 // indirect
60-
github.com/go-logr/zapr v1.2.0 // indirect
58+
github.com/fsnotify/fsnotify v1.6.0 // indirect
59+
github.com/go-logr/zapr v1.2.3 // indirect
6160
github.com/go-openapi/jsonpointer v0.19.5 // indirect
62-
github.com/go-openapi/jsonreference v0.19.5 // indirect
63-
github.com/go-openapi/swag v0.19.14 // indirect
64-
github.com/gobuffalo/flect v0.2.5 // indirect
61+
github.com/go-openapi/jsonreference v0.20.0 // indirect
62+
github.com/go-openapi/swag v0.22.3 // indirect
63+
github.com/gobuffalo/flect v0.3.0 // indirect
6564
github.com/gogo/protobuf v1.3.2 // indirect
6665
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6766
github.com/golang/protobuf v1.5.2 // indirect
68-
github.com/google/cel-go v0.10.1 // indirect
69-
github.com/google/gnostic v0.5.7-v3refs // indirect
70-
github.com/google/go-cmp v0.5.8 // indirect
67+
github.com/google/cel-go v0.12.4 // indirect
68+
github.com/google/gnostic v0.6.9 // indirect
69+
github.com/google/go-cmp v0.5.9 // indirect
7170
github.com/google/go-github/v45 v45.2.0 // indirect
7271
github.com/google/go-querystring v1.1.0 // indirect
73-
github.com/google/uuid v1.2.0 // indirect
72+
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
73+
github.com/google/uuid v1.3.0 // indirect
7474
github.com/hashicorp/hcl v1.0.0 // indirect
75-
github.com/huandu/xstrings v1.3.2 // indirect
76-
github.com/imdario/mergo v0.3.12 // indirect
77-
github.com/inconshreveable/mousetrap 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
7878
github.com/josharian/intern v1.0.0 // indirect
7979
github.com/json-iterator/go v1.1.12 // indirect
8080
github.com/magiconair/properties v1.8.6 // indirect
81-
github.com/mailru/easyjson v0.7.6 // indirect
82-
github.com/mattn/go-isatty v0.0.14 // indirect
81+
github.com/mailru/easyjson v0.7.7 // indirect
82+
github.com/mattn/go-isatty v0.0.16 // indirect
8383
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
8484
github.com/mitchellh/copystructure v1.2.0 // indirect
8585
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -89,45 +89,46 @@ require (
8989
github.com/modern-go/reflect2 v1.0.2 // indirect
9090
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9191
github.com/nxadm/tail v1.4.8 // indirect
92+
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
9293
github.com/opencontainers/go-digest v1.0.0 // indirect
9394
github.com/opencontainers/image-spec v1.0.2 // indirect
9495
github.com/pelletier/go-toml v1.9.5 // indirect
95-
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
96+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
9697
github.com/prometheus/client_model v0.2.0 // indirect
97-
github.com/prometheus/common v0.32.1 // indirect
98-
github.com/prometheus/procfs v0.7.3 // indirect
99-
github.com/shopspring/decimal v1.2.0 // indirect
98+
github.com/prometheus/common v0.37.0 // indirect
99+
github.com/prometheus/procfs v0.8.0 // indirect
100+
github.com/shopspring/decimal v1.3.1 // indirect
100101
github.com/sirupsen/logrus v1.8.1 // indirect
101-
github.com/spf13/afero v1.8.2 // indirect
102+
github.com/spf13/afero v1.9.2 // indirect
102103
github.com/spf13/cast v1.5.0 // indirect
103-
github.com/spf13/cobra v1.5.0 // indirect
104+
github.com/spf13/cobra v1.6.1 // indirect
104105
github.com/spf13/jwalterweatherman v1.1.0 // indirect
105-
github.com/spf13/viper v1.12.0 // indirect
106+
github.com/spf13/viper v1.13.0 // indirect
106107
github.com/stoewer/go-strcase v1.2.0 // indirect
107-
github.com/subosito/gotenv v1.3.0 // indirect
108+
github.com/subosito/gotenv v1.4.1 // indirect
108109
github.com/valyala/fastjson v1.6.3 // indirect
109110
go.uber.org/atomic v1.7.0 // indirect
110111
go.uber.org/multierr v1.6.0 // indirect
111-
go.uber.org/zap v1.19.1 // indirect
112-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
113-
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
112+
go.uber.org/zap v1.21.0 // indirect
113+
golang.org/x/net v0.2.0 // indirect
114+
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
114115
golang.org/x/sys v0.2.0 // indirect
115-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
116-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
116+
golang.org/x/term v0.2.0 // indirect
117+
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
117118
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
118119
google.golang.org/appengine v1.6.7 // indirect
119-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
120-
google.golang.org/protobuf v1.28.0 // indirect
120+
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
121+
google.golang.org/protobuf v1.28.1 // indirect
121122
gopkg.in/inf.v0 v0.9.1 // indirect
122123
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
123124
gopkg.in/yaml.v2 v2.4.0 // indirect
124-
gopkg.in/yaml.v3 v3.0.0 // indirect
125-
k8s.io/apiserver v0.24.2 // indirect
126-
k8s.io/cluster-bootstrap v0.24.0 // indirect
127-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
128-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
129-
sigs.k8s.io/kind v0.14.0 // indirect
130-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
125+
gopkg.in/yaml.v3 v3.0.1 // indirect
126+
k8s.io/apiserver v0.25.0 // indirect
127+
k8s.io/cluster-bootstrap v0.25.0 // indirect
128+
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
129+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
130+
sigs.k8s.io/kind v0.17.0 // indirect
131+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
131132
)
132133

133-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.4
134+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.0

0 commit comments

Comments
 (0)