Skip to content

Commit 8302fdf

Browse files
Merge pull request #760 from nutanix-cloud-native/nutanix-platform
IR-198: Add default storage type for Nutanix platform
2 parents 23b4b48 + ff3a1dc commit 8302fdf

23 files changed

+732
-295
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/gophercloud/gophercloud v0.17.0
2626
github.com/gophercloud/utils v0.0.0-20210323225332-7b186010c04f
2727
github.com/goware/urlx v0.3.1
28-
github.com/openshift/api v0.0.0-20211215015256-3cf5120f2ce6
28+
github.com/openshift/api v0.0.0-20220203140920-bfe251c51d2d
2929
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
3030
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
3131
github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@ github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDs
627627
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
628628
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
629629
github.com/openshift/api v0.0.0-20211209135129-c58d9f695577/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME=
630-
github.com/openshift/api v0.0.0-20211215015256-3cf5120f2ce6 h1:XFrIRRgxjSpU1GD53yMkOzBxP/p3ABMl+fIycdw9lQ4=
631-
github.com/openshift/api v0.0.0-20211215015256-3cf5120f2ce6/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
630+
github.com/openshift/api v0.0.0-20220203140920-bfe251c51d2d h1:WuD14VS4SFKKH5hKeYiHTswlEByICzMNvaZrDXUjZiY=
631+
github.com/openshift/api v0.0.0-20220203140920-bfe251c51d2d/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
632632
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
633633
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3 h1:65oBhJYHzYK5VL0gF1eiYY37lLzyLZ47b9y5Kib1nf8=
634634
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=

pkg/storage/storage.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ func GetPlatformStorage(listers *regopclient.Listers) (imageregistryv1.ImageRegi
150150
// we should bootstrap the image registry as "Removed".
151151
case configapiv1.BareMetalPlatformType,
152152
configapiv1.VSpherePlatformType,
153-
configapiv1.NonePlatformType:
153+
configapiv1.NonePlatformType,
154+
configapiv1.NutanixPlatformType:
154155
break
155156

156157
// These are the supported platforms. We do have backend implementation

vendor/github.com/openshift/api/build/v1/generated.pb.go

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

vendor/github.com/openshift/api/build/v1/generated.proto

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

vendor/github.com/openshift/api/build/v1/types.go

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

vendor/github.com/openshift/api/build/v1/zz_generated.deepcopy.go

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

vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go

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

vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml

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

vendor/github.com/openshift/api/config/v1/types_feature.go

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

0 commit comments

Comments
 (0)