Skip to content

Commit

Permalink
Rename v1alpha8 to v1beta1
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilienM committed Feb 27, 2024
1 parent 1b0f1ea commit e9fb53c
Show file tree
Hide file tree
Showing 106 changed files with 1,891 additions and 1,891 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ linters-settings:
alias: infrav1alpha6
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
alias: infrav1alpha7
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8
- pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
alias: infrav1
- pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
alias: capoerrors
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ generate-go: $(MOCKGEN)
--input-dirs=./api/v1alpha5 \
--input-dirs=./api/v1alpha6 \
--input-dirs=./api/v1alpha7 \
--input-dirs=./api/v1alpha8 \
--input-dirs=./api/v1beta1 \
--output-file-base=zz_generated.conversion \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
go generate ./...
Expand Down Expand Up @@ -410,10 +410,10 @@ templates: templates/cluster-template.yaml \
templates/cluster-template-flatcar.yaml \
templates/cluster-template-flatcar-sysext.yaml

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

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

.PHONY: release-templates
Expand Down
8 changes: 4 additions & 4 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ resources:
kind: OpenStackClusterTemplate
version: v1alpha7
- group: infrastructure
version: v1alpha8
version: v1beta1
kind: OpenStackCluster
- group: infrastructure
version: v1alpha8
version: v1beta1
kind: OpenStackMachine
- group: infrastructure
version: v1alpha8
version: v1beta1
kind: OpenStackMachineTemplate
- group: infrastructure
kind: OpenStackClusterTemplate
version: v1alpha8
version: v1beta1
- group: infrastructure
kind: OpenStackFloatingIPPool
version: v1alpha1
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ 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 (v0.9) ||
| OpenStack Provider v1alpha8 ||
| OpenStack Provider v1beta1 ||


This provider's versions are able to install and manage the following versions of Kubernetes:
Expand All @@ -54,7 +54,7 @@ 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 (v0.9) | + ||||
| OpenStack Provider v1alpha8 | + ||||
| OpenStack Provider v1beta1 | + ||||

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

Expand All @@ -63,7 +63,7 @@ This provider's versions are able to install Kubernetes to the following version
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + ||||||
| OpenStack Provider v1alpha6 (v0.7) | + | + | + | + | + ||||||
| OpenStack Provider v1alpha7 (v0.9) | | + | + | + | + ||||||
| OpenStack Provider v1alpha8 | | + | + | + | + ||||||
| OpenStack Provider v1beta1 | | + | + | + | + ||||||

Test status:

Expand Down
156 changes: 78 additions & 78 deletions api/v1alpha5/conversion.go

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/v1alpha5/conversion_test.go
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/v1alpha8"
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
)

func TestConvertFrom(t *testing.T) {
Expand Down Expand Up @@ -110,7 +110,7 @@ func TestConvertFrom(t *testing.T) {
}
}

func TestConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(t *testing.T) {
func TestConvert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(t *testing.T) {
tests := []struct {
name string
in *OpenStackClusterSpec
Expand Down Expand Up @@ -151,7 +151,7 @@ func TestConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(
t.Run(tt.name, func(t *testing.T) {
g := gomega.NewWithT(t)
out := &infrav1.OpenStackClusterSpec{}
err := Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(tt.in, out, nil)
err := Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(tt.in, out, nil)
g.Expect(err).NotTo(gomega.HaveOccurred())
g.Expect(out).To(gomega.Equal(tt.expectedOut))
})
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha5/doc.go
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/v1alpha8
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
package v1alpha5
Loading

0 comments on commit e9fb53c

Please sign in to comment.