Skip to content

Commit b165125

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1780 from k8s-infra-cherrypick-robot/cherry-pick-1731-to-release-0.9
[release-0.9] 🌱 Import CAPI v1.6.0
2 parents f323b4f + 13606c5 commit b165125

File tree

7 files changed

+338
-339
lines changed

7 files changed

+338
-339
lines changed

‎Makefile

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

187187
# Pull all the images references in test/e2e/data/e2e_conf.yaml
188188
test-e2e-image-prerequisites:
189-
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.4.1
190-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.4.1
191-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.4.1
189+
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.6.0
190+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.6.0
191+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.6.0
192192
docker pull quay.io/jetstack/cert-manager-cainjector:v1.12.1
193193
docker pull quay.io/jetstack/cert-manager-webhook:v1.12.1
194194
docker pull quay.io/jetstack/cert-manager-controller:v1.12.1
@@ -271,6 +271,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
271271
output:webhook:dir=$(WEBHOOK_ROOT) \
272272
webhook
273273
$(CONTROLLER_GEN) \
274+
paths=./ \
274275
paths=./controllers/... \
275276
output:rbac:dir=$(RBAC_ROOT) \
276277
rbac:roleName=manager-role

‎config/rbac/role.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@ rules:
2323
- get
2424
- list
2525
- watch
26+
- apiGroups:
27+
- authentication.k8s.io
28+
resources:
29+
- tokenreviews
30+
verbs:
31+
- create
32+
- apiGroups:
33+
- authorization.k8s.io
34+
resources:
35+
- subjectaccessreviews
36+
verbs:
37+
- create
2638
- apiGroups:
2739
- cluster.x-k8s.io
2840
resources:

‎go.mod

Lines changed: 78 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ module sigs.k8s.io/cluster-api-provider-openstack
33
go 1.20
44

55
require (
6-
github.com/davecgh/go-spew v1.1.1
7-
github.com/go-logr/logr v1.2.4
6+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
7+
github.com/go-logr/logr v1.3.0
88
github.com/golang/mock v1.6.0
9-
github.com/google/go-cmp v0.5.9
9+
github.com/google/go-cmp v0.6.0
1010
github.com/google/gofuzz v1.2.0
1111
github.com/gophercloud/gophercloud v1.7.0
1212
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56
1313
github.com/hashicorp/go-version v1.4.0
14-
github.com/onsi/ginkgo/v2 v2.11.0
15-
github.com/onsi/gomega v1.27.8
14+
github.com/onsi/ginkgo/v2 v2.13.1
15+
github.com/onsi/gomega v1.30.0
1616
github.com/prometheus/client_golang v1.17.0
1717
github.com/spf13/pflag v1.0.5
18-
golang.org/x/crypto v0.14.0
19-
golang.org/x/text v0.13.0
18+
golang.org/x/crypto v0.15.0
19+
golang.org/x/text v0.14.0
2020
gopkg.in/ini.v1 v1.67.0
21-
k8s.io/api v0.27.7
22-
k8s.io/apiextensions-apiserver v0.27.2
23-
k8s.io/apimachinery v0.27.7
24-
k8s.io/client-go v0.27.7
25-
k8s.io/component-base v0.27.7
26-
k8s.io/klog/v2 v2.90.1
27-
k8s.io/kubernetes v1.27.2
28-
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
29-
sigs.k8s.io/cluster-api v1.5.1
30-
sigs.k8s.io/cluster-api/test v1.5.1
31-
sigs.k8s.io/controller-runtime v0.15.1
32-
sigs.k8s.io/yaml v1.3.0
21+
k8s.io/api v0.28.4
22+
k8s.io/apiextensions-apiserver v0.28.4
23+
k8s.io/apimachinery v0.28.4
24+
k8s.io/client-go v0.28.4
25+
k8s.io/component-base v0.28.4
26+
k8s.io/klog/v2 v2.100.1
27+
k8s.io/kubernetes v1.28.3
28+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
29+
sigs.k8s.io/cluster-api v1.6.0
30+
sigs.k8s.io/cluster-api/test v1.6.0
31+
sigs.k8s.io/controller-runtime v0.16.3
32+
sigs.k8s.io/yaml v1.4.0
3333
)
3434

3535
require (
@@ -39,26 +39,32 @@ require (
3939
github.com/Masterminds/goutils v1.1.1 // indirect
4040
github.com/Masterminds/semver/v3 v3.2.0 // indirect
4141
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
42-
github.com/Microsoft/go-winio v0.5.0 // indirect
42+
github.com/Microsoft/go-winio v0.6.0 // indirect
43+
github.com/NYTimes/gziphandler v1.1.1 // indirect
44+
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
4345
github.com/adrg/xdg v0.4.0 // indirect
4446
github.com/alessio/shellescape v1.4.1 // indirect
4547
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
4648
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4749
github.com/beorn7/perks v1.0.1 // indirect
48-
github.com/blang/semver v3.5.1+incompatible // indirect
4950
github.com/blang/semver/v4 v4.0.0 // indirect
51+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5052
github.com/cespare/xxhash/v2 v2.2.0 // indirect
51-
github.com/coredns/caddy v1.1.1 // indirect
52-
github.com/coredns/corefile-migration v1.0.21 // indirect
53-
github.com/docker/distribution v2.8.2+incompatible // indirect
54-
github.com/docker/docker v24.0.5+incompatible // indirect
53+
github.com/cloudflare/circl v1.3.3 // indirect
54+
github.com/coreos/go-semver v0.3.1 // indirect
55+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
56+
github.com/distribution/reference v0.5.0 // indirect
57+
github.com/docker/distribution v2.8.3+incompatible // indirect
58+
github.com/docker/docker v24.0.7+incompatible // indirect
5559
github.com/docker/go-connections v0.4.0 // indirect
5660
github.com/docker/go-units v0.5.0 // indirect
5761
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
58-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
62+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5963
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
60-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
64+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
65+
github.com/felixge/httpsnoop v1.0.4 // indirect
6166
github.com/fsnotify/fsnotify v1.6.0 // indirect
67+
github.com/go-logr/stdr v1.2.2 // indirect
6268
github.com/go-logr/zapr v1.2.4 // indirect
6369
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6470
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -68,13 +74,15 @@ require (
6874
github.com/gogo/protobuf v1.3.2 // indirect
6975
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7076
github.com/golang/protobuf v1.5.3 // indirect
71-
github.com/google/cel-go v0.14.0 // indirect
72-
github.com/google/gnostic v0.6.9 // indirect
73-
github.com/google/go-github/v48 v48.2.0 // indirect
77+
github.com/google/cel-go v0.16.1 // indirect
78+
github.com/google/gnostic-models v0.6.8 // indirect
79+
github.com/google/go-github/v53 v53.2.0 // indirect
7480
github.com/google/go-querystring v1.1.0 // indirect
7581
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7682
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
77-
github.com/google/uuid v1.3.0 // indirect
83+
github.com/google/uuid v1.3.1 // indirect
84+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
85+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7886
github.com/hashicorp/go-uuid v1.0.3 // indirect
7987
github.com/hashicorp/hcl v1.0.0 // indirect
8088
github.com/huandu/xstrings v1.4.0 // indirect
@@ -84,7 +92,7 @@ require (
8492
github.com/json-iterator/go v1.1.12 // indirect
8593
github.com/magiconair/properties v1.8.7 // indirect
8694
github.com/mailru/easyjson v0.7.7 // indirect
87-
github.com/mattn/go-isatty v0.0.17 // indirect
95+
github.com/mattn/go-isatty v0.0.20 // indirect
8896
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8997
github.com/mitchellh/copystructure v1.2.0 // indirect
9098
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -96,40 +104,61 @@ require (
96104
github.com/opencontainers/go-digest v1.0.0 // indirect
97105
github.com/opencontainers/image-spec v1.0.2 // indirect
98106
github.com/pelletier/go-toml v1.9.5 // indirect
99-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
107+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
100108
github.com/pkg/errors v0.9.1 // indirect
101109
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
102110
github.com/prometheus/common v0.44.0 // indirect
103111
github.com/prometheus/procfs v0.11.1 // indirect
112+
github.com/sagikazarmark/locafero v0.3.0 // indirect
113+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
104114
github.com/shopspring/decimal v1.3.1 // indirect
105-
github.com/spf13/afero v1.9.5 // indirect
115+
github.com/sourcegraph/conc v0.3.0 // indirect
116+
github.com/spf13/afero v1.10.0 // indirect
106117
github.com/spf13/cast v1.5.1 // indirect
107-
github.com/spf13/cobra v1.7.0 // indirect
108-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
109-
github.com/spf13/viper v1.16.0 // indirect
118+
github.com/spf13/cobra v1.8.0 // indirect
119+
github.com/spf13/viper v1.17.0 // indirect
110120
github.com/stoewer/go-strcase v1.3.0 // indirect
111-
github.com/subosito/gotenv v1.4.2 // indirect
121+
github.com/subosito/gotenv v1.6.0 // indirect
112122
github.com/valyala/fastjson v1.6.4 // indirect
113-
go.uber.org/atomic v1.10.0 // indirect
123+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
124+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
125+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
126+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
127+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
128+
go.opentelemetry.io/otel v1.20.0 // indirect
129+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
130+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
131+
go.opentelemetry.io/otel/metric v1.20.0 // indirect
132+
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
133+
go.opentelemetry.io/otel/trace v1.20.0 // indirect
134+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
114135
go.uber.org/multierr v1.11.0 // indirect
115-
go.uber.org/zap v1.24.0 // indirect
136+
go.uber.org/zap v1.25.0 // indirect
116137
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
117-
golang.org/x/net v0.17.0 // indirect
118-
golang.org/x/oauth2 v0.13.0 // indirect
119-
golang.org/x/sys v0.13.0 // indirect
120-
golang.org/x/term v0.13.0 // indirect
138+
golang.org/x/mod v0.13.0 // indirect
139+
golang.org/x/net v0.18.0 // indirect
140+
golang.org/x/oauth2 v0.14.0 // indirect
141+
golang.org/x/sync v0.4.0 // indirect
142+
golang.org/x/sys v0.14.0 // indirect
143+
golang.org/x/term v0.14.0 // indirect
121144
golang.org/x/time v0.3.0 // indirect
122145
golang.org/x/tools v0.14.0 // indirect
123-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
146+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
124147
google.golang.org/appengine v1.6.7 // indirect
125-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
148+
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
149+
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
150+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
151+
google.golang.org/grpc v1.59.0 // indirect
126152
google.golang.org/protobuf v1.31.0 // indirect
127153
gopkg.in/inf.v0 v0.9.1 // indirect
154+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
128155
gopkg.in/yaml.v2 v2.4.0 // indirect
129156
gopkg.in/yaml.v3 v3.0.1 // indirect
130-
k8s.io/apiserver v0.27.7 // indirect
131-
k8s.io/cluster-bootstrap v0.27.2 // indirect
132-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
157+
k8s.io/apiserver v0.28.4 // indirect
158+
k8s.io/cluster-bootstrap v0.28.4 // indirect
159+
k8s.io/kms v0.28.4 // indirect
160+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
161+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
133162
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
134163
sigs.k8s.io/kind v0.20.0 // indirect
135164
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)