Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type NodeadmConfigSpec struct {

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

// Files specifies extra files to be passed to user_data upon creation.
// +optional
Expand Down
2 changes: 1 addition & 1 deletion hack/third-party/capa/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace sigs.k8s.io/cluster-api-provider-aws/v2 => github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.0
replace sigs.k8s.io/cluster-api-provider-aws/v2 => github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.1
4 changes: 2 additions & 2 deletions hack/third-party/capa/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.0 h1:vD7oex8Dy4AiY/8i0UcP1VSQUwcAAdGf/ErAbezhYnw=
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.0/go.mod h1:WY3AVEBesaq6mSdQDfnI42nHQCjDtGh7lWxFk/rcBcY=
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.1 h1:HsZuCG3lDwWAhbT03HNJ23vLdr3WOIaqb3sdYuEPMJA=
github.com/nutanix-cloud-native/cluster-api-provider-aws/v2 v2.10.0-ncn.1/go.mod h1:WY3AVEBesaq6mSdQDfnI42nHQCjDtGh7lWxFk/rcBcY=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0=
github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
Expand Down
2 changes: 1 addition & 1 deletion make/clusterctl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

export CAPI_VERSION := $(shell GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api)
export CAPD_VERSION := $(shell GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api/test)
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
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
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)
export CAAPH_VERSION := $(shell cd hack/third-party/caaph && GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api-addon-provider-helm)

Expand Down
Loading