Skip to content

Commit 77bacd8

Browse files
committed
UPSTREAM: <carry>: openshift: promote core CAPI IPAM CRDs to GA
1 parent a0a1c10 commit 77bacd8

File tree

5 files changed

+29
-5
lines changed

5 files changed

+29
-5
lines changed

openshift/manifests/0000_30_cluster-api_04_crd.core-cluster-api.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8327,7 +8327,6 @@ metadata:
83278327
exclude.release.openshift.io/internal-openshift-hosted: "true"
83288328
include.release.openshift.io/self-managed-high-availability: "true"
83298329
include.release.openshift.io/single-node-developer: "true"
8330-
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
83318330
creationTimestamp: null
83328331
labels:
83338332
cluster.x-k8s.io/provider: cluster-api
@@ -8535,7 +8534,6 @@ metadata:
85358534
exclude.release.openshift.io/internal-openshift-hosted: "true"
85368535
include.release.openshift.io/self-managed-high-availability: "true"
85378536
include.release.openshift.io/single-node-developer: "true"
8538-
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
85398537
creationTimestamp: null
85408538
labels:
85418539
cluster.x-k8s.io/provider: cluster-api

openshift/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module tools
22

33
go 1.18
44

5-
require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225
5+
require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240216070530-91b37162630f
66

77
require (
88
github.com/MakeNowJust/heredoc v1.0.0 // indirect

openshift/tools/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,8 @@ github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-d
779779
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
780780
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225 h1:TVnzn4vcLgcR8jtt7SHpWWn/12W4yuEeWZaDldN/Lxw=
781781
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
782+
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240216070530-91b37162630f h1:s3109F/lyCzQtTjh9jclgnuldV8MUcZ81PBRxnGeD+k=
783+
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240216070530-91b37162630f/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
782784
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
783785
github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
784786
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go

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

openshift/tools/vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ github.com/munnerz/goautoneg
170170
# github.com/opencontainers/go-digest v1.0.0
171171
## explicit; go 1.13
172172
github.com/opencontainers/go-digest
173-
# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225
173+
# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240216070530-91b37162630f
174174
## explicit; go 1.18
175175
github.com/openshift/cluster-capi-operator/manifests-gen
176176
# github.com/pelletier/go-toml/v2 v2.0.8

0 commit comments

Comments
 (0)