Skip to content

⚠️ Add v1alpha8 #1782

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
merged 1 commit into from
Dec 14, 2023
Merged

⚠️ Add v1alpha8 #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ linters-settings:
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
alias: infrav1alpha6
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
alias: infrav1alpha7
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8
alias: infrav1
- pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
alias: capoerrors
Expand Down
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ e2e-templates: ## Generate cluster templates for e2e tests
e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
cluster-template-v1alpha5.yaml \
cluster-template-v1alpha6.yaml \
cluster-template-v1alpha7.yaml \
cluster-template-md-remediation.yaml \
cluster-template-kcp-remediation.yaml \
cluster-template-multi-az.yaml \
Expand Down Expand Up @@ -258,6 +259,7 @@ generate-go: $(MOCKGEN)
--input-dirs=./api/v1alpha5 \
--input-dirs=./api/v1alpha6 \
--input-dirs=./api/v1alpha7 \
--input-dirs=./api/v1alpha8 \
--output-file-base=zz_generated.conversion \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
go generate ./...
Expand Down Expand Up @@ -406,10 +408,10 @@ templates: templates/cluster-template.yaml \
templates/cluster-template-without-lb.yaml \
templates/cluster-template-flatcar.yaml

templates/cluster-template.yaml: kustomize/v1alpha7/default $(KUSTOMIZE) FORCE
templates/cluster-template.yaml: kustomize/v1alpha8/default $(KUSTOMIZE) FORCE
$(KUSTOMIZE) build "$<" > "$@"

templates/cluster-template-%.yaml: kustomize/v1alpha7/% $(KUSTOMIZE) FORCE
templates/cluster-template-%.yaml: kustomize/v1alpha8/% $(KUSTOMIZE) FORCE
$(KUSTOMIZE) build "$<" > "$@"

.PHONY: release-templates
Expand Down
12 changes: 12 additions & 0 deletions PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,15 @@ resources:
- group: infrastructure
kind: OpenStackClusterTemplate
version: v1alpha7
- group: infrastructure
version: v1alpha8
kind: OpenStackCluster
- group: infrastructure
version: v1alpha8
kind: OpenStackMachine
- group: infrastructure
version: v1alpha8
kind: OpenStackMachineTemplate
- group: infrastructure
kind: OpenStackClusterTemplate
version: v1alpha8
9 changes: 6 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ This provider's versions are compatible with the following versions of Cluster A
|------------------------------------| -------------- |
| OpenStack Provider v1alpha5 (v0.6) | ✓ |
| OpenStack Provider v1alpha6 (v0.7) | ✓ |
| OpenStack Provider v1alpha7 | ✓ |
| OpenStack Provider v1alpha7 (v0.9) | ✓ |
| OpenStack Provider v1alpha8 | ✓ |


This provider's versions are able to install and manage the following versions of Kubernetes:
Expand All @@ -52,15 +53,17 @@ This provider's versions are able to install and manage the following versions o
|------------------------------------| ----- | ----- | ----- | ----- |
| OpenStack Provider v1alpha5 (v0.6) | ✓ | + | + | + |
| OpenStack Provider v1alpha6 (v0.7) | ✓ | ✓ | ✓ | + |
| OpenStack Provider v1alpha7 | + | ✓ | ✓ | ★ |
| OpenStack Provider v1alpha7 (v0.9) | + | ✓ | ✓ | ★ |
| OpenStack Provider v1alpha8 | + | ✓ | ✓ | ★ |

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

| | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
|------------------------------------| ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + | ✓ | ✓ | ✓ | ★ |
| OpenStack Provider v1alpha6 (v0.7) | + | + | + | + | + | ✓ | ✓ | ✓ | ★ |
| OpenStack Provider v1alpha7 | | + | + | + | + | ✓ | ✓ | ✓ | ★ |
| OpenStack Provider v1alpha7 (v0.9) | | + | + | + | + | ✓ | ✓ | ✓ | ★ |
| OpenStack Provider v1alpha8 | | + | + | + | + | ✓ | ✓ | ✓ | ★ |

Test status:

Expand Down
128 changes: 64 additions & 64 deletions api/v1alpha5/conversion.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/v1alpha5/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime"
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"

infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8"
)

func TestConvertFrom(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha5/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8
package v1alpha5
Loading