Skip to content

Commit cdc0786

Browse files
committed
UPSTREAM: <carry>: openshift: generate separate manifest for core CAPI CRDs
Store Core CAPI CRDs in their own manifest to get them applied by CVO directly. We want these to be installed independently from whether the cluster-capi-operator is enabled, as other Openshift components rely on them.
1 parent c83e4bb commit cdc0786

File tree

7 files changed

+8852
-8831
lines changed

7 files changed

+8852
-8831
lines changed

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

Lines changed: 0 additions & 8803 deletions
Large diffs are not rendered by default.

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

Lines changed: 8802 additions & 0 deletions
Large diffs are not rendered by default.

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-20231129212918-dcb7a56ab14c
5+
require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99
66

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

openshift/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,8 @@ github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5X
775775
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
776776
github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
777777
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
778-
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20231129212918-dcb7a56ab14c h1:9kIwvHuDH7G/FG6wa6jkYG9cKA2EN0J56DNVMd3M2TQ=
779-
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20231129212918-dcb7a56ab14c/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
778+
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99 h1:xBz01PbsZ7HsttZ0PQVKTvUKLZByS5ktdJBr75kP1E4=
779+
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
780780
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
781781
github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
782782
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: 17 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 29 additions & 0 deletions
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-20231129212918-dcb7a56ab14c
173+
# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99
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)