Updating path for hypershift APIs and updating codegen tools

Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
openshift · Feb 6, 2024 · 3299677 · 3299677
1 parent d4b41da
commit 3299677
Show file tree

Hide file tree

Showing 477 changed files with 1,704 additions and 2,215 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -69,7 +69,7 @@ updates:
     commit-message:
       prefix: "NO-JIRA"
     labels:
-      - "area/api"
+      - "area/ci-tooling"
       - "ok-to-test"
     groups:
       github-dependencies:

diff --git a/Makefile b/Makefile
@@ -20,7 +20,6 @@ PROMTOOL=$(abspath $(TOOLS_BIN_DIR)/promtool)
 
 GO_GCFLAGS ?= -gcflags=all='-N -l'
 GO=GO111MODULE=on GOFLAGS=-mod=vendor go
-GO_NO_VENDOR=GO111MODULE=on GOFLAGS=-mod=mod go
 GO_BUILD_RECIPE=CGO_ENABLED=1 $(GO) build $(GO_GCFLAGS)
 GO_E2E_RECIPE=CGO_ENABLED=1 $(GO) test $(GO_GCFLAGS) -tags e2e -c
 
@@ -95,9 +94,9 @@ api: hypershift-api cluster-api cluster-api-provider-aws cluster-api-provider-ib
 
 .PHONY: hypershift-api
 hypershift-api: $(CONTROLLER_GEN)
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/types/..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
 	rm -rf cmd/install/assets/hypershift-operator/*.yaml
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/types/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
 
 .PHONY: cluster-api
 cluster-api: $(CONTROLLER_GEN)

diff --git a/api/types/certificates/register.go → api/certificates/register.go b/api/types/certificates/register.go → api/certificates/register.go
diff --git a/...ha1/certificaterevocationrequest_types.go → ...ha1/certificaterevocationrequest_types.go b/...ha1/certificaterevocationrequest_types.go → ...ha1/certificaterevocationrequest_types.go
diff --git a/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go b/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go
diff --git a/api/types/certificates/v1alpha1/doc.go → api/certificates/v1alpha1/doc.go b/api/types/certificates/v1alpha1/doc.go → api/certificates/v1alpha1/doc.go
diff --git a/...i/types/certificates/v1alpha1/register.go → api/certificates/v1alpha1/register.go b/...i/types/certificates/v1alpha1/register.go → api/certificates/v1alpha1/register.go
@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/openshift/hypershift/api/types/certificates"
+	"github.com/openshift/hypershift/api/certificates"
 )
 
 // SchemeGroupVersion is group version used to register these objects.

diff --git a/...ficates/v1alpha1/zz_generated.deepcopy.go → ...ficates/v1alpha1/zz_generated.deepcopy.go b/...ficates/v1alpha1/zz_generated.deepcopy.go → ...ficates/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/types/hypershift/register.go → api/hypershift/register.go b/api/types/hypershift/register.go → api/hypershift/register.go
diff --git a/...ypes/hypershift/v1alpha1/clusterconfig.go → api/hypershift/v1alpha1/clusterconfig.go b/...ypes/hypershift/v1alpha1/clusterconfig.go → api/hypershift/v1alpha1/clusterconfig.go
diff --git a/api/types/hypershift/v1alpha1/conditions.go → api/hypershift/v1alpha1/conditions.go b/api/types/hypershift/v1alpha1/conditions.go → api/hypershift/v1alpha1/conditions.go
diff --git a/api/types/hypershift/v1alpha1/doc.go → api/hypershift/v1alpha1/doc.go b/api/types/hypershift/v1alpha1/doc.go → api/hypershift/v1alpha1/doc.go
diff --git a/...ershift/v1alpha1/endpointservice_types.go → ...ershift/v1alpha1/endpointservice_types.go b/...ershift/v1alpha1/endpointservice_types.go → ...ershift/v1alpha1/endpointservice_types.go
diff --git a/.../hypershift/v1alpha1/groupversion_info.go → api/hypershift/v1alpha1/groupversion_info.go b/.../hypershift/v1alpha1/groupversion_info.go → api/hypershift/v1alpha1/groupversion_info.go
@@ -4,7 +4,7 @@
 package v1alpha1
 
 import (
-	"github.com/openshift/hypershift/api/types/hypershift"
+	"github.com/openshift/hypershift/api/hypershift"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/...ypershift/v1alpha1/hosted_controlplane.go → ...ypershift/v1alpha1/hosted_controlplane.go b/...ypershift/v1alpha1/hosted_controlplane.go → ...ypershift/v1alpha1/hosted_controlplane.go
diff --git a/...ypershift/v1alpha1/hostedcluster_types.go → ...ypershift/v1alpha1/hostedcluster_types.go b/...ypershift/v1alpha1/hostedcluster_types.go → ...ypershift/v1alpha1/hostedcluster_types.go
diff --git a/...pes/hypershift/v1alpha1/nodepool_types.go → api/hypershift/v1alpha1/nodepool_types.go b/...pes/hypershift/v1alpha1/nodepool_types.go → api/hypershift/v1alpha1/nodepool_types.go
@@ -9,7 +9,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"github.com/openshift/hypershift/api/types/ibmcapi"
+	"github.com/openshift/hypershift/api/ibmcapi"
 )
 
 const (

diff --git a/...ershift/v1alpha1/zz_generated.deepcopy.go → ...ershift/v1alpha1/zz_generated.deepcopy.go b/...ershift/v1alpha1/zz_generated.deepcopy.go → ...ershift/v1alpha1/zz_generated.deepcopy.go
diff --git a/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go b/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go
diff --git a/...types/hypershift/v1beta1/clusterconfig.go → api/hypershift/v1beta1/clusterconfig.go b/...types/hypershift/v1beta1/clusterconfig.go → api/hypershift/v1beta1/clusterconfig.go
diff --git a/api/types/hypershift/v1beta1/doc.go → api/hypershift/v1beta1/doc.go b/api/types/hypershift/v1beta1/doc.go → api/hypershift/v1beta1/doc.go
diff --git a/...pershift/v1beta1/endpointservice_types.go → ...pershift/v1beta1/endpointservice_types.go b/...pershift/v1beta1/endpointservice_types.go → ...pershift/v1beta1/endpointservice_types.go
diff --git a/...s/hypershift/v1beta1/groupversion_info.go → api/hypershift/v1beta1/groupversion_info.go b/...s/hypershift/v1beta1/groupversion_info.go → api/hypershift/v1beta1/groupversion_info.go
@@ -4,7 +4,7 @@
 package v1beta1
 
 import (
-	"github.com/openshift/hypershift/api/types/hypershift"
+	"github.com/openshift/hypershift/api/hypershift"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/...hypershift/v1beta1/hosted_controlplane.go → ...hypershift/v1beta1/hosted_controlplane.go b/...hypershift/v1beta1/hosted_controlplane.go → ...hypershift/v1beta1/hosted_controlplane.go
diff --git a/...shift/v1beta1/hostedcluster_conditions.go → ...shift/v1beta1/hostedcluster_conditions.go b/...shift/v1beta1/hostedcluster_conditions.go → ...shift/v1beta1/hostedcluster_conditions.go
diff --git a/...hypershift/v1beta1/hostedcluster_types.go → ...hypershift/v1beta1/hostedcluster_types.go b/...hypershift/v1beta1/hostedcluster_types.go → ...hypershift/v1beta1/hostedcluster_types.go
diff --git a/...hypershift/v1beta1/nodepool_conditions.go → ...hypershift/v1beta1/nodepool_conditions.go b/...hypershift/v1beta1/nodepool_conditions.go → ...hypershift/v1beta1/nodepool_conditions.go
diff --git a/...ypes/hypershift/v1beta1/nodepool_types.go → api/hypershift/v1beta1/nodepool_types.go b/...ypes/hypershift/v1beta1/nodepool_types.go → api/hypershift/v1beta1/nodepool_types.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/openshift/hypershift/api/types/ibmcapi"
+	"github.com/openshift/hypershift/api/ibmcapi"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...pershift/v1beta1/zz_generated.deepcopy.go → ...pershift/v1beta1/zz_generated.deepcopy.go b/...pershift/v1beta1/zz_generated.deepcopy.go → ...pershift/v1beta1/zz_generated.deepcopy.go
diff --git a/api/types/ibmcapi/types.go → api/ibmcapi/types.go b/api/types/ibmcapi/types.go → api/ibmcapi/types.go
diff --git a/api/types/hypershift/v1beta1/conversion.go b/api/types/hypershift/v1beta1/conversion.go
diff --git a/api/util/configrefs/refs_test.go b/api/util/configrefs/refs_test.go
@@ -7,7 +7,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	configv1 "github.com/openshift/api/config/v1"
-	hyperv1 "github.com/openshift/hypershift/api/types/hypershift/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 // Be sure to update *ConfigMapRefs in refs.go to include new configmap refs

diff --git a/client/applyconfiguration/certificates/v1alpha1/certificatesigningrequestapproval.go b/client/applyconfiguration/certificates/v1alpha1/certificatesigningrequestapproval.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/apiservernetworking.go b/client/applyconfiguration/hypershift/v1alpha1/apiservernetworking.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/awsplatformspec.go b/client/applyconfiguration/hypershift/v1alpha1/awsplatformspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/clusternetworking.go b/client/applyconfiguration/hypershift/v1alpha1/clusternetworking.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/etcdspec.go b/client/applyconfiguration/hypershift/v1alpha1/etcdspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/hostedclusterspec.go b/client/applyconfiguration/hypershift/v1alpha1/hostedclusterspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/ibmcloudkmsauthspec.go b/client/applyconfiguration/hypershift/v1alpha1/ibmcloudkmsauthspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kmsspec.go b/client/applyconfiguration/hypershift/v1alpha1/kmsspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kubevirtcachingstrategy.go b/client/applyconfiguration/hypershift/v1alpha1/kubevirtcachingstrategy.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kubevirtcompute.go b/client/applyconfiguration/hypershift/v1alpha1/kubevirtcompute.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kubevirtnodepoolplatform.go b/client/applyconfiguration/hypershift/v1alpha1/kubevirtnodepoolplatform.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kubevirtpersistentvolume.go b/client/applyconfiguration/hypershift/v1alpha1/kubevirtpersistentvolume.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kubevirtrootvolume.go b/client/applyconfiguration/hypershift/v1alpha1/kubevirtrootvolume.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kubevirtstoragedriverspec.go b/client/applyconfiguration/hypershift/v1alpha1/kubevirtstoragedriverspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/kubevirtvolume.go b/client/applyconfiguration/hypershift/v1alpha1/kubevirtvolume.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/managedetcdstoragespec.go b/client/applyconfiguration/hypershift/v1alpha1/managedetcdstoragespec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/nodepoolmanagement.go b/client/applyconfiguration/hypershift/v1alpha1/nodepoolmanagement.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/nodepoolplatform.go b/client/applyconfiguration/hypershift/v1alpha1/nodepoolplatform.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/platformspec.go b/client/applyconfiguration/hypershift/v1alpha1/platformspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/powervsnodepoolplatform.go b/client/applyconfiguration/hypershift/v1alpha1/powervsnodepoolplatform.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/replaceupgrade.go b/client/applyconfiguration/hypershift/v1alpha1/replaceupgrade.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/secretencryptionspec.go b/client/applyconfiguration/hypershift/v1alpha1/secretencryptionspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/servicepublishingstrategy.go b/client/applyconfiguration/hypershift/v1alpha1/servicepublishingstrategy.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/servicepublishingstrategymapping.go b/client/applyconfiguration/hypershift/v1alpha1/servicepublishingstrategymapping.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/apiservernetworking.go b/client/applyconfiguration/hypershift/v1beta1/apiservernetworking.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/awsplatformspec.go b/client/applyconfiguration/hypershift/v1beta1/awsplatformspec.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/certificatesigningrequestapproval.go b/client/applyconfiguration/hypershift/v1beta1/certificatesigningrequestapproval.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/clusternetworking.go b/client/applyconfiguration/hypershift/v1beta1/clusternetworking.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/etcdspec.go b/client/applyconfiguration/hypershift/v1beta1/etcdspec.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/hostedclusterspec.go b/client/applyconfiguration/hypershift/v1beta1/hostedclusterspec.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/hostedcontrolplanespec.go b/client/applyconfiguration/hypershift/v1beta1/hostedcontrolplanespec.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/ibmcloudkmsauthspec.go b/client/applyconfiguration/hypershift/v1beta1/ibmcloudkmsauthspec.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/kmsspec.go b/client/applyconfiguration/hypershift/v1beta1/kmsspec.go
diff --git a/client/applyconfiguration/hypershift/v1beta1/kubevirtcachingstrategy.go b/client/applyconfiguration/hypershift/v1beta1/kubevirtcachingstrategy.go