chore(operator): update go import paths to fix importing another project

lockwobr · lockwobr · commit ef93dff65793 · 2025-07-31T15:25:20.000-07:00
diff --git a/operator/Makefile b/operator/Makefile
@@ -40,8 +40,8 @@ GIT_SHA 		:= $(shell git rev-parse --short HEAD)
 GIT_TAG_LAST 	:= $(shell git tag --list 'operator*' --sort=-v:refname | head -n 1 | cut -d/ -f2)
 
 ## GO Flags
-GO_LDFLAGS  := -ldflags "-X github.com/NVIDIA/skyhook/internal/version.GIT_SHA=$(GIT_SHA) \
-	-X github.com/NVIDIA/skyhook/internal/version.VERSION=$(VERSION)"
+GO_LDFLAGS  := -ldflags "-X github.com/NVIDIA/skyhook/operator/internal/version.GIT_SHA=$(GIT_SHA) \
+	-X github.com/NVIDIA/skyhook/operator/internal/version.VERSION=$(VERSION)"
 GOFLAGS 	:= -mod=vendor
 
 # DOCKER_CMD defines the container tool to be used for building images.
@@ -230,7 +230,7 @@ merge-coverage:
 	echo "mode: set" > $(REPORTING)/cover.out
 	## skip first line with +2
 	tail -n +2 $(REPORTING)/temp-cover.out | sed  '/mode: set/d' >> $(REPORTING)/cover.out
-	$(sedrp) 's|^/.*skyhook/operator/(.*)$$|github\.com/NVIDIA/skyhook/\1|g' $(REPORTING)/cover.out
+	$(sedrp) 's|^/.*skyhook/operator/(.*)$$|github\.com/NVIDIA/skyhook/operator/\1|g' $(REPORTING)/cover.out
 
 .PHONY: lint
 lint: golangci-lint license-check ## Run golangci-lint linter & yamllint
diff --git a/operator/api/v1alpha1/skyhook_types.go b/operator/api/v1alpha1/skyhook_types.go
@@ -27,7 +27,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/internal/graph"
+	"github.com/NVIDIA/skyhook/operator/internal/graph"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/operator/api/v1alpha1/skyhook_webhook.go b/operator/api/v1alpha1/skyhook_webhook.go
@@ -24,8 +24,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/internal/graph"
-	semver "github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/internal/graph"
+	semver "github.com/NVIDIA/skyhook/operator/internal/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
diff --git a/operator/cmd/main.go b/operator/cmd/main.go
@@ -42,9 +42,9 @@ import (
 	kzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/controller"
-	"github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/controller"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	//+kubebuilder:scaffold:imports
 )
diff --git a/operator/go.mod b/operator/go.mod
@@ -1,4 +1,4 @@
-module github.com/NVIDIA/skyhook
+module github.com/NVIDIA/skyhook/operator
 
 go 1.24.0
 
diff --git a/operator/internal/controller/annotations.go b/operator/internal/controller/annotations.go
@@ -22,7 +22,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 )
 
diff --git a/operator/internal/controller/cert_utils.go b/operator/internal/controller/cert_utils.go
@@ -32,7 +32,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/operator/internal/controller/cluster_state_v2.go b/operator/internal/controller/cluster_state_v2.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/version"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
diff --git a/operator/internal/controller/cluster_state_v2_test.go b/operator/internal/controller/cluster_state_v2_test.go
@@ -22,9 +22,9 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	skyhookNodesMock "github.com/NVIDIA/skyhook/internal/controller/mock"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	skyhookNodesMock "github.com/NVIDIA/skyhook/operator/internal/controller/mock"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/operator/internal/controller/event_handler.go b/operator/internal/controller/event_handler.go
@@ -21,8 +21,8 @@ package controller
 import (
 	"context"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/dal"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/dal"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
diff --git a/operator/internal/controller/event_handler_test.go b/operator/internal/controller/event_handler_test.go
@@ -25,11 +25,11 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 
 	// . "github.com/onsi/gomega"
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/dal"
-	dalmock "github.com/NVIDIA/skyhook/internal/dal/mock"
-	MockClient "github.com/NVIDIA/skyhook/internal/mocks/client"
-	"github.com/NVIDIA/skyhook/internal/mocks/workqueue"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/dal"
+	dalmock "github.com/NVIDIA/skyhook/operator/internal/dal/mock"
+	MockClient "github.com/NVIDIA/skyhook/operator/internal/mocks/client"
+	"github.com/NVIDIA/skyhook/operator/internal/mocks/workqueue"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/operator/internal/controller/metrics.go b/operator/internal/controller/metrics.go
@@ -19,7 +19,7 @@
 package controller
 
 import (
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	"github.com/prometheus/client_golang/prometheus"
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
diff --git a/operator/internal/controller/mock/SkyhookNodes.go b/operator/internal/controller/mock/SkyhookNodes.go
diff --git a/operator/internal/controller/pod_controller.go b/operator/internal/controller/pod_controller.go
@@ -23,8 +23,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/operator/internal/controller/skyhook_controller.go b/operator/internal/controller/skyhook_controller.go
@@ -32,10 +32,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/dal"
-	"github.com/NVIDIA/skyhook/internal/version"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/dal"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	"github.com/go-logr/logr"
 
 	corev1 "k8s.io/api/core/v1"
diff --git a/operator/internal/controller/skyhook_controller_test.go b/operator/internal/controller/skyhook_controller_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	skyhookNodesMock "github.com/NVIDIA/skyhook/internal/controller/mock"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	skyhookNodesMock "github.com/NVIDIA/skyhook/operator/internal/controller/mock"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
diff --git a/operator/internal/controller/suite_test.go b/operator/internal/controller/suite_test.go
@@ -25,7 +25,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sethvargo/go-envconfig"
diff --git a/operator/internal/controller/webhook_controller.go b/operator/internal/controller/webhook_controller.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/operator/internal/controller/webhook_controller_test.go b/operator/internal/controller/webhook_controller_test.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
diff --git a/operator/internal/dal/dal.go b/operator/internal/dal/dal.go
@@ -22,7 +22,7 @@ import (
 	"context"
 	"fmt"
 
-	skyhookv1alpha1 "github.com/NVIDIA/skyhook/api/v1alpha1"
+	skyhookv1alpha1 "github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/operator/internal/dal/mock/DAL.go b/operator/internal/dal/mock/DAL.go
diff --git a/operator/internal/wrapper/node.go b/operator/internal/wrapper/node.go
@@ -24,9 +24,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/graph"
-	"github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/graph"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/operator/internal/wrapper/node_test.go b/operator/internal/wrapper/node_test.go
@@ -19,7 +19,7 @@
 package wrapper
 
 import (
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
diff --git a/operator/internal/wrapper/skyhook.go b/operator/internal/wrapper/skyhook.go
@@ -21,8 +21,8 @@ package wrapper
 import (
 	"fmt"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
 	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/operator/internal/wrapper/skyhook_test.go b/operator/internal/wrapper/skyhook_test.go
@@ -19,7 +19,7 @@
 package wrapper
 
 import (
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/operator/internal/wrapper/zz.migration.0.5.0.go b/operator/internal/wrapper/zz.migration.0.5.0.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	"github.com/go-logr/logr"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/NVIDIA/skyhook`
	`1`	`+module github.com/NVIDIA/skyhook/operator`
`2`	`2`
`3`	`3`	`go 1.24.0`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"encoding/json"`
`23`	`23`	`"fmt"`
`24`	`24`
`25`		`- "github.com/NVIDIA/skyhook/api/v1alpha1"`
	`25`	`+ "github.com/NVIDIA/skyhook/operator/api/v1alpha1"`
`26`	`26`	`corev1 "k8s.io/api/core/v1"`
`27`	`27`	`)`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`"path/filepath"`
`33`	`33`	`"time"`
`34`	`34`
`35`		`- "github.com/NVIDIA/skyhook/api/v1alpha1"`
	`35`	`+ "github.com/NVIDIA/skyhook/operator/api/v1alpha1"`
`36`	`36`	`corev1 "k8s.io/api/core/v1"`
`37`	`37`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`38`	`38`	`)`