Update import paths to align with the new locations of generated clie…

…nt code
ironcore-dev · Sep 5, 2024 · e6c3959 · e6c3959
1 parent 39b77f6
commit e6c3959
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 17 deletions.
diff --git a/.github/workflows/check-codegen.yml b/.github/workflows/check-codegen.yml
@@ -14,6 +14,14 @@ jobs:
     - uses: actions/setup-go@v5
       with:
         go-version-file: 'go.mod'
+    - name: Download k8s.io/code-generator
+      run: |
+          CODE_GEN_VERSION=$(go list -m -f '{{.Version}}' k8s.io/code-generator)
+          go get k8s.io/code-generator@$CODE_GEN_VERSION
+          echo "CODE_GEN_DIR=$(go list -m -f '{{.Dir}}' k8s.io/code-generator)" >> $GITHUB_ENV
+    - name: Display Go Mod Info
+      run: |
+          go list -m -f '{{.Version}}' k8s.io/code-generator
     - name: Run make generate
       run: make generate
     - name: Compare the expected and actual generated/* directories

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,4 +16,7 @@ jobs:
     - uses: actions/setup-go@v5
       with:
         go-version-file: 'go.mod'
-    - run: make test
+    - name: Download go modules
+      run: go mod download
+    - name: Run make test
+      run: make test
diff --git a/broker/machinebroker/server/exec.go b/broker/machinebroker/server/exec.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/go-logr/logr"
 	computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
-	ironcoreclientgoscheme "github.com/ironcore-dev/ironcore/client-go/ironcore/scheme"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
+	ironcoreclientgoscheme "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned/scheme"
 	iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1"
 	remotecommandserver "github.com/ironcore-dev/ironcore/poollet/machinepoollet/iri/streaming/remotecommand"
 	"k8s.io/client-go/tools/remotecommand"

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -13,7 +13,9 @@ bold="$(tput bold)"
 blue="$(tput setaf 4)"
 normal="$(tput sgr0)"
 
+echo "CODE_GEN_DIR: $CODE_GEN_DIR"
 CODE_GEN_DIR=$(go list -m -f '{{.Dir}}' k8s.io/code-generator)
+echo "CODE_GEN_DIR: $CODE_GEN_DIR"
 source "${CODE_GEN_DIR}/kube_codegen.sh"
 
 function qualify-gvs() {

diff --git a/internal/admission/initializer/initializer.go b/internal/admission/initializer/initializer.go
@@ -4,8 +4,8 @@
 package initializer
 
 import (
-	ironcoreinformers "github.com/ironcore-dev/ironcore/client-go/informers"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
+	ironcoreinformers "github.com/ironcore-dev/ironcore/client-go/informers/externalversions"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	"github.com/ironcore-dev/ironcore/utils/quota"
 	"k8s.io/apiserver/pkg/admission"
 )

diff --git a/internal/admission/plugin/resourcequota/access.go b/internal/admission/plugin/resourcequota/access.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	corev1alpha1listers "github.com/ironcore-dev/ironcore/client-go/listers/core/v1alpha1"
 	"golang.org/x/exp/slices"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/internal/admission/plugin/resourcequota/admission.go b/internal/admission/plugin/resourcequota/admission.go
@@ -11,8 +11,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ironcore-dev/ironcore/client-go/informers"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
+	informers "github.com/ironcore-dev/ironcore/client-go/informers/externalversions"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	corev1alpha1listers "github.com/ironcore-dev/ironcore/client-go/listers/core/v1alpha1"
 	utilcontext "github.com/ironcore-dev/ironcore/utils/context"
 	"github.com/ironcore-dev/ironcore/utils/quota"

diff --git a/internal/admission/plugin/volumeresizepolicy/admission.go b/internal/admission/plugin/volumeresizepolicy/admission.go
@@ -9,7 +9,7 @@ import (
 	"io"
 
 	"github.com/ironcore-dev/ironcore/api/storage/v1alpha1"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	"github.com/ironcore-dev/ironcore/internal/apis/core"
 	"github.com/ironcore-dev/ironcore/internal/apis/storage"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/internal/app/apiserver/apiserver.go b/internal/app/apiserver/apiserver.go
@@ -14,8 +14,8 @@ import (
 	ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1"
 	networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1"
 	storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1"
-	"github.com/ironcore-dev/ironcore/client-go/informers"
-	clientset "github.com/ironcore-dev/ironcore/client-go/ironcore"
+	informers "github.com/ironcore-dev/ironcore/client-go/informers/externalversions"
+	clientset "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	ironcoreopenapi "github.com/ironcore-dev/ironcore/client-go/openapi"
 	ironcoreinitializer "github.com/ironcore-dev/ironcore/internal/admission/initializer"
 	"github.com/ironcore-dev/ironcore/internal/admission/plugin/machinevolumedevices"

diff --git a/internal/quota/evaluator/compute/compute.go b/internal/quota/evaluator/compute/compute.go
@@ -8,8 +8,8 @@ import (
 
 	computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1"
 	corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1"
-	"github.com/ironcore-dev/ironcore/client-go/informers"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
+	informers "github.com/ironcore-dev/ironcore/client-go/informers/externalversions"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	"github.com/ironcore-dev/ironcore/internal/quota/evaluator/generic"
 	utilsgeneric "github.com/ironcore-dev/ironcore/utils/generic"
 	"github.com/ironcore-dev/ironcore/utils/quota"

diff --git a/internal/quota/evaluator/ironcore/onmetal.go b/internal/quota/evaluator/ironcore/onmetal.go
@@ -4,8 +4,8 @@
 package ironcore
 
 import (
-	"github.com/ironcore-dev/ironcore/client-go/informers"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
+	informers "github.com/ironcore-dev/ironcore/client-go/informers/externalversions"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	"github.com/ironcore-dev/ironcore/internal/quota/evaluator/compute"
 	"github.com/ironcore-dev/ironcore/internal/quota/evaluator/generic"
 	"github.com/ironcore-dev/ironcore/internal/quota/evaluator/storage"

diff --git a/internal/quota/evaluator/storage/storage.go b/internal/quota/evaluator/storage/storage.go
@@ -8,8 +8,8 @@ import (
 
 	corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1"
 	storagev1alpha1 "github.com/ironcore-dev/ironcore/api/storage/v1alpha1"
-	"github.com/ironcore-dev/ironcore/client-go/informers"
-	"github.com/ironcore-dev/ironcore/client-go/ironcore"
+	informers "github.com/ironcore-dev/ironcore/client-go/informers/externalversions"
+	ironcore "github.com/ironcore-dev/ironcore/client-go/ironcore/versioned"
 	"github.com/ironcore-dev/ironcore/internal/quota/evaluator/generic"
 	utilsgeneric "github.com/ironcore-dev/ironcore/utils/generic"
 	"github.com/ironcore-dev/ironcore/utils/quota"