Skip to content

Commit 6a3bb87

Browse files
committed
rebased - go mod tidy
1 parent 7746340 commit 6a3bb87

5 files changed

Lines changed: 29 additions & 4 deletions

File tree

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,3 +381,5 @@ replace (
381381
github.com/nutanix-cloud-native/cluster-api-provider-nutanix => github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.2-0.20251007022949-442bc2ebe286
382382
sigs.k8s.io/cluster-api-provider-azure => github.com/mboersma/cluster-api-provider-azure v0.3.1-0.20251030205607-3161b9cc8d3e
383383
)
384+
385+
replace github.com/openshift/api => github.com/miyadav/api v0.0.0-20260610140604-79a53623c27b

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,6 +823,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
823823
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
824824
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
825825
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
826+
github.com/miyadav/api v0.0.0-20260610140604-79a53623c27b h1:vxML/FAD/vhRIHllt9KD15+qLTbC9aUu0dqVKWSc/HE=
827+
github.com/miyadav/api v0.0.0-20260610140604-79a53623c27b/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
826828
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
827829
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
828830
github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
@@ -898,8 +900,6 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
898900
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
899901
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
900902
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
901-
github.com/openshift/api v0.0.0-20260610192510-1b2a074e0bd6 h1:W8yZzA6a8zTNOq+pzUAKJmpZCyxP8rTjRaLC0aLap/8=
902-
github.com/openshift/api v0.0.0-20260610192510-1b2a074e0bd6/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
903903
github.com/openshift/assisted-image-service v0.0.0-20260209112552-a5cb0f44ccc6 h1:Fboc+QTpkg6AlB+wwG/VmWicAah4aHPD1kg0S8fFzqc=
904904
github.com/openshift/assisted-image-service v0.0.0-20260209112552-a5cb0f44ccc6/go.mod h1:tvKT0hUiAOVZC+zgN0jYk7E0Tq1UTkh/IJaG8vQjviI=
905905
github.com/openshift/assisted-service/api v0.0.0-20250922204150-a52b83145bea h1:YhJ9iHKKT5ooAdVr8qq3BdudhTxP/WF0XYDT5gzi1ak=

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

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

vendor/github.com/openshift/api/features/features.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.

vendor/modules.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,11 @@ github.com/opencontainers/image-spec/specs-go/v1
13121312
# github.com/opencontainers/runtime-spec v1.2.0
13131313
## explicit
13141314
github.com/opencontainers/runtime-spec/specs-go
1315+
<<<<<<< HEAD
13151316
# github.com/openshift/api v0.0.0-20260610192510-1b2a074e0bd6
1317+
=======
1318+
# github.com/openshift/api v0.0.0-20260603130340-1ad2ac3eb53d => github.com/miyadav/api v0.0.0-20260610140604-79a53623c27b
1319+
>>>>>>> 765040c6c1 ([Draft] - bumping with o/api changes for new capabilities)
13161320
## explicit; go 1.25.0
13171321
github.com/openshift/api/annotations
13181322
github.com/openshift/api/config/v1
@@ -2984,3 +2988,4 @@ sigs.k8s.io/yaml/kyaml
29842988
# sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.19.3
29852989
# github.com/nutanix-cloud-native/cluster-api-provider-nutanix => github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.2-0.20251007022949-442bc2ebe286
29862990
# sigs.k8s.io/cluster-api-provider-azure => github.com/mboersma/cluster-api-provider-azure v0.3.1-0.20251030205607-3161b9cc8d3e
2991+
# github.com/openshift/api => github.com/miyadav/api v0.0.0-20260610140604-79a53623c27b

0 commit comments

Comments
 (0)