Skip to content

Merge upstream into main #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 17 commits into from
Apr 27, 2022
Merged

Merge upstream into main #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d94969e
feat: support application credential auth #1146
apricote Feb 25, 2022
3ce2de7
Merge pull request #1189 from apricote/application-credential-support
k8s-ci-robot Apr 13, 2022
91384af
address CVE-2022-27191
jichenjc Apr 14, 2022
aeedb58
Merge pull request #1204 from jichenjc/bug/1203
k8s-ci-robot Apr 14, 2022
311741f
rename v1beta1 to v1alpha5
apricote Mar 24, 2022
af6f623
Merge pull request #1198 from apricote/rename-v1beta1-v1alpha5
k8s-ci-robot Apr 19, 2022
603e9db
docs: replace dead link for cloud.conf details
apricote Apr 20, 2022
368bc8b
Fix capo v1.24 kubernetes compatibility
chrischdi Apr 19, 2022
0373249
Merge pull request #1211 from apricote/cloud-conf-dead-link
k8s-ci-robot Apr 20, 2022
1aba6e6
add apricote to capo-reviewers
apricote Apr 20, 2022
b580527
Merge pull request #1212 from apricote/apricote-reviewer
k8s-ci-robot Apr 20, 2022
9ac4592
Remove prankul88 as a reviewer
mdbooth Apr 20, 2022
cfa1a36
Merge pull request #1213 from mdbooth/remove_prankul
k8s-ci-robot Apr 21, 2022
3431b8a
Merge pull request #1209 from chrischdi/pr-bump-capi-v1-1-3
k8s-ci-robot Apr 21, 2022
46a7cb7
Improve log message
anilkumar56 Apr 13, 2022
c3d843f
Merge pull request #1202 from anilkumar56/improve_log
k8s-ci-robot Apr 21, 2022
53cc87d
Merge upstream/main
pierreprinetti Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ linters-settings:
alias: infrav1alpha3
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4
alias: infrav1alpha4
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha5
alias: infrav1
- pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
alias: capoerrors
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ e2e-image: docker-build

# Pull all the images references in test/e2e/data/e2e_conf.yaml
test-e2e-image-prerequisites:
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.1.0
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.1.0
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.1.0
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.1.3
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.1.3
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.1.3
docker pull quay.io/jetstack/cert-manager-cainjector:v1.5.3
docker pull quay.io/jetstack/cert-manager-webhook:v1.5.3
docker pull quay.io/jetstack/cert-manager-controller:v1.5.3
Expand Down
8 changes: 4 additions & 4 deletions PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ resources:
kind: OpenStackClusterTemplate
version: v1alpha4
- group: infrastructure
version: v1beta1
version: v1alpha5
kind: OpenStackCluster
- group: infrastructure
version: v1beta1
version: v1alpha5
kind: OpenStackMachine
- group: infrastructure
version: v1beta1
version: v1alpha5
kind: OpenStackMachineTemplate
- group: infrastructure
kind: OpenStackClusterTemplate
version: v1beta1
version: v1alpha5
26 changes: 14 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@ previous cluster managers such as [kops][kops] and

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

| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.0) |
| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.1) |
| ---------------------------------- | --------------- | --------------- | -------------- |
| OpenStack Provider v1alpha3 (v0.3) | ✓ | | |
| OpenStack Provider v1alpha4 (v0.4) | | ✓ | |
| OpenStack Provider v1alpha4 (v0.5) | | | ✓ |
| OpenStack Provider v1beta1 | | | ✓ |
| OpenStack Provider v1alpha3 (v0.3) | ✓ | | |
| OpenStack Provider v1alpha4 (v0.4) | | ✓ | |
| OpenStack Provider v1alpha4 (v0.5) | | | ✓ |
| OpenStack Provider v1alpha5 | | | ✓ |


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

| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 |
| ---------------------------------- | ----- | ----- | ----- | ----- | ----- | ----- |
| OpenStack Provider v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | |
| OpenStack Provider v1alpha4 (v0.4) | | | | | ✓ | ✓ |
| OpenStack Provider v1alpha4 (v0.5) | | | | | ✓ | ✓ |
| OpenStack Provider v1beta1 | | | | | | ✓ |
| | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 |
| ---------------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
| OpenStack Provider v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
| OpenStack Provider v1alpha4 (v0.4) | | | | | ✓ | | | |
| OpenStack Provider v1alpha4 (v0.5) | | | | | ✓ | ✓ | + | + |
| OpenStack Provider v1alpha5 | | | | | | ✓ | + | ✓ |

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

Expand All @@ -61,7 +61,7 @@ This provider's versions are able to install Kubernetes to the following version
| OpenStack Provider v1alpha3 (v0.3) | + | + | + | ✓ | ✓ | ✓ | ✓ | | |
| OpenStack Provider v1alpha4 (v0.4) | + | + | + | + | + | + | ✓ | | |
| OpenStack Provider v1alpha4 (v0.5) | + | + | + | + | + | + | ✓ | | |
| OpenStack Provider v1beta1 | + | + | + | + | + | + | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha5 | + | + | + | + | + | + | ✓ | ✓ | ✓ |

Test status:

Expand All @@ -75,6 +75,8 @@ policy may be made to more closely aligned with other providers in the Cluster A

**NOTE:** The minimum microversion of CAPI using nova is `2.53` now due to `server tags` support, see [code](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/c052e7e600f0e5ebddc839c08746bb636e79be87/pkg/cloud/services/compute/service.go#L38) for additional information.

**NOTE:** We require Keystone v3 for authentication.

------

## Development versions
Expand Down
Loading