Skip to content

Commit fd59232

Browse files
AnkitaswAnkitasw
committed
chore: Bump CAPI to v1.4.3
1 parent 6705ad8 commit fd59232

File tree

9 files changed

+32
-33
lines changed

9 files changed

+32
-33
lines changed

‎controllers/awsmachine_controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,12 @@ func (r *AWSMachineReconciler) findInstance(scope *scope.MachineScope, ec2svc se
419419
var instance *infrav1.Instance
420420

421421
// Parse the ProviderID.
422+
//nolint:staticcheck
423+
// Usage of noderefutil pkg would be removed in a future release.
422424
pid, err := noderefutil.NewProviderID(scope.GetProviderID())
423425
if err != nil {
426+
//nolint:staticcheck
427+
// Usage of noderefutil pkg would be removed in a future release.
424428
if !errors.Is(err, noderefutil.ErrEmptyProviderID) {
425429
return nil, errors.Wrapf(err, "failed to parse Spec.ProviderID")
426430
}
@@ -433,6 +437,7 @@ func (r *AWSMachineReconciler) findInstance(scope *scope.MachineScope, ec2svc se
433437
} else {
434438
// If the ProviderID is populated, describe the instance using the ID.
435439
// InstanceIfExists() returns error (ErrInstanceNotFoundByID or ErrDescribeInstance) if the instance could not be found.
440+
//nolint:staticcheck
436441
instance, err = ec2svc.InstanceIfExists(pointer.String(pid.ID()))
437442
if err != nil {
438443
return nil, err

‎controllers/awsmachine_controller_unit_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import (
5252
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
5353
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
5454
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
55-
"sigs.k8s.io/cluster-api/controllers/noderefutil"
5655
capierrors "sigs.k8s.io/cluster-api/errors"
5756
"sigs.k8s.io/cluster-api/util"
5857
)
@@ -287,9 +286,6 @@ func TestAWSMachineReconciler(t *testing.T) {
287286
id := providerID
288287
providerID := func(t *testing.T, g *WithT) {
289288
t.Helper()
290-
_, err := noderefutil.NewProviderID(id)
291-
g.Expect(err).To(BeNil())
292-
293289
ms.AWSMachine.Spec.ProviderID = &id
294290
}
295291

‎exp/controllers/awsmachinepool_controller_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import (
4343
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/mock_services"
4444
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
4545
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
46-
"sigs.k8s.io/cluster-api/controllers/noderefutil"
4746
capierrors "sigs.k8s.io/cluster-api/errors"
4847
expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4948
"sigs.k8s.io/cluster-api/util/conditions"
@@ -238,10 +237,6 @@ func TestAWSMachinePoolReconciler(t *testing.T) {
238237
id := "<cloudProvider>://<optional>/<segments>/<providerid>"
239238
setProviderID := func(t *testing.T, g *WithT) {
240239
t.Helper()
241-
242-
_, err := noderefutil.NewProviderID(id)
243-
g.Expect(err).To(BeNil())
244-
245240
ms.AWSMachinePool.Spec.ProviderID = id
246241
}
247242
t.Run("should look up by provider ID when one exists", func(t *testing.T) {

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws/v2
22

33
go 1.19
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.2
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.3
66

77
require (
88
github.com/alessio/shellescape v1.4.1
@@ -38,8 +38,8 @@ require (
3838
k8s.io/klog/v2 v2.100.1
3939
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
4040
sigs.k8s.io/aws-iam-authenticator v0.6.10
41-
sigs.k8s.io/cluster-api v1.4.2
42-
sigs.k8s.io/cluster-api/test v1.4.2
41+
sigs.k8s.io/cluster-api v1.4.3
42+
sigs.k8s.io/cluster-api/test v1.4.3
4343
sigs.k8s.io/controller-runtime v0.14.5
4444
sigs.k8s.io/kustomize/api v0.13.4
4545
sigs.k8s.io/yaml v1.3.0

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,10 +1027,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10271027
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10281028
sigs.k8s.io/aws-iam-authenticator v0.6.10 h1:ld4g1kQUAG9jgUUc0e4cRPhRXTvzp0/uw5M6iSYskpY=
10291029
sigs.k8s.io/aws-iam-authenticator v0.6.10/go.mod h1:uh/d/yhtzJXBdevntKgTKRaabgD2T/JI/YdV+9IaycE=
1030-
sigs.k8s.io/cluster-api v1.4.2 h1:hdIz0Ms2j7YaU1qBK5yF2R8ii0GcGb3jQ7EO6i3tAN8=
1031-
sigs.k8s.io/cluster-api v1.4.2/go.mod h1:IIebZTsqyXU8CHbINV2zuMh0/wykqdr+vEXxQNeteEU=
1032-
sigs.k8s.io/cluster-api/test v1.4.2 h1:uHFtn0SFOFOxIbdahLoYo4kz84yLqCmhbVLV4vsk1gQ=
1033-
sigs.k8s.io/cluster-api/test v1.4.2/go.mod h1:/64ycj3YFMW1BGVtCtfwmlVAXGN0DFTZEkIClh68Svo=
1030+
sigs.k8s.io/cluster-api v1.4.3 h1:QSeKr3qnWPtVp+EMQZQduKoi5WDwUhAtBRreEukkcy0=
1031+
sigs.k8s.io/cluster-api v1.4.3/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
1032+
sigs.k8s.io/cluster-api/test v1.4.3 h1:xXhvOLp5zBKn2Yf4PQckFwxGxFrKgkgUI74ikU5Jh/c=
1033+
sigs.k8s.io/cluster-api/test v1.4.3/go.mod h1:xGTJsJkbXMNmumhErEAH/e7GmnE2sGfm/rcOzJZSdbw=
10341034
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
10351035
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
10361036
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎pkg/cloud/scope/machine.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,13 @@ func (m *MachineScope) Role() string {
127127

128128
// GetInstanceID returns the AWSMachine instance id by parsing Spec.ProviderID.
129129
func (m *MachineScope) GetInstanceID() *string {
130+
//nolint:staticcheck
131+
// Usage of noderefutil pkg would be removed in a future release.
130132
parsed, err := noderefutil.NewProviderID(m.GetProviderID())
131133
if err != nil {
132134
return nil
133135
}
136+
//nolint:staticcheck
134137
return pointer.String(parsed.ID())
135138
}
136139

‎test/e2e/data/e2e_conf.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ images:
2020
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
2121

2222
# Cluster API v1beta1 Preloads
23-
- name: quay.io/jetstack/cert-manager-cainjector:v1.11.0
23+
- name: quay.io/jetstack/cert-manager-cainjector:v1.12.1
2424
loadBehavior: tryLoad
25-
- name: quay.io/jetstack/cert-manager-webhook:v1.11.0
25+
- name: quay.io/jetstack/cert-manager-webhook:v1.12.1
2626
loadBehavior: tryLoad
27-
- name: quay.io/jetstack/cert-manager-controller:v1.11.0
27+
- name: quay.io/jetstack/cert-manager-controller:v1.12.1
2828
loadBehavior: tryLoad
2929
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.1
3030
loadBehavior: tryLoad

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ images:
1717
loadBehavior: mustLoad
1818

1919
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
20-
- name: quay.io/jetstack/cert-manager-cainjector:v1.11.0
20+
- name: quay.io/jetstack/cert-manager-cainjector:v1.12.1
2121
loadBehavior: tryLoad
22-
- name: quay.io/jetstack/cert-manager-webhook:v1.11.0
22+
- name: quay.io/jetstack/cert-manager-webhook:v1.12.1
2323
loadBehavior: tryLoad
24-
- name: quay.io/jetstack/cert-manager-controller:v1.11.0
24+
- name: quay.io/jetstack/cert-manager-controller:v1.12.1
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.2
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.3
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.2
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.3
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.2
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.3
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.4.2
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.2/core-components.yaml"
37+
- name: v1.4.3
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.4.2
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.2/bootstrap-components.yaml"
53+
- name: v1.4.3
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.4.2
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.2/control-plane-components.yaml"
69+
- name: v1.4.3
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:

‎versions.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
1717
GH_VERSION := 2.7.0
1818
CERT_MANAGER_VERSION := v1.10.1
19-
CAPI_VERSION := v1.4.2
20-
KPROMO_VERSION := v3.5.1
19+
CAPI_VERSION := v1.4.3
20+
KPROMO_VERSION := v3.6.0
2121
YQ_VERSION := v4.25.2

0 commit comments

Comments
 (0)