Skip to content

Commit 6aa1e05

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #8211 from nutanix-cloud-native/nutanix-capi-support
OCPSTRAT-915: Nutanix capi support
2 parents 7e87d8d + 2839b40 commit 6aa1e05

File tree

466 files changed

+27713
-9533
lines changed

Some content is hidden

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

466 files changed

+27713
-9533
lines changed

‎cluster-api/providers/nutanix/go.mod‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
module openshift/installer/cluster-api/providers/nutanix
22

3-
go 1.20
3+
go 1.21
44

5-
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.2.4
5+
toolchain go1.21.9
6+
7+
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.3.3-0.20240416171357-98239ba02cb2
68

79
require (
810
cloud.google.com/go/compute v1.7.0 // indirect
@@ -55,12 +57,12 @@ require (
5557
go.uber.org/atomic v1.7.0 // indirect
5658
go.uber.org/multierr v1.6.0 // indirect
5759
go.uber.org/zap v1.21.0 // indirect
58-
golang.org/x/crypto v0.3.0 // indirect
59-
golang.org/x/net v0.7.0 // indirect
60+
golang.org/x/crypto v0.15.0 // indirect
61+
golang.org/x/net v0.18.0 // indirect
6062
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
61-
golang.org/x/sys v0.5.0 // indirect
62-
golang.org/x/term v0.5.0 // indirect
63-
golang.org/x/text v0.7.0 // indirect
63+
golang.org/x/sys v0.14.0 // indirect
64+
golang.org/x/term v0.14.0 // indirect
65+
golang.org/x/text v0.14.0 // indirect
6466
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
6567
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6668
google.golang.org/appengine v1.6.7 // indirect
@@ -69,14 +71,14 @@ require (
6971
gopkg.in/yaml.v2 v2.4.0 // indirect
7072
gopkg.in/yaml.v3 v3.0.1 // indirect
7173
k8s.io/api v0.25.2 // indirect
72-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
74+
k8s.io/apiextensions-apiserver v0.25.2 // indirect
7375
k8s.io/apimachinery v0.25.2 // indirect
7476
k8s.io/client-go v0.25.2 // indirect
7577
k8s.io/cluster-bootstrap v0.25.0 // indirect
76-
k8s.io/component-base v0.25.0 // indirect
78+
k8s.io/component-base v0.25.2 // indirect
7779
k8s.io/klog/v2 v2.80.1 // indirect
7880
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
79-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
81+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
8082
sigs.k8s.io/cluster-api v1.3.5 // indirect
8183
sigs.k8s.io/controller-runtime v0.13.1 // indirect
8284
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect

‎cluster-api/providers/nutanix/go.sum‎

Lines changed: 55 additions & 20 deletions
Large diffs are not rendered by default.

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/.gitignore‎

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

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/Makefile‎

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

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4/conditions.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4/nutanixcluster_conversion.go‎

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

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4/nutanixcluster_types.go‎

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

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4/nutanixmachine_conversion.go‎

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

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4/nutanixmachine_types.go‎

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

‎cluster-api/providers/nutanix/vendor/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4/nutanixmachinetemplate_conversion.go‎

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

0 commit comments

Comments
 (0)