Skip to content

Commit b263abc

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2251 from shiftstack/capi-1.9-beta
Bump CAPI to v1.9.3
2 parents 6f66793 + ce87310 commit b263abc

36 files changed

+1362
-514
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ e2e-image: docker-build
209209

210210
# Pull all the images references in test/e2e/data/e2e_conf.yaml
211211
test-e2e-image-prerequisites:
212-
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.8.5
213-
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.5
214-
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.5
212+
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.9.3
213+
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.3
214+
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.3
215215

216216
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
217217
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)

‎api/v1alpha6/openstackcluster_types.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ package v1alpha6
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22-
capierrors "sigs.k8s.io/cluster-api/errors"
22+
23+
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2324
)
2425

2526
const (
@@ -190,7 +191,7 @@ type OpenStackClusterStatus struct {
190191
// OpenStackClusters can be added as events to the OpenStackCluster object
191192
// and/or logged in the controller's output.
192193
// +optional
193-
FailureReason *capierrors.ClusterStatusError `json:"failureReason,omitempty"`
194+
FailureReason *capoerrors.DeprecatedCAPIClusterStatusError `json:"failureReason,omitempty"`
194195

195196
// FailureMessage will be set in the event that there is a terminal problem
196197
// reconciling the OpenStackCluster and will contain a more verbose string suitable

‎api/v1alpha6/openstackmachine_types.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import (
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/utils/ptr"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
24-
"sigs.k8s.io/cluster-api/errors"
24+
25+
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2526
)
2627

2728
const (
@@ -118,7 +119,7 @@ type OpenStackMachineStatus struct {
118119
// +optional
119120
InstanceState *InstanceState `json:"instanceState,omitempty"`
120121

121-
FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
122+
FailureReason *capoerrors.DeprecatedCAPIMachineStatusError `json:"failureReason,omitempty"`
122123

123124
// FailureMessage will be set in the event that there is a terminal problem
124125
// reconciling the Machine and will contain a more verbose string suitable
@@ -189,7 +190,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
189190
}
190191

191192
// SetFailure sets the OpenStackMachine status failure reason and failure message.
192-
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
193+
func (r *OpenStackMachine) SetFailure(failureReason capoerrors.DeprecatedCAPIMachineStatusError, failureMessage error) {
193194
r.Status.FailureReason = &failureReason
194195
r.Status.FailureMessage = ptr.To(failureMessage.Error())
195196
}

‎api/v1alpha6/zz_generated.conversion.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha6/zz_generated.deepcopy.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha7/openstackcluster_types.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ package v1alpha7
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22-
capierrors "sigs.k8s.io/cluster-api/errors"
22+
23+
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2324
)
2425

2526
const (
@@ -207,7 +208,7 @@ type OpenStackClusterStatus struct {
207208
// OpenStackClusters can be added as events to the OpenStackCluster object
208209
// and/or logged in the controller's output.
209210
// +optional
210-
FailureReason *capierrors.ClusterStatusError `json:"failureReason,omitempty"`
211+
FailureReason *capoerrors.DeprecatedCAPIClusterStatusError `json:"failureReason,omitempty"`
211212

212213
// FailureMessage will be set in the event that there is a terminal problem
213214
// reconciling the OpenStackCluster and will contain a more verbose string suitable

‎api/v1alpha7/openstackmachine_types.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import (
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/utils/ptr"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
24-
"sigs.k8s.io/cluster-api/errors"
24+
25+
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2526
)
2627

2728
const (
@@ -118,7 +119,7 @@ type OpenStackMachineStatus struct {
118119
// +optional
119120
InstanceState *InstanceState `json:"instanceState,omitempty"`
120121

121-
FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
122+
FailureReason *capoerrors.DeprecatedCAPIMachineStatusError `json:"failureReason,omitempty"`
122123

123124
// FailureMessage will be set in the event that there is a terminal problem
124125
// reconciling the Machine and will contain a more verbose string suitable
@@ -187,7 +188,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
187188
}
188189

189190
// SetFailure sets the OpenStackMachine status failure reason and failure message.
190-
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
191+
func (r *OpenStackMachine) SetFailure(failureReason capoerrors.DeprecatedCAPIMachineStatusError, failureMessage error) {
191192
r.Status.FailureReason = &failureReason
192193
r.Status.FailureMessage = ptr.To(failureMessage.Error())
193194
}

‎api/v1alpha7/zz_generated.conversion.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha7/zz_generated.deepcopy.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1beta1/openstackcluster_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22-
capierrors "sigs.k8s.io/cluster-api/errors"
2322

23+
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2424
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
2525
)
2626

@@ -258,7 +258,7 @@ type OpenStackClusterStatus struct {
258258
// OpenStackClusters can be added as events to the OpenStackCluster object
259259
// and/or logged in the controller's output.
260260
// +optional
261-
FailureReason *capierrors.ClusterStatusError `json:"failureReason,omitempty"`
261+
FailureReason *capoerrors.DeprecatedCAPIClusterStatusError `json:"failureReason,omitempty"`
262262

263263
// FailureMessage will be set in the event that there is a terminal problem
264264
// reconciling the OpenStackCluster and will contain a more verbose string suitable

‎api/v1beta1/openstackmachine_types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/utils/ptr"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
24-
"sigs.k8s.io/cluster-api/errors"
2524

25+
capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
2626
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
2727
)
2828

@@ -211,7 +211,7 @@ type OpenStackMachineStatus struct {
211211
// +optional
212212
Resources *MachineResources `json:"resources,omitempty"`
213213

214-
FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
214+
FailureReason *capoerrors.DeprecatedCAPIMachineStatusError `json:"failureReason,omitempty"`
215215

216216
// FailureMessage will be set in the event that there is a terminal problem
217217
// reconciling the Machine and will contain a more verbose string suitable
@@ -276,7 +276,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
276276
}
277277

278278
// SetFailure sets the OpenStackMachine status failure reason and failure message.
279-
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
279+
func (r *OpenStackMachine) SetFailure(failureReason capoerrors.DeprecatedCAPIMachineStatusError, failureMessage error) {
280280
r.Status.FailureReason = &failureReason
281281
r.Status.FailureMessage = ptr.To(failureMessage.Error())
282282
}

‎api/v1beta1/zz_generated.deepcopy.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api_violations.report

+10
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,Cluste
6666
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassSpec,Variables
6767
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,Variables
6868
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatusVariable,Definitions
69+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AllOf
70+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AnyOf
6971
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Enum
72+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,OneOf
7073
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Required
7174
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckClass,UnhealthyConditions
7275
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckSpec,UnhealthyConditions
@@ -148,6 +151,13 @@ API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v
148151
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Router,IPs
149152
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6AddressMode
150153
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6RAMode
154+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,V1Beta2
155+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterStatus,V1Beta2
156+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XIntOrString
151157
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XMetadata
152158
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XPreserveUnknownFields
153159
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XValidations
160+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineDeploymentStatus,V1Beta2
161+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,V1Beta2
162+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineSetStatus,V1Beta2
163+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineStatus,V1Beta2

0 commit comments

Comments
 (0)