OCPBUGS-44413: add missing assets for OpenStack

We recently bumped CAPO (the CAPI provider for OpenStack) and we didn't update the assets correctly, for a new dependency: ORC. This PR does the following: * Add ORC to support/api/scheme. * Run `go mod tidy && go mod vendor` so ORC is now vendored. * Update Makefile to generate the assets for ORC. * Run `make update`.
openshift · Nov 10, 2024 · 7f928e5 · 7f928e5
1 parent 7a0ad34
commit 7f928e5
Show file tree

Hide file tree

Showing 15 changed files with 2,016 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -172,6 +172,7 @@ cluster-api-provider-azure: $(CONTROLLER_GEN)
 cluster-api-provider-openstack: $(CONTROLLER_GEN)
 	rm -rf cmd/install/assets/cluster-api-provider-openstack/*.yaml
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-openstack/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-openstack
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/github.com/k-orc/openstack-resource-controller/..." output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-openstack
 
 .PHONY: api-docs
 api-docs: $(GENAPIDOCS)

diff --git a/cmd/install/assets/assets.go b/cmd/install/assets/assets.go
@@ -51,6 +51,7 @@ var capiResources = map[string]string{
 	"cluster-api-provider-azure/infrastructure.cluster.x-k8s.io_azureclusters.yaml":                    "v1beta1",
 	"cluster-api-provider-azure/infrastructure.cluster.x-k8s.io_azuremachines.yaml":                    "v1beta1",
 	"cluster-api-provider-azure/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml":            "v1beta1",
+	"cluster-api-provider-openstack/openstack.k-orc.cloud_images.yaml":                                 "v1alpha1",
 	"cluster-api-provider-openstack/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml":    "v1beta1",
 	"cluster-api-provider-openstack/infrastructure.cluster.x-k8s.io_openstackclusters.yaml":            "v1beta1",
 	"cluster-api-provider-openstack/infrastructure.cluster.x-k8s.io_openstackmachines.yaml":            "v1beta1",

diff --git a/cmd/install/assets/cluster-api-provider-openstack/openstack.k-orc.cloud_images.yaml b/cmd/install/assets/cluster-api-provider-openstack/openstack.k-orc.cloud_images.yaml
diff --git a/go.mod b/go.mod
@@ -37,6 +37,7 @@ require (
 	github.com/google/gofuzz v1.2.0
 	github.com/google/uuid v1.6.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+	github.com/k-orc/openstack-resource-controller v0.0.0-00010101000000-000000000000
 	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
 	github.com/onsi/gomega v1.34.2
 	github.com/opencontainers/go-digest v1.0.0

diff --git a/go.sum b/go.sum
@@ -2267,6 +2267,8 @@ sigs.k8s.io/cluster-api-provider-kubevirt v0.1.9 h1:hQO7Y5GP7FMnH6Aono9WVE90I3vR
 sigs.k8s.io/cluster-api-provider-kubevirt v0.1.9/go.mod h1:RlF7CASVT4vaBRLu45Y2dprAnEPoDGvMaImXz13Ntks=
 sigs.k8s.io/cluster-api-provider-openstack v0.11.0 h1:GdeJxOqaO2qMASm4S+tJASZa20baNSAIPH7XxV0rKag=
 sigs.k8s.io/cluster-api-provider-openstack v0.11.0/go.mod h1:x+L9Juw0GmyrCysnbbMLPeF+eMzld6Ao7YN76ME5niM=
+sigs.k8s.io/cluster-api-provider-openstack/orc v0.0.0-20241018150903-d5cd16872111 h1:mwwJEMTJb90p0UPXs42jNHuiPKqhRFqH8eXYfpzlBr8=
+sigs.k8s.io/cluster-api-provider-openstack/orc v0.0.0-20241018150903-d5cd16872111/go.mod h1:9sGpL7CClFRa8UbzZLuQF5AcwAPT9tOUv5nuE7UU+N8=
 sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
 sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=

diff --git a/support/api/scheme.go b/support/api/scheme.go
@@ -3,6 +3,7 @@ package api
 import (
 	"os"
 
+	orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
 	snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
 	configv1 "github.com/openshift/api/config/v1"
 	imagev1 "github.com/openshift/api/image/v1"
@@ -108,4 +109,5 @@ func init() {
 	capiopenstackv1beta1.AddToScheme(Scheme)
 	secretsstorev1.AddToScheme(Scheme)
 	kcpv1.AddToScheme(Scheme)
+	orcv1alpha1.AddToScheme(Scheme)
 }
diff --git a/vendor/github.com/k-orc/openstack-resource-controller/LICENSE b/vendor/github.com/k-orc/openstack-resource-controller/LICENSE
diff --git a/vendor/github.com/k-orc/openstack-resource-controller/api/v1alpha1/conditions.go b/vendor/github.com/k-orc/openstack-resource-controller/api/v1alpha1/conditions.go