Skip to content

Commit

Permalink
vendor: Update openshift/api to pick up v4.17 and v4.18 capability sets
Browse files Browse the repository at this point in the history
Catching up with [1].  Generated with:

  $ go get github.com/openshift/api@master
  $ go mod tidy
  $ go mod vendor
  $ go generate ./pkg/types/installconfig.go
  $ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

  $ go version
  go version go1.22.2 linux/amd64

This will allow users to use the new capability sets in their install-config YAML.

[1]: openshift/api#2022
  • Loading branch information
wking committed Sep 12, 2024
1 parent 929f21c commit 9d1f82a
Show file tree
Hide file tree
Showing 71 changed files with 307 additions and 8,592 deletions.
2 changes: 2 additions & 0 deletions data/data/install.openshift.io_installconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ spec:
- v4.14
- v4.15
- v4.16
- v4.17
- v4.18
- vCurrent
type: string
type: object
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ require (
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.3.3-0.20240416171357-98239ba02cb2
github.com/nutanix-cloud-native/prism-go-client v0.3.4
github.com/onsi/gomega v1.33.1
github.com/openshift/api v0.0.0-20240809035623-d6942fb7294e
github.com/openshift/api v0.0.0-20240911192208-3e5de946111c
github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6
github.com/openshift/assisted-service/api v0.0.0
github.com/openshift/assisted-service/client v0.0.0
Expand Down Expand Up @@ -205,7 +205,6 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/terraform-json v0.14.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down Expand Up @@ -262,7 +261,6 @@ require (
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
github.com/zclconf/go-cty v1.11.0 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
Expand Down
47 changes: 2 additions & 45 deletions go.sum

Large diffs are not rendered by default.

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/hashicorp/terraform-json/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/hashicorp/terraform-json/.go-version

This file was deleted.

373 changes: 0 additions & 373 deletions vendor/github.com/hashicorp/terraform-json/LICENSE

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/github.com/hashicorp/terraform-json/Makefile

This file was deleted.

33 changes: 0 additions & 33 deletions vendor/github.com/hashicorp/terraform-json/README.md

This file was deleted.

104 changes: 0 additions & 104 deletions vendor/github.com/hashicorp/terraform-json/action.go

This file was deleted.

Loading

0 comments on commit 9d1f82a

Please sign in to comment.