Merge pull request #68 from damdo/update-manifests-gen

OCPCLOUD-2255: Update manifests-gen tool
openshift · Nov 30, 2023 · fa2ba9f · fa2ba9f
2 parents e62cc77 + fdf5569
commit fa2ba9f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 51 deletions.
diff --git a/openshift/tools/go.mod b/openshift/tools/go.mod
@@ -2,9 +2,7 @@ module tools
 
 go 1.18
 
-replace github.com/openshift/cluster-capi-operator/manifests-gen => github.com/openshift-cloud-team/cluster-capi-operator/manifests-gen v0.0.0-20231123101243-4833685b1e3b
-
-require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-00010101000000-000000000000
+require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20231129212918-dcb7a56ab14c
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect

diff --git a/openshift/tools/go.sum b/openshift/tools/go.sum
@@ -775,8 +775,8 @@ github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5X
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/openshift-cloud-team/cluster-capi-operator/manifests-gen v0.0.0-20231123101243-4833685b1e3b h1:5VJBFmPrP2/JFAmt9OULEKDNCrOeIwHN4uD9IwpfXBA=
-github.com/openshift-cloud-team/cluster-capi-operator/manifests-gen v0.0.0-20231123101243-4833685b1e3b/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
+github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20231129212918-dcb7a56ab14c h1:9kIwvHuDH7G/FG6wa6jkYG9cKA2EN0J56DNVMd3M2TQ=
+github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20231129212918-dcb7a56ab14c/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

diff --git a/...t/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go b/...t/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go
diff --git a/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/main.go b/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/main.go
diff --git a/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/providers.go b/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/providers.go
diff --git a/openshift/tools/vendor/modules.txt b/openshift/tools/vendor/modules.txt
@@ -170,7 +170,7 @@ github.com/munnerz/goautoneg
 # github.com/opencontainers/go-digest v1.0.0
 ## explicit; go 1.13
 github.com/opencontainers/go-digest
-# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-00010101000000-000000000000 => github.com/openshift-cloud-team/cluster-capi-operator/manifests-gen v0.0.0-20231123101243-4833685b1e3b
+# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20231129212918-dcb7a56ab14c
 ## explicit; go 1.18
 github.com/openshift/cluster-capi-operator/manifests-gen
 # github.com/pelletier/go-toml/v2 v2.0.8
@@ -795,4 +795,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# github.com/openshift/cluster-capi-operator/manifests-gen => github.com/openshift-cloud-team/cluster-capi-operator/manifests-gen v0.0.0-20231123101243-4833685b1e3b