Skip to content

Commit dbd3660

Browse files
toby-archer-trtoby-archer-tr
committed
Begin upgrade to v1beta2
1 parent bd8766a commit dbd3660

File tree

187 files changed

+3915
-2227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+3915
-2227
lines changed

‎.golangci.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ linters:
131131
alias: eksbootstrapcontrollers
132132
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/controllers
133133
alias: ekscontrolplanecontrollers
134+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/util/clusterapiv1beta1
135+
alias: clusterapiv1beta1util
134136
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/exp/controllers
135137
alias: expcontrollers
136138
- pkg: k8s.io/apimachinery/pkg/runtime
@@ -139,7 +141,7 @@ linters:
139141
alias: runtimeserializer
140142
- pkg: k8s.io/apimachinery/pkg/runtime/serializer/yaml
141143
alias: yamlserializer
142-
- pkg: sigs.k8s.io/cluster-api/api/v1beta1
144+
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
143145
alias: clusterv1
144146
- pkg: sigs.k8s.io/cluster-api/util/defaulting
145147
alias: utildefaulting
@@ -169,8 +171,8 @@ linters:
169171
alias: crclient
170172
- pkg: k8s.io/apimachinery/pkg/types
171173
alias: apimachinerytypes
172-
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
173-
alias: expclusterv1
174+
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta2
175+
alias: clusterv1
174176
no-unaliased: false
175177
nolintlint:
176178
require-specific: true

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ endif
204204
.PHONY: defaulters
205205
defaulters: $(DEFAULTER_GEN) ## Generate all Go types
206206
$(DEFAULTER_GEN) \
207-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
207+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta1 \
208208
--v=0 \
209209
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
210210
--output-file=zz_generated.defaults.go \
@@ -262,36 +262,36 @@ generate-go-apis: ## Alias for .build/generate-go-apis
262262
$(MAKE) defaulters
263263

264264
$(CONVERSION_GEN) \
265-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
265+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta1 \
266266
--output-file=zz_generated.conversion.go \
267267
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
268268
./api/v1beta1 \
269269
./cmd/clusterawsadm/api/bootstrap/v1alpha1
270270

271271
$(CONVERSION_GEN) \
272272
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
273-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
273+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta1 \
274274
--output-file=zz_generated.conversion.go \
275275
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
276276
./$(EXP_DIR)/api/v1beta1
277277

278278
$(CONVERSION_GEN) \
279279
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
280-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
280+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta1 \
281281
--output-file=zz_generated.conversion.go \
282282
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
283283
./bootstrap/eks/api/v1beta1
284284

285285
$(CONVERSION_GEN) \
286286
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
287-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
287+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta1 \
288288
--output-file=zz_generated.conversion.go \
289289
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
290290
./controlplane/eks/api/v1beta1
291291

292292
$(CONVERSION_GEN) \
293293
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
294-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
294+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta1 \
295295
--output-file=zz_generated.conversion.go \
296296
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
297297
./controlplane/rosa/api/v1beta2

‎api/v1beta1/awscluster_types.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
2323
)
2424

2525
const (
@@ -200,11 +200,11 @@ type AWSLoadBalancerSpec struct {
200200
// AWSClusterStatus defines the observed state of AWSCluster.
201201
type AWSClusterStatus struct {
202202
// +kubebuilder:default=false
203-
Ready bool `json:"ready"`
204-
Network NetworkStatus `json:"networkStatus,omitempty"`
205-
FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
206-
Bastion *Instance `json:"bastion,omitempty"`
207-
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
203+
Ready bool `json:"ready"`
204+
Network NetworkStatus `json:"networkStatus,omitempty"`
205+
FailureDomains []clusterv1.FailureDomain `json:"failureDomains,omitempty"`
206+
Bastion *Instance `json:"bastion,omitempty"`
207+
Conditions []metav1.Condition `json:"conditions,omitempty"`
208208
}
209209

210210
// S3Bucket defines a supporting S3 bucket for the cluster, currently can be optionally used for Ignition.
@@ -254,12 +254,12 @@ type AWSClusterList struct {
254254
}
255255

256256
// GetConditions returns the observations of the operational state of the AWSCluster resource.
257-
func (r *AWSCluster) GetConditions() clusterv1.Conditions {
257+
func (r *AWSCluster) GetConditions() []metav1.Condition {
258258
return r.Status.Conditions
259259
}
260260

261-
// SetConditions sets the underlying service state of the AWSCluster to the predescribed clusterv1.Conditions.
262-
func (r *AWSCluster) SetConditions(conditions clusterv1.Conditions) {
261+
// SetConditions sets the underlying service state of the AWSCluster to the predescribed []metav1.Condition.
262+
func (r *AWSCluster) SetConditions(conditions []metav1.Condition) {
263263
r.Status.Conditions = conditions
264264
}
265265

‎api/v1beta1/awsclustertemplate_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
// AWSClusterTemplateSpec defines the desired state of AWSClusterTemplate.

‎api/v1beta1/awsmachine_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
const (

‎api/v1beta1/awsmachinetemplate_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

23-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
23+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2424
)
2525

2626
// AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.

‎api/v1beta1/conditions_consts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package v1beta1
1818

19-
import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
19+
import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2020

2121
const (
2222
// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.

‎api/v1beta1/tags.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/types"
2525
"k8s.io/apimachinery/pkg/util/validation/field"
2626

27-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
27+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2828
)
2929

3030
// Tags defines a map of tags.

‎api/v1beta1/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
"k8s.io/apimachinery/pkg/util/sets"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
// AWSResourceReference is a reference to a specific AWS resource by ID or filters.

‎api/v1beta1/zz_generated.conversion.go‎

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

0 commit comments

Comments
 (0)