Skip to content

Commit cdc3963

Browse files
authored
fix: update CAPA to v2.10.0-ncn.1 (#1360)
**What problem does this PR solve?**: Upgrade CAPA fork https://github.com/nutanix-cloud-native/cluster-api-provider-aws to v2.10.0-ncn.1 **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent cd71829 commit cdc3963

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

api/external/sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2/nodeadmconfig_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type NodeadmConfigSpec struct {
2323

2424
// PreNodeadmCommands specifies extra commands to run before bootstrapping nodes.
2525
// +optional
26-
PreNodeadmCommands []string `json:"PreNodeadmCommands,omitempty"`
26+
PreNodeadmCommands []string `json:"preNodeadmCommands,omitempty"`
2727

2828
// Files specifies extra files to be passed to user_data upon creation.
2929
// +optional

hack/third-party/capa/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ require (
7777
sigs.k8s.io/yaml v1.4.0 // indirect
7878
)
7979

80-
replace sigs.k8s.io/cluster-api-provider-aws/v2 => github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.0
80+
replace sigs.k8s.io/cluster-api-provider-aws/v2 => github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.1

hack/third-party/capa/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
8888
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
8989
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9090
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
91-
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.0 h1:vD7oex8Dy4AiY/8i0UcP1VSQUwcAAdGf/ErAbezhYnw=
92-
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.0/go.mod h1:WY3AVEBesaq6mSdQDfnI42nHQCjDtGh7lWxFk/rcBcY=
91+
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.1 h1:HsZuCG3lDwWAhbT03HNJ23vLdr3WOIaqb3sdYuEPMJA=
92+
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.1/go.mod h1:WY3AVEBesaq6mSdQDfnI42nHQCjDtGh7lWxFk/rcBcY=
9393
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
9494
github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0=
9595
github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=

make/clusterctl.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
export CAPI_VERSION := $(shell GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api)
55
export CAPD_VERSION := $(shell GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api/test)
6-
export CAPA_VERSION := $(shell cd hack/third-party/capa && GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api-provider-aws/v2)-ncn.0
6+
export CAPA_VERSION := $(shell cd hack/third-party/capa && GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api-provider-aws/v2)-ncn.1
77
export CAPX_VERSION := $(shell cd hack/third-party/capx && GOWORK=off go list -m -f '{{ .Version }}' github.com/nutanix-cloud-native/cluster-api-provider-nutanix)
88
export CAAPH_VERSION := $(shell cd hack/third-party/caaph && GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api-addon-provider-helm)
99

0 commit comments

Comments
 (0)