Skip to content

Commit 368bc8b

Browse files
chrischdichrischdi
committed
Fix capo v1.24 kubernetes compatibility
kubeadm v1.24 removes the deprecated control-plane node label node-role.kubernetes.io/master. This PR introduces the new label node-role.kubernetes.io/control-plane in the CAPO tests and bumps the CAPI dependency for compatibility to nodes provisioned using kubeadm v1.24. * bumps CAPI to v1.1.3 * fixes k8s v1.24 compatibility * fixes periodics conformance ci job * adds tolerations and usage of the new control-plane node label * bumps e2e k8s version to v1.23.5 * bumps capo version to v1.23.2 Signed-off-by: Christian Schlotter <[email protected]>
1 parent af6f623 commit 368bc8b

File tree

8 files changed

+79
-71
lines changed

8 files changed

+79
-71
lines changed

‎Makefile

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

153153
# Pull all the images references in test/e2e/data/e2e_conf.yaml
154154
test-e2e-image-prerequisites:
155-
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.1.0
156-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.1.0
157-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.1.0
155+
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.1.3
156+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.1.3
157+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.1.3
158158
docker pull quay.io/jetstack/cert-manager-cainjector:v1.5.3
159159
docker pull quay.io/jetstack/cert-manager-webhook:v1.5.3
160160
docker pull quay.io/jetstack/cert-manager-controller:v1.5.3

‎README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@ previous cluster managers such as [kops][kops] and
3737

3838
This provider's versions are compatible with the following versions of Cluster API:
3939

40-
| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.0) |
40+
| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.1) |
4141
| ---------------------------------- | --------------- | --------------- | -------------- |
42-
| OpenStack Provider v1alpha3 (v0.3) | ✓ | | |
43-
| OpenStack Provider v1alpha4 (v0.4) | | ✓ | |
44-
| OpenStack Provider v1alpha4 (v0.5) | | | ✓ |
45-
| OpenStack Provider v1alpha5 | | | ✓ |
42+
| OpenStack Provider v1alpha3 (v0.3) | ✓ | | |
43+
| OpenStack Provider v1alpha4 (v0.4) | | ✓ | |
44+
| OpenStack Provider v1alpha4 (v0.5) | | | ✓ |
45+
| OpenStack Provider v1alpha5 | | | ✓ |
4646

4747

4848
This provider's versions are able to install and manage the following versions of Kubernetes:
4949

50-
| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 |
51-
| ---------------------------------- | ----- | ----- | ----- | ----- | ----- | ----- |
52-
| OpenStack Provider v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | |
53-
| OpenStack Provider v1alpha4 (v0.4) | | | | | ✓ | ✓ |
54-
| OpenStack Provider v1alpha4 (v0.5) | | | | | ✓ | ✓ |
55-
| OpenStack Provider v1alpha5 | | | | | | ✓ |
50+
| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 |
51+
| ---------------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
52+
| OpenStack Provider v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
53+
| OpenStack Provider v1alpha4 (v0.4) | | | | | ✓ | | | |
54+
| OpenStack Provider v1alpha4 (v0.5) | | | | | ✓ | ✓ | + | + |
55+
| OpenStack Provider v1alpha5 | | | | | | ✓ | + | ✓ |
5656

5757
This provider's versions are able to install Kubernetes to the following versions of OpenStack:
5858

‎docs/book/src/clusteropenstack/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ Note: You can use [the template file](https://github.com/kubernetes-sigs/cluster
4545
# Using 'external-cloud-provider' flavor
4646
clusterctl generate cluster capi-quickstart \
4747
--flavor external-cloud-provider \
48-
--kubernetes-version v1.21.3 \
48+
--kubernetes-version v1.23.5 \
4949
--control-plane-machine-count=3 \
5050
--worker-machine-count=1 \
5151
> capi-quickstart.yaml
5252

5353
# Using 'without-lb' flavor
5454
clusterctl generate cluster capi-quickstart \
5555
--flavor without-lb \
56-
--kubernetes-version v1.21.3 \
56+
--kubernetes-version v1.23.5 \
5757
--control-plane-machine-count=1 \
5858
--worker-machine-count=1 \
5959
> capi-quickstart.yaml

‎go.mod

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@ require (
2222
k8s.io/component-base v0.23.0
2323
k8s.io/klog/v2 v2.30.0
2424
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
25-
sigs.k8s.io/cluster-api v1.1.0
26-
sigs.k8s.io/cluster-api/test v1.1.0
27-
sigs.k8s.io/controller-runtime v0.11.0
25+
sigs.k8s.io/cluster-api v1.1.3
26+
sigs.k8s.io/cluster-api/test v1.1.3
27+
sigs.k8s.io/controller-runtime v0.11.1
2828
sigs.k8s.io/yaml v1.3.0
2929
)
3030

3131
require (
3232
github.com/BurntSushi/toml v0.3.1 // indirect
3333
github.com/MakeNowJust/heredoc v1.0.0 // indirect
34+
github.com/Masterminds/goutils v1.1.1 // indirect
35+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
36+
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
3437
github.com/Microsoft/go-winio v0.5.0 // indirect
3538
github.com/PuerkitoBio/purell v1.1.1 // indirect
3639
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -66,6 +69,7 @@ require (
6669
github.com/google/uuid v1.2.0 // indirect
6770
github.com/googleapis/gnostic v0.5.5 // indirect
6871
github.com/hashicorp/hcl v1.0.0 // indirect
72+
github.com/huandu/xstrings v1.3.2 // indirect
6973
github.com/imdario/mergo v0.3.12 // indirect
7074
github.com/inconshreveable/mousetrap v1.0.0 // indirect
7175
github.com/josharian/intern v1.0.0 // indirect
@@ -74,8 +78,10 @@ require (
7478
github.com/mailru/easyjson v0.7.6 // indirect
7579
github.com/mattn/go-isatty v0.0.14 // indirect
7680
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
81+
github.com/mitchellh/copystructure v1.2.0 // indirect
7782
github.com/mitchellh/go-homedir v1.1.0 // indirect
7883
github.com/mitchellh/mapstructure v1.4.2 // indirect
84+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
7985
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8086
github.com/modern-go/reflect2 v1.0.2 // indirect
8187
github.com/nxadm/tail v1.4.8 // indirect
@@ -85,6 +91,7 @@ require (
8591
github.com/prometheus/client_model v0.2.0 // indirect
8692
github.com/prometheus/common v0.28.0 // indirect
8793
github.com/prometheus/procfs v0.6.0 // indirect
94+
github.com/shopspring/decimal v1.2.0 // indirect
8895
github.com/sirupsen/logrus v1.8.1 // indirect
8996
github.com/spf13/afero v1.6.0 // indirect
9097
github.com/spf13/cast v1.4.1 // indirect
@@ -117,4 +124,4 @@ require (
117124
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
118125
)
119126

120-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.0
127+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.3

‎go.sum

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
6868
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
6969
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
7070
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
71+
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
72+
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
73+
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
74+
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
75+
github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=
76+
github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
7177
github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
7278
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
7379
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -564,6 +570,9 @@ github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
564570
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
565571
github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
566572
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
573+
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
574+
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
575+
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
567576
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
568577
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
569578
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -651,6 +660,9 @@ github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WT
651660
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
652661
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
653662
github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
663+
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
664+
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
665+
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
654666
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
655667
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
656668
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -664,6 +676,9 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
664676
github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo=
665677
github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
666678
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
679+
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
680+
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
681+
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
667682
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
668683
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
669684
github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
@@ -815,6 +830,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
815830
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
816831
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
817832
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
833+
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
834+
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
818835
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
819836
github.com/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s/J06jsk//d+9DOz9BbsmcIrimuGRFbs=
820837
github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U=
@@ -987,6 +1004,7 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
9871004
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
9881005
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
9891006
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
1007+
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
9901008
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
9911009
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
9921010
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -1570,12 +1588,12 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
15701588
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
15711589
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
15721590
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
1573-
sigs.k8s.io/cluster-api v1.1.0 h1:zJJzIUezEveYK3Ljmk/jku+DYd96RP5bZ181l2W9gVg=
1574-
sigs.k8s.io/cluster-api v1.1.0/go.mod h1:aSxmmNwDjmg9rDaL0RhRELpGX9uSTTwLF02AMtk/XGY=
1575-
sigs.k8s.io/cluster-api/test v1.1.0 h1:eBVFCWxu9/fb/By02uFjOreG9GAd9eax9uZKsCXP58s=
1576-
sigs.k8s.io/cluster-api/test v1.1.0/go.mod h1:ct7zQrWXsYIAhL/lMLFPfCAqGLDBTEzx+AtwIXpI45o=
1577-
sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ=
1578-
sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
1591+
sigs.k8s.io/cluster-api v1.1.3 h1:t682KcIPFeKGwe2SlxGvZa/HVmLA80XJ45KHBhzUETM=
1592+
sigs.k8s.io/cluster-api v1.1.3/go.mod h1:XqFZ0s9+KKjI/K39/EzHyAb4Sljprqvnm/XKWPgPp3Y=
1593+
sigs.k8s.io/cluster-api/test v1.1.3 h1:orrawaLueFkAllsy49MqDuUjmRRxy7hmTqfbxjOA+Dk=
1594+
sigs.k8s.io/cluster-api/test v1.1.3/go.mod h1:WpD3cv0ZyNt5aulQmA7HvQbu7TQ/Eb8OPbwayGxUazs=
1595+
sigs.k8s.io/controller-runtime v0.11.1 h1:7YIHT2QnHJArj/dk9aUkYhfqfK5cIxPOX5gPECfdZLU=
1596+
sigs.k8s.io/controller-runtime v0.11.1/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
15791597
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
15801598
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
15811599
sigs.k8s.io/kind v0.11.1 h1:pVzOkhUwMBrCB0Q/WllQDO3v14Y+o2V0tFgjTqIUjwA=

‎test/e2e/data/ccm/cloud-controller-manager.yaml

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
k8s-app: openstack-cloud-controller-manager
2626
spec:
2727
nodeSelector:
28-
node-role.kubernetes.io/master: ""
28+
node-role.kubernetes.io/control-plane: ""
2929
# we need user root to read the cloud.conf from the host
3030
securityContext:
3131
runAsUser: 0
@@ -35,10 +35,12 @@ spec:
3535
effect: NoSchedule
3636
- key: node-role.kubernetes.io/master
3737
effect: NoSchedule
38+
- key: node-role.kubernetes.io/control-plane
39+
effect: NoSchedule
3840
serviceAccountName: cloud-controller-manager
3941
containers:
4042
- name: openstack-cloud-controller-manager
41-
image: docker.io/k8scloudprovider/openstack-cloud-controller-manager:v1.20.2
43+
image: docker.io/k8scloudprovider/openstack-cloud-controller-manager:v1.23.1
4244
args:
4345
- /bin/openstack-cloud-controller-manager
4446
- --v=1
@@ -86,19 +88,6 @@ subjects:
8688
---
8789
apiVersion: rbac.authorization.k8s.io/v1
8890
kind: ClusterRoleBinding
89-
metadata:
90-
name: system:pvl-controller
91-
roleRef:
92-
apiGroup: rbac.authorization.k8s.io
93-
kind: ClusterRole
94-
name: system:pvl-controller
95-
subjects:
96-
- kind: ServiceAccount
97-
name: pvl-controller
98-
namespace: kube-system
99-
---
100-
apiVersion: rbac.authorization.k8s.io/v1
101-
kind: ClusterRoleBinding
10291
metadata:
10392
name: system:cloud-controller-manager
10493
roleRef:
@@ -153,13 +142,25 @@ rules:
153142
- patch
154143
- update
155144
- watch
145+
- apiGroups:
146+
- ""
147+
resources:
148+
- services/status
149+
verbs:
150+
- patch
156151
- apiGroups:
157152
- ""
158153
resources:
159154
- serviceaccounts
160155
verbs:
161156
- create
162157
- get
158+
- apiGroups:
159+
- ""
160+
resources:
161+
- serviceaccounts/token
162+
verbs:
163+
- create
163164
- apiGroups:
164165
- ""
165166
resources:
@@ -218,23 +219,3 @@ rules:
218219
- create
219220
- patch
220221
- update
221-
---
222-
apiVersion: rbac.authorization.k8s.io/v1
223-
kind: ClusterRole
224-
metadata:
225-
name: system:pvl-controller
226-
rules:
227-
- apiGroups:
228-
- ""
229-
resources:
230-
- persistentvolumes
231-
verbs:
232-
- '*'
233-
- apiGroups:
234-
- ""
235-
resources:
236-
- events
237-
verbs:
238-
- create
239-
- patch
240-
- update

‎test/e2e/data/cni/calico.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4027,6 +4027,8 @@ spec:
40274027
operator: Exists
40284028
- key: node-role.kubernetes.io/master
40294029
effect: NoSchedule
4030+
- key: node-role.kubernetes.io/control-plane
4031+
effect: NoSchedule
40304032
serviceAccountName: calico-kube-controllers
40314033
priorityClassName: system-cluster-critical
40324034
containers:

‎test/e2e/data/e2e_conf.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
managementClusterName: capo-e2e
1313

1414
images:
15-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.1.0
15+
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.1.3
1616
loadBehavior: tryLoad
17-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.1.0
17+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.1.3
1818
loadBehavior: tryLoad
19-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.1.0
19+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.1.3
2020
loadBehavior: tryLoad
2121
# Use local dev images built source tree;
2222
- name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
@@ -32,8 +32,8 @@ providers:
3232
- name: cluster-api
3333
type: CoreProvider
3434
versions:
35-
- name: v1.1.0
36-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/core-components.yaml"
35+
- name: v1.1.3
36+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/core-components.yaml"
3737
type: url
3838
files:
3939
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -45,8 +45,8 @@ providers:
4545
- name: kubeadm
4646
type: BootstrapProvider
4747
versions:
48-
- name: v1.1.0
49-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/bootstrap-components.yaml"
48+
- name: v1.1.3
49+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/bootstrap-components.yaml"
5050
type: url
5151
files:
5252
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -58,8 +58,8 @@ providers:
5858
- name: kubeadm
5959
type: ControlPlaneProvider
6060
versions:
61-
- name: v1.1.0
62-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/control-plane-components.yaml"
61+
- name: v1.1.3
62+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/control-plane-components.yaml"
6363
type: url
6464
files:
6565
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -95,7 +95,7 @@ providers:
9595
variables:
9696
# used to ensure we deploy to the correct management cluster
9797
KUBE_CONTEXT: "kind-capo-e2e"
98-
KUBERNETES_VERSION: "v1.21.3"
98+
KUBERNETES_VERSION: "v1.23.5"
9999
CNI: "../../data/cni/calico.yaml"
100100
CCM: "../../data/ccm/cloud-controller-manager.yaml"
101101
EXP_CLUSTER_RESOURCE_SET: "true"

0 commit comments

Comments
 (0)