Skip to content

Commit 6e56117

Browse files
noonedeadpunkmnaseryaguangtangokozachenko1203
authored
Upgrade CAPO version to v0.12.4 (v2) (#165)
* Upgrade CAPO version to v0.12.2 In CAPO version v0.11.2 there is a severe bug allowing to accomplish Denial of Service by any tenant. Manual removal of VM by tenant which is managed by CAPO results in a pod crash in a loop. This has been fixed with [1] and is part of the 0.12.2 release. Signed-off-by: Dmitriy Rabotyagov <[email protected]> * Add manifests and clusterctl of 1.9.6 More modern CAPO also requires corresponding CAPI , otherwise VM creation fails with: `no matches for kind \"Image\" in version \"openstack.k-orc.cloud/v1alpha1\` Signed-off-by: Dmitriy Rabotyagov <[email protected]> * Install ORC for CAPO >= 0.12.0 CAPO 0.12.0 has removed ORC [1] and now it needs to be installed additionally. [1] https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/tag/v0.12.0 Signed-off-by: Dmitriy Rabotyagov <[email protected]> * refactor: use kustomize+indepenent role Signed-off-by: Mohammed Naser <[email protected]> * ci: actually upgrade capo Signed-off-by: Mohammed Naser <[email protected]> * chore: add vendir (vendored config) Signed-off-by: Mohammed Naser <[email protected]> * chore: use vendored kustomize Signed-off-by: Mohammed Naser <[email protected]> * ci: fix linters Signed-off-by: Mohammed Naser <[email protected]> * fix: add proper kustomize process Signed-off-by: Mohammed Naser <[email protected]> * fix: switch to vendored version Signed-off-by: Mohammed Naser <[email protected]> * fix kustmize path Signed-off-by: Mohammed Naser <[email protected]> * fix lint Signed-off-by: Yaguang Tang <[email protected]> * chore: fix ansible-lint issues Signed-off-by: Mohammed Naser <[email protected]> * upgrade to 0.12.4 This [patch](kubernetes-sigs/cluster-api-provider-openstack@c81d89e) is included in this release Signed-off-by: okozachenko1203 <[email protected]> --------- Signed-off-by: Dmitriy Rabotyagov <[email protected]> Signed-off-by: Mohammed Naser <[email protected]> Signed-off-by: Yaguang Tang <[email protected]> Signed-off-by: okozachenko1203 <[email protected]> Co-authored-by: Mohammed Naser <[email protected]> Co-authored-by: Yaguang Tang <[email protected]> Co-authored-by: okozachenko1203 <[email protected]>
1 parent 7b66f2c commit 6e56117

File tree

55 files changed

+49104
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+49104
-5
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
---
2-
exclude: '^(roles/cluster_api/files/providers|roles/(cilium|cert_manager)/files/chart)'
1+
exclude: '^(roles/cluster_api/files/providers|roles/(cilium|cert_manager)/files/chart|roles/openstack_resource_controller/files/kustomize/.*|vendir.lock.yml)'
32

43
repos:
54
- repo: https://github.com/pre-commit/pre-commit-hooks

.zuul.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
clusterctl_version: 1.10.5
115115
cluster_api_version: 1.10.5
116116
cluster_api_infrastructure_provider: openstack
117-
cluster_api_infrastructure_version: 0.11.6
117+
cluster_api_infrastructure_version: 0.12.4
118118
cluster_api_node_selector:
119119
kubernetes.io/os: linux
120120

extensions/molecule/cluster-api/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
clusterctl_version: 1.8.4
2727
cluster_api_version: 1.8.4
2828
cluster_api_infrastructure_provider: openstack
29-
cluster_api_infrastructure_version: 0.9.0
29+
cluster_api_infrastructure_version: 0.11.6

roles/cluster_api/files/providers/bootstrap-kubeadm/v1.9.6/bootstrap-components.yaml

Lines changed: 7961 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# maps release series of major.minor to cluster-api contract version
2+
# the contract version may change between minor or major versions, but *not*
3+
# between patch versions.
4+
#
5+
# update this file only when a new major or minor version is released
6+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
7+
kind: Metadata
8+
releaseSeries:
9+
- major: 1
10+
minor: 9
11+
contract: v1beta1
12+
- major: 1
13+
minor: 8
14+
contract: v1beta1
15+
- major: 1
16+
minor: 7
17+
contract: v1beta1
18+
- major: 1
19+
minor: 6
20+
contract: v1beta1
21+
- major: 1
22+
minor: 5
23+
contract: v1beta1
24+
- major: 1
25+
minor: 4
26+
contract: v1beta1
27+
- major: 1
28+
minor: 3
29+
contract: v1beta1
30+
- major: 1
31+
minor: 2
32+
contract: v1beta1
33+
- major: 1
34+
minor: 1
35+
contract: v1beta1
36+
- major: 1
37+
minor: 0
38+
contract: v1beta1

roles/cluster_api/files/providers/cluster-api/v1.9.6/core-components.yaml

Lines changed: 14724 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# maps release series of major.minor to cluster-api contract version
2+
# the contract version may change between minor or major versions, but *not*
3+
# between patch versions.
4+
#
5+
# update this file only when a new major or minor version is released
6+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
7+
kind: Metadata
8+
releaseSeries:
9+
- major: 1
10+
minor: 9
11+
contract: v1beta1
12+
- major: 1
13+
minor: 8
14+
contract: v1beta1
15+
- major: 1
16+
minor: 7
17+
contract: v1beta1
18+
- major: 1
19+
minor: 6
20+
contract: v1beta1
21+
- major: 1
22+
minor: 5
23+
contract: v1beta1
24+
- major: 1
25+
minor: 4
26+
contract: v1beta1
27+
- major: 1
28+
minor: 3
29+
contract: v1beta1
30+
- major: 1
31+
minor: 2
32+
contract: v1beta1
33+
- major: 1
34+
minor: 1
35+
contract: v1beta1
36+
- major: 1
37+
minor: 0
38+
contract: v1beta1

0 commit comments

Comments
 (0)