ClusterAutoscaler: Put APIs in a separate go module

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
kubernetes · Mar 9, 2024 · bd32754 · bd32754
1 parent 90e2891
commit bd32754
Show file tree

Hide file tree

Showing 53 changed files with 330 additions and 57 deletions.
diff --git a/cluster-autoscaler/apis/go.mod b/cluster-autoscaler/apis/go.mod
@@ -0,0 +1,58 @@
+module k8s.io/autoscaler/cluster-autoscaler/apis
+
+go 1.21
+
+require (
+	github.com/onsi/ginkgo/v2 v2.13.0
+	github.com/onsi/gomega v1.29.0
+	k8s.io/apimachinery v0.29.0
+	k8s.io/client-go v0.29.0
+	k8s.io/code-generator v0.29.0
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.14.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.29.0 // indirect
+	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
diff --git a/cluster-autoscaler/apis/go.sum b/cluster-autoscaler/apis/go.sum
diff --git a/.../apis/autoscaling.x-k8s.io/v1beta1/doc.go → ...quest/autoscaling.x-k8s.io/v1beta1/doc.go b/.../apis/autoscaling.x-k8s.io/v1beta1/doc.go → ...quest/autoscaling.x-k8s.io/v1beta1/doc.go
diff --git a/.../autoscaling.x-k8s.io/v1beta1/register.go → .../autoscaling.x-k8s.io/v1beta1/register.go b/.../autoscaling.x-k8s.io/v1beta1/register.go → .../autoscaling.x-k8s.io/v1beta1/register.go
diff --git a/...pis/autoscaling.x-k8s.io/v1beta1/types.go → ...est/autoscaling.x-k8s.io/v1beta1/types.go b/...pis/autoscaling.x-k8s.io/v1beta1/types.go → ...est/autoscaling.x-k8s.io/v1beta1/types.go
diff --git a/...x-k8s.io/v1beta1/zz_generated.deepcopy.go → ...x-k8s.io/v1beta1/zz_generated.deepcopy.go b/...x-k8s.io/v1beta1/zz_generated.deepcopy.go → ...x-k8s.io/v1beta1/zz_generated.deepcopy.go
diff --git a/...on/autoscaling.x-k8s.io/v1beta1/podset.go → ...on/autoscaling.x-k8s.io/v1beta1/podset.go b/...on/autoscaling.x-k8s.io/v1beta1/podset.go → ...on/autoscaling.x-k8s.io/v1beta1/podset.go
diff --git a/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go b/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go
diff --git a/...k8s.io/v1beta1/provisioningrequestspec.go → ...k8s.io/v1beta1/provisioningrequestspec.go b/...k8s.io/v1beta1/provisioningrequestspec.go → ...k8s.io/v1beta1/provisioningrequestspec.go
diff --git a/...s.io/v1beta1/provisioningrequeststatus.go → ...s.io/v1beta1/provisioningrequeststatus.go b/...s.io/v1beta1/provisioningrequeststatus.go → ...s.io/v1beta1/provisioningrequeststatus.go
diff --git a/...autoscaling.x-k8s.io/v1beta1/reference.go → ...autoscaling.x-k8s.io/v1beta1/reference.go b/...autoscaling.x-k8s.io/v1beta1/reference.go → ...autoscaling.x-k8s.io/v1beta1/reference.go
diff --git a/...t/applyconfiguration/internal/internal.go → ...t/applyconfiguration/internal/internal.go b/...t/applyconfiguration/internal/internal.go → ...t/applyconfiguration/internal/internal.go
diff --git a/...equest/client/applyconfiguration/utils.go → ...equest/client/applyconfiguration/utils.go b/...equest/client/applyconfiguration/utils.go → ...equest/client/applyconfiguration/utils.go
diff --git a/...t/client/clientset/versioned/clientset.go → ...t/client/clientset/versioned/clientset.go b/...t/client/clientset/versioned/clientset.go → ...t/client/clientset/versioned/clientset.go
diff --git a/...set/versioned/fake/clientset_generated.go → ...set/versioned/fake/clientset_generated.go b/...set/versioned/fake/clientset_generated.go → ...set/versioned/fake/clientset_generated.go
diff --git a/...st/client/clientset/versioned/fake/doc.go → ...st/client/clientset/versioned/fake/doc.go b/...st/client/clientset/versioned/fake/doc.go → ...st/client/clientset/versioned/fake/doc.go
diff --git a/...ient/clientset/versioned/fake/register.go → ...ient/clientset/versioned/fake/register.go b/...ient/clientset/versioned/fake/register.go → ...ient/clientset/versioned/fake/register.go
diff --git a/.../client/clientset/versioned/scheme/doc.go → .../client/clientset/versioned/scheme/doc.go b/.../client/clientset/versioned/scheme/doc.go → .../client/clientset/versioned/scheme/doc.go
diff --git a/...nt/clientset/versioned/scheme/register.go → ...nt/clientset/versioned/scheme/register.go b/...nt/clientset/versioned/scheme/register.go → ...nt/clientset/versioned/scheme/register.go
diff --git a/...io/v1beta1/autoscaling.x-k8s.io_client.go → ...io/v1beta1/autoscaling.x-k8s.io_client.go b/...io/v1beta1/autoscaling.x-k8s.io_client.go → ...io/v1beta1/autoscaling.x-k8s.io_client.go
diff --git a/...typed/autoscaling.x-k8s.io/v1beta1/doc.go → ...typed/autoscaling.x-k8s.io/v1beta1/doc.go b/...typed/autoscaling.x-k8s.io/v1beta1/doc.go → ...typed/autoscaling.x-k8s.io/v1beta1/doc.go
diff --git a/.../autoscaling.x-k8s.io/v1beta1/fake/doc.go → .../autoscaling.x-k8s.io/v1beta1/fake/doc.go b/.../autoscaling.x-k8s.io/v1beta1/fake/doc.go → .../autoscaling.x-k8s.io/v1beta1/fake/doc.go
diff --git a/.../fake/fake_autoscaling.x-k8s.io_client.go → .../fake/fake_autoscaling.x-k8s.io_client.go b/.../fake/fake_autoscaling.x-k8s.io_client.go → .../fake/fake_autoscaling.x-k8s.io_client.go
diff --git a/.../v1beta1/fake/fake_provisioningrequest.go → .../v1beta1/fake/fake_provisioningrequest.go b/.../v1beta1/fake/fake_provisioningrequest.go → .../v1beta1/fake/fake_provisioningrequest.go
diff --git a/...g.x-k8s.io/v1beta1/generated_expansion.go → ...g.x-k8s.io/v1beta1/generated_expansion.go b/...g.x-k8s.io/v1beta1/generated_expansion.go → ...g.x-k8s.io/v1beta1/generated_expansion.go
diff --git a/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go b/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go
diff --git a/...ersions/autoscaling.x-k8s.io/interface.go → ...ersions/autoscaling.x-k8s.io/interface.go b/...ersions/autoscaling.x-k8s.io/interface.go → ...ersions/autoscaling.x-k8s.io/interface.go
diff --git a/...autoscaling.x-k8s.io/v1beta1/interface.go → ...autoscaling.x-k8s.io/v1beta1/interface.go b/...autoscaling.x-k8s.io/v1beta1/interface.go → ...autoscaling.x-k8s.io/v1beta1/interface.go
diff --git a/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go b/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go
diff --git a/...ent/informers/externalversions/factory.go → ...ent/informers/externalversions/factory.go b/...ent/informers/externalversions/factory.go → ...ent/informers/externalversions/factory.go
diff --git a/...ent/informers/externalversions/generic.go → ...ent/informers/externalversions/generic.go b/...ent/informers/externalversions/generic.go → ...ent/informers/externalversions/generic.go
diff --git a/.../internalinterfaces/factory_interfaces.go → .../internalinterfaces/factory_interfaces.go b/.../internalinterfaces/factory_interfaces.go → .../internalinterfaces/factory_interfaces.go
diff --git a/...g.x-k8s.io/v1beta1/expansion_generated.go → ...g.x-k8s.io/v1beta1/expansion_generated.go b/...g.x-k8s.io/v1beta1/expansion_generated.go → ...g.x-k8s.io/v1beta1/expansion_generated.go
diff --git a/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go b/...g.x-k8s.io/v1beta1/provisioningrequest.go → ...g.x-k8s.io/v1beta1/provisioningrequest.go
diff --git a/cluster-autoscaler/go.mod b/cluster-autoscaler/go.mod
@@ -53,7 +53,6 @@ require (
 	k8s.io/legacy-cloud-providers v0.0.0
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/cloud-provider-azure v1.28.0
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -183,6 +182,7 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.0.0 // indirect
+	k8s.io/code-generator v0.30.0-alpha.3 // indirect
 	k8s.io/controller-manager v0.30.0-alpha.3 // indirect
 	k8s.io/cri-api v0.30.0-alpha.3 // indirect
 	k8s.io/csi-translation-lib v0.27.0 // indirect
@@ -262,3 +262,5 @@ replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation
 replace k8s.io/kms => k8s.io/kms v0.30.0-alpha.3
 
 replace k8s.io/endpointslice => k8s.io/endpointslice v0.30.0-alpha.3
+
+replace k8s.io/autoscaler/cluster-autoscaler/apis => ./apis
diff --git a/cluster-autoscaler/hack/update-codegen.sh b/cluster-autoscaler/hack/update-codegen.sh
@@ -16,22 +16,23 @@
 
 ###
 # This script is to be used when updating the generated clients of 
-# the Provisoning Request CRD.
+# the Provisioning Request CRD.
 ###
 
 set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-CODEGEN_PKG="./vendor/k8s.io/code-generator"
+SCRIPT_ROOT=$(realpath $(dirname "${BASH_SOURCE[0]}"))/..
+CODEGEN_PKG="../vendor/k8s.io/code-generator"
+cd "${SCRIPT_ROOT}/apis"
 
 chmod +x "${CODEGEN_PKG}"/generate-groups.sh
 chmod +x "${CODEGEN_PKG}"/generate-internal-groups.sh
 
 bash "${CODEGEN_PKG}"/generate-groups.sh "applyconfiguration,client,deepcopy,informer,lister" \
-  k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/client \
-  k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/apis \
+  k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/client \
+  k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest \
   autoscaling.x-k8s.io:v1beta1 \
   --go-header-file "${SCRIPT_ROOT}"/../hack/boilerplate/boilerplate.generatego.txt
 

diff --git a/cluster-autoscaler/hack/update-vendor.sh → cluster-autoscaler/hack/update-deps.sh b/cluster-autoscaler/hack/update-vendor.sh → cluster-autoscaler/hack/update-deps.sh
diff --git a/cluster-autoscaler/processors/provreq/provisioning_request_injector.go b/cluster-autoscaler/processors/provreq/provisioning_request_injector.go
@@ -22,9 +22,9 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/autoscaling.x-k8s.io/v1beta1"
 	"k8s.io/autoscaler/cluster-autoscaler/context"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/pods"
-	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/apis/autoscaling.x-k8s.io/v1beta1"
 	provreqconditions "k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/conditions"
 	provreqpods "k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/pods"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqclient"

diff --git a/cluster-autoscaler/processors/provreq/provisioning_request_injector_test.go b/cluster-autoscaler/processors/provreq/provisioning_request_injector_test.go
@@ -24,7 +24,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/apis/autoscaling.x-k8s.io/v1beta1"
+	"k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/autoscaling.x-k8s.io/v1beta1"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqclient"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqwrapper"
 	clock "k8s.io/utils/clock/testing"

diff --git a/cluster-autoscaler/provisioningrequest/checkcapacity/orchestrator.go b/cluster-autoscaler/provisioningrequest/checkcapacity/orchestrator.go
@@ -22,11 +22,11 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/autoscaling.x-k8s.io/v1beta1"
 	"k8s.io/autoscaler/cluster-autoscaler/clusterstate"
 	"k8s.io/autoscaler/cluster-autoscaler/context"
 	"k8s.io/autoscaler/cluster-autoscaler/estimator"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/status"
-	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/apis/autoscaling.x-k8s.io/v1beta1"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/conditions"
 	provreq_pods "k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/pods"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqclient"

diff --git a/cluster-autoscaler/provisioningrequest/checkcapacity/orchestrator_test.go b/cluster-autoscaler/provisioningrequest/checkcapacity/orchestrator_test.go
@@ -26,11 +26,11 @@ import (
 	v1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/autoscaling.x-k8s.io/v1beta1"
 	testprovider "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test"
 	"k8s.io/autoscaler/cluster-autoscaler/config"
 	. "k8s.io/autoscaler/cluster-autoscaler/core/test"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/status"
-	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/apis/autoscaling.x-k8s.io/v1beta1"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/pods"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqclient"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqwrapper"

diff --git a/cluster-autoscaler/provisioningrequest/checkcapacity/processor.go b/cluster-autoscaler/provisioningrequest/checkcapacity/processor.go
@@ -21,7 +21,7 @@ import (
 
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/apis/autoscaling.x-k8s.io/v1beta1"
+	"k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/autoscaling.x-k8s.io/v1beta1"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/conditions"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqwrapper"
 )

diff --git a/cluster-autoscaler/provisioningrequest/checkcapacity/processor_test.go b/cluster-autoscaler/provisioningrequest/checkcapacity/processor_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/apis/autoscaling.x-k8s.io/v1beta1"
+	"k8s.io/autoscaler/cluster-autoscaler/apis/provisioningrequest/autoscaling.x-k8s.io/v1beta1"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/conditions"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqclient"
 	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/provreqwrapper"