Skip to content

Commit 616df5b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1041 from hidekazuna/capi_v1beta1
✨ Update CAPI to v1beta1
2 parents b6695f2 + 657e1b2 commit 616df5b

38 files changed

+881
-619
lines changed

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ e2e-image: docker-build
134134

135135
# Pull all the images references in test/e2e/data/e2e_conf.yaml
136136
test-e2e-image-prerequisites:
137-
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.4.3
138-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v0.4.3
139-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v0.4.3
140-
docker pull quay.io/jetstack/cert-manager-cainjector:v1.5.0
141-
docker pull quay.io/jetstack/cert-manager-webhook:v1.5.0
142-
docker pull quay.io/jetstack/cert-manager-controller:v1.5.0
137+
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.0.0
138+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.0.0
139+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.0.0
140+
docker pull quay.io/jetstack/cert-manager-cainjector:v1.5.3
141+
docker pull quay.io/jetstack/cert-manager-webhook:v1.5.3
142+
docker pull quay.io/jetstack/cert-manager-controller:v1.5.3
143143

144144
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
145145
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)

‎api/v1alpha3/openstackcluster_conversion.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ package v1alpha3
1919
import (
2020
apiconversion "k8s.io/apimachinery/pkg/conversion"
2121
apiv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
22-
apiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
22+
apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
2323
)
2424

25-
// Convert_v1alpha3_APIEndpoint_To_v1alpha4_APIEndpoint is an autogenerated conversion function.
26-
func Convert_v1alpha3_APIEndpoint_To_v1alpha4_APIEndpoint(in *apiv1alpha3.APIEndpoint, out *apiv1alpha4.APIEndpoint, s apiconversion.Scope) error {
27-
return apiv1alpha3.Convert_v1alpha3_APIEndpoint_To_v1alpha4_APIEndpoint(in, out, s)
25+
// Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint is an autogenerated conversion function.
26+
func Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in *apiv1alpha3.APIEndpoint, out *apiv1beta1.APIEndpoint, s apiconversion.Scope) error {
27+
return apiv1alpha3.Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s)
2828
}
2929

30-
// Convert_v1alpha4_APIEndpoint_To_v1alpha3_APIEndpoint is an autogenerated conversion function.
31-
func Convert_v1alpha4_APIEndpoint_To_v1alpha3_APIEndpoint(in *apiv1alpha4.APIEndpoint, out *apiv1alpha3.APIEndpoint, s apiconversion.Scope) error {
32-
return apiv1alpha3.Convert_v1alpha4_APIEndpoint_To_v1alpha3_APIEndpoint(in, out, s)
30+
// Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint is an autogenerated conversion function.
31+
func Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in *apiv1beta1.APIEndpoint, out *apiv1alpha3.APIEndpoint, s apiconversion.Scope) error {
32+
return apiv1alpha3.Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in, out, s)
3333
}

‎api/v1alpha3/zz_generated.conversion.go‎

Lines changed: 14 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha4/openstackcluster_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v1alpha4
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
21+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2222
capierrors "sigs.k8s.io/cluster-api/errors"
2323
)
2424

‎api/v1alpha4/zz_generated.deepcopy.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎clusterctl-settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "infrastructure-openstack",
33
"config": {
44
"componentsFile": "infrastructure-components.yaml",
5-
"nextVersion": "v0.4.0"
5+
"nextVersion": "v0.5.0"
66
}
77
}

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: openstackclusters.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: openstackclustertemplates.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: openstackmachines.infrastructure.cluster.x-k8s.io
1010
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: openstackmachinetemplates.infrastructure.cluster.x-k8s.io
1010
spec:

0 commit comments

Comments
 (0)