diff --git a/.tekton/rosa-hyperfleet-api-pull-request.yaml b/.tekton/rosa-hyperfleet-api-pull-request.yaml index 7df17d01..8261f923 100644 --- a/.tekton/rosa-hyperfleet-api-pull-request.yaml +++ b/.tekton/rosa-hyperfleet-api-pull-request.yaml @@ -36,7 +36,7 @@ spec: - name: hermetic value: "true" - name: prefetch-input - value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "hyperfleet-operator/api"}, {"type": "gomod", "path": "platform-api"}]' + value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "api"}, {"type": "gomod", "path": "platform-api"}]' - name: build-source-image value: "true" pipelineSpec: diff --git a/.tekton/rosa-hyperfleet-api-push.yaml b/.tekton/rosa-hyperfleet-api-push.yaml index c1a63921..322284fa 100644 --- a/.tekton/rosa-hyperfleet-api-push.yaml +++ b/.tekton/rosa-hyperfleet-api-push.yaml @@ -33,7 +33,7 @@ spec: - name: hermetic value: "true" - name: prefetch-input - value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "hyperfleet-operator/api"}, {"type": "gomod", "path": "platform-api"}]' + value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "api"}, {"type": "gomod", "path": "platform-api"}]' - name: build-source-image value: "true" pipelineSpec: diff --git a/.tekton/rosa-hyperfleet-operator-pull-request.yaml b/.tekton/rosa-hyperfleet-operator-pull-request.yaml index 67336ad4..43f7cc17 100644 --- a/.tekton/rosa-hyperfleet-operator-pull-request.yaml +++ b/.tekton/rosa-hyperfleet-operator-pull-request.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "true" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "hyperfleet-operator/***".pathChanged() || "hyperfleet-db/***".pathChanged() || ".tekton/rosa-hyperfleet-operator-pull-request.yaml".pathChanged() || "hyperfleet-operator/Containerfile".pathChanged() ) + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "api/***".pathChanged() || "hyperfleet-operator/***".pathChanged() || "hyperfleet-db/***".pathChanged() || ".tekton/rosa-hyperfleet-operator-pull-request.yaml".pathChanged() || "hyperfleet-operator/Containerfile".pathChanged() ) labels: appstudio.openshift.io/application: rosa-hyperfleet appstudio.openshift.io/component: rosa-hyperfleet-operator @@ -35,7 +35,7 @@ spec: - name: hermetic value: "true" - name: prefetch-input - value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "hyperfleet-operator/api"}, {"type": "gomod", "path": "hyperfleet-operator"}]' + value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "api"}, {"type": "gomod", "path": "hyperfleet-operator"}]' - name: build-source-image value: "true" pipelineSpec: diff --git a/.tekton/rosa-hyperfleet-operator-push.yaml b/.tekton/rosa-hyperfleet-operator-push.yaml index 928e4889..926264b8 100644 --- a/.tekton/rosa-hyperfleet-operator-push.yaml +++ b/.tekton/rosa-hyperfleet-operator-push.yaml @@ -7,7 +7,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( "force_konflux_release".pathChanged() || "hyperfleet-operator/***".pathChanged() || "hyperfleet-db/***".pathChanged() || ".tekton/rosa-hyperfleet-operator-push.yaml".pathChanged() || "hyperfleet-operator/Containerfile".pathChanged() ) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( "force_konflux_release".pathChanged() || "api/***".pathChanged() || "hyperfleet-operator/***".pathChanged() || "hyperfleet-db/***".pathChanged() || ".tekton/rosa-hyperfleet-operator-push.yaml".pathChanged() || "hyperfleet-operator/Containerfile".pathChanged() ) labels: appstudio.openshift.io/application: rosa-hyperfleet appstudio.openshift.io/component: rosa-hyperfleet-operator @@ -32,7 +32,7 @@ spec: - name: hermetic value: "true" - name: prefetch-input - value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "hyperfleet-operator/api"}, {"type": "gomod", "path": "hyperfleet-operator"}]' + value: '[{"type": "gomod", "path": "hyperfleet-db"}, {"type": "gomod", "path": "api"}, {"type": "gomod", "path": "hyperfleet-operator"}]' - name: build-source-image value: "true" pipelineSpec: diff --git a/CLAUDE.md b/CLAUDE.md index ed855d02..28d7055e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -35,9 +35,9 @@ make generate # Generate deepcopy ``` hyperfleet-db/go.mod ← standalone -hyperfleet-operator/api/go.mod ← standalone (CRD types sub-module) -hyperfleet-operator/go.mod ← requires: fleetdb, hyperfleet-operator/api -platform-api/go.mod ← requires: fleetdb, hyperfleet-operator/api +api/go.mod ← standalone (CRD types sub-module) +hyperfleet-operator/go.mod ← requires: fleetdb, api +platform-api/go.mod ← requires: fleetdb, api ``` Cross-module refs use permanent `replace` directives to sibling dirs. diff --git a/Makefile b/Makefile index 2d1b379b..350c9666 100644 --- a/Makefile +++ b/Makefile @@ -40,18 +40,18 @@ GINKGO := $(abspath $(TOOLS_BIN_DIR)/ginkgo) # ── SDK generation ─────────────────────────────────────────────────────── SDK_MODULE ?= github.com/openshift-online/rosa-hyperfleet-api -SDK_API_PKG ?= $(SDK_MODULE)/hyperfleet-operator/api +SDK_API_PKG ?= $(SDK_MODULE)/api SDK_INPUT ?= v1alpha1 SDK_CLIENTSET ?= generated SDK_OUTPUT_DIR ?= $(abspath clientset) SDK_OUTPUT_PKG ?= $(SDK_MODULE)/clientset -WIRE_INPUT_DIR ?= $(abspath hyperfleet-operator/api/v1alpha1) +WIRE_INPUT_DIR ?= $(abspath api/v1alpha1) WIRE_OUTPUT_DIR ?= $(abspath clientset/transport) WIRE_OUTPUT_PKG ?= transport WRAPPERS_OUTPUT_DIR ?= $(abspath clientset/wrappers) WRAPPERS_OUTPUT_PKG ?= wrappers TYPED_PKG_IMPORT ?= $(SDK_MODULE)/clientset/generated/typed/v1alpha1/internalversion -API_PKG_IMPORT ?= $(SDK_MODULE)/hyperfleet-operator/api/v1alpha1 +API_PKG_IMPORT ?= $(SDK_MODULE)/api/v1alpha1 SDK_HEADER_FILE ?= $(abspath hack/clientset/license-boilerplate.go.txt) $(GOLANGCI_LINT): $(TOOLS_DIR)/go.mod @@ -258,7 +258,7 @@ lint: $(GOLANGCI_LINT) verify: cd hyperfleet-db && go mod tidy - cd hyperfleet-operator/api && go mod tidy + cd api && go mod tidy cd hyperfleet-operator && go mod tidy cd platform-api && go mod tidy cd test && go mod tidy @@ -266,7 +266,7 @@ verify: cd hack/api-codegen && go mod tidy git diff --exit-code \ hyperfleet-db/go.mod hyperfleet-db/go.sum \ - hyperfleet-operator/api/go.mod hyperfleet-operator/api/go.sum \ + api/go.mod api/go.sum \ hyperfleet-operator/go.mod hyperfleet-operator/go.sum \ platform-api/go.mod platform-api/go.sum \ test/go.mod test/go.sum \ @@ -275,7 +275,7 @@ verify: deps: cd hyperfleet-db && go mod download && go mod tidy - cd hyperfleet-operator/api && go mod download && go mod tidy + cd api && go mod download && go mod tidy cd hyperfleet-operator && go mod download && go mod tidy cd platform-api && go mod download && go mod tidy cd test && go mod download && go mod tidy @@ -284,13 +284,13 @@ deps: # ── Code Generation ────────────────────────────────────────────────────── manifests: $(CONTROLLER_GEN) - cd hyperfleet-operator && $(CONTROLLER_GEN) crd paths="./api/..." output:crd:dir=config/crd/bases + cd hyperfleet-operator && $(CONTROLLER_GEN) crd paths="../api/..." output:crd:dir=config/crd/bases generate: $(CONTROLLER_GEN) - cd hyperfleet-operator && $(CONTROLLER_GEN) object paths="./api/..." + $(CONTROLLER_GEN) object paths="./api/..." generate-clientset: $(CLIENT_GEN) $(WIRE_GEN) - cd hyperfleet-operator/api && $(CLIENT_GEN) \ + cd api && $(CLIENT_GEN) \ --input-base "$(SDK_API_PKG)" \ --input "$(SDK_INPUT)" \ --clientset-name "$(SDK_CLIENTSET)" \ diff --git a/README.md b/README.md index e4e3aa88..92d4e110 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ make help # full target list ``` hyperfleet-db/go.mod ← standalone -hyperfleet-operator/api/go.mod ← standalone (CRD types) -hyperfleet-operator/go.mod ← requires: hyperfleet-db, hyperfleet-operator/api -platform-api/go.mod ← requires: hyperfleet-db, hyperfleet-operator/api +api/go.mod ← standalone (CRD types) +hyperfleet-operator/go.mod ← requires: hyperfleet-db, api +platform-api/go.mod ← requires: hyperfleet-db, api ``` ## Docs diff --git a/hyperfleet-operator/api/go.mod b/api/go.mod similarity index 93% rename from hyperfleet-operator/api/go.mod rename to api/go.mod index 3ead2192..4dc195d2 100644 --- a/hyperfleet-operator/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api +module github.com/openshift-online/rosa-hyperfleet-api/api go 1.26.3 diff --git a/hyperfleet-operator/api/go.sum b/api/go.sum similarity index 100% rename from hyperfleet-operator/api/go.sum rename to api/go.sum diff --git a/hyperfleet-operator/api/v1alpha1/cluster_types.go b/api/v1alpha1/cluster_types.go similarity index 100% rename from hyperfleet-operator/api/v1alpha1/cluster_types.go rename to api/v1alpha1/cluster_types.go diff --git a/hyperfleet-operator/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go similarity index 100% rename from hyperfleet-operator/api/v1alpha1/groupversion_info.go rename to api/v1alpha1/groupversion_info.go diff --git a/hyperfleet-operator/api/v1alpha1/install/install.go b/api/v1alpha1/install/install.go similarity index 90% rename from hyperfleet-operator/api/v1alpha1/install/install.go rename to api/v1alpha1/install/install.go index e1da6de4..8c8a6eef 100644 --- a/hyperfleet-operator/api/v1alpha1/install/install.go +++ b/api/v1alpha1/install/install.go @@ -18,7 +18,7 @@ limitations under the License. package install import ( - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/hyperfleet-operator/api/v1alpha1/managementcluster_types.go b/api/v1alpha1/managementcluster_types.go similarity index 100% rename from hyperfleet-operator/api/v1alpha1/managementcluster_types.go rename to api/v1alpha1/managementcluster_types.go diff --git a/hyperfleet-operator/api/v1alpha1/manifest_types.go b/api/v1alpha1/manifest_types.go similarity index 100% rename from hyperfleet-operator/api/v1alpha1/manifest_types.go rename to api/v1alpha1/manifest_types.go diff --git a/hyperfleet-operator/api/v1alpha1/nodepool_types.go b/api/v1alpha1/nodepool_types.go similarity index 100% rename from hyperfleet-operator/api/v1alpha1/nodepool_types.go rename to api/v1alpha1/nodepool_types.go diff --git a/hyperfleet-operator/api/v1alpha1/placement_types.go b/api/v1alpha1/placement_types.go similarity index 100% rename from hyperfleet-operator/api/v1alpha1/placement_types.go rename to api/v1alpha1/placement_types.go diff --git a/hyperfleet-operator/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from hyperfleet-operator/api/v1alpha1/zz_generated.deepcopy.go rename to api/v1alpha1/zz_generated.deepcopy.go diff --git a/clientset/docs/architecture.md b/clientset/docs/architecture.md index 2837a4b1..cd02be00 100644 --- a/clientset/docs/architecture.md +++ b/clientset/docs/architecture.md @@ -19,7 +19,7 @@ It is built in two parts: ### Prerequisites: markers in the CRD types -`client-gen` generates a typed client for every type annotated with `// +genclient` in the operator API package (`hyperfleet-operator/api/v1alpha1`). Two types have this marker: +`client-gen` generates a typed client for every type annotated with `// +genclient` in the operator API package (`api/v1alpha1`). Two types have this marker: ```go // +genclient @@ -46,7 +46,7 @@ make verify-clientset # fail if generated output differs from committed file SDK_CLIENTSET ?= generated SDK_OUTPUT_DIR ?= $(abspath clientset) SDK_OUTPUT_PKG ?= $(SDK_MODULE)/clientset -WIRE_INPUT_DIR ?= $(abspath hyperfleet-operator/api/v1alpha1) +WIRE_INPUT_DIR ?= $(abspath api/v1alpha1) WIRE_OUTPUT_DIR ?= $(abspath clientset/transport) WRAPPERS_OUTPUT_DIR ?= $(abspath clientset/wrappers) ``` @@ -78,14 +78,14 @@ clientset/wrappers/ ### install package (hand-written, required by generated code) -The generated `scheme/register.go` imports `hyperfleet-operator/api/v1alpha1/install`, which does not exist in the operator module by default. It must be created manually: +The generated `scheme/register.go` imports `api/v1alpha1/install`, which does not exist in the api module by default. It must be created manually: ```go -// hyperfleet-operator/api/v1alpha1/install/install.go +// api/v1alpha1/install/install.go package install import ( - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/clientset/generated/fake/register.go b/clientset/generated/fake/register.go index eb1daa2a..4a2c8b37 100644 --- a/clientset/generated/fake/register.go +++ b/clientset/generated/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1internalversion "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + v1alpha1internalversion "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/clientset/generated/scheme/register.go b/clientset/generated/scheme/register.go index e0688c2b..9748eb16 100644 --- a/clientset/generated/scheme/register.go +++ b/clientset/generated/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1/install" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1/install" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/clientset/generated/typed/v1alpha1/internalversion/cluster.go b/clientset/generated/typed/v1alpha1/internalversion/cluster.go index 78678781..8ef28c47 100644 --- a/clientset/generated/typed/v1alpha1/internalversion/cluster.go +++ b/clientset/generated/typed/v1alpha1/internalversion/cluster.go @@ -21,8 +21,8 @@ package internalversion import ( context "context" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" scheme "github.com/openshift-online/rosa-hyperfleet-api/clientset/generated/scheme" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/clientset/generated/typed/v1alpha1/internalversion/fake/fake_cluster.go b/clientset/generated/typed/v1alpha1/internalversion/fake/fake_cluster.go index 6d76b78d..1b879b39 100644 --- a/clientset/generated/typed/v1alpha1/internalversion/fake/fake_cluster.go +++ b/clientset/generated/typed/v1alpha1/internalversion/fake/fake_cluster.go @@ -19,8 +19,8 @@ limitations under the License. package fake import ( + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" internalversion "github.com/openshift-online/rosa-hyperfleet-api/clientset/generated/typed/v1alpha1/internalversion" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" gentype "k8s.io/client-go/gentype" ) diff --git a/clientset/generated/typed/v1alpha1/internalversion/fake/fake_nodepool.go b/clientset/generated/typed/v1alpha1/internalversion/fake/fake_nodepool.go index 92c8abd6..f802e06c 100644 --- a/clientset/generated/typed/v1alpha1/internalversion/fake/fake_nodepool.go +++ b/clientset/generated/typed/v1alpha1/internalversion/fake/fake_nodepool.go @@ -19,8 +19,8 @@ limitations under the License. package fake import ( + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" internalversion "github.com/openshift-online/rosa-hyperfleet-api/clientset/generated/typed/v1alpha1/internalversion" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" gentype "k8s.io/client-go/gentype" ) diff --git a/clientset/generated/typed/v1alpha1/internalversion/nodepool.go b/clientset/generated/typed/v1alpha1/internalversion/nodepool.go index ace6e1fe..8d21e839 100644 --- a/clientset/generated/typed/v1alpha1/internalversion/nodepool.go +++ b/clientset/generated/typed/v1alpha1/internalversion/nodepool.go @@ -21,8 +21,8 @@ package internalversion import ( context "context" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" scheme "github.com/openshift-online/rosa-hyperfleet-api/clientset/generated/scheme" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/clientset/go.mod b/clientset/go.mod index 8e17c7d0..ee341744 100644 --- a/clientset/go.mod +++ b/clientset/go.mod @@ -5,7 +5,7 @@ go 1.26.3 require ( github.com/aws/aws-sdk-go-v2 v1.43.2 github.com/aws/aws-sdk-go-v2/credentials v1.19.30 - github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api v0.0.0 + github.com/openshift-online/rosa-hyperfleet-api/api v0.0.0 k8s.io/apimachinery v0.36.0 k8s.io/client-go v0.36.0 ) @@ -52,4 +52,4 @@ require ( sigs.k8s.io/yaml v1.6.0 // indirect ) -replace github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api => ../hyperfleet-operator/api +replace github.com/openshift-online/rosa-hyperfleet-api/api => ../api diff --git a/clientset/wrappers/wire_wrappers_generated.go b/clientset/wrappers/wire_wrappers_generated.go index 7d1777df..829ef027 100644 --- a/clientset/wrappers/wire_wrappers_generated.go +++ b/clientset/wrappers/wire_wrappers_generated.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/rest" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" internalversion "github.com/openshift-online/rosa-hyperfleet-api/clientset/generated/typed/v1alpha1/internalversion" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" ) // ClusterInterface is the platform-scoped client for Cluster resources. @@ -229,6 +229,7 @@ func (c *nodePoolClient) WaitUntil(ctx context.Context, id string, condition fun } } } + // V1alpha1Interface is the platform-scoped typed client for the hyperfleet.io/v1alpha1 group. type V1alpha1Interface interface { RESTClient() rest.Interface diff --git a/clientset/wrappers/wrappers_test.go b/clientset/wrappers/wrappers_test.go index 0f34e33c..f76719ac 100644 --- a/clientset/wrappers/wrappers_test.go +++ b/clientset/wrappers/wrappers_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" diff --git a/hyperfleet-operator/Containerfile b/hyperfleet-operator/Containerfile index f668c385..f968bb11 100644 --- a/hyperfleet-operator/Containerfile +++ b/hyperfleet-operator/Containerfile @@ -9,10 +9,11 @@ USER 1001 WORKDIR /workspace COPY hyperfleet-db/go.mod hyperfleet-db/go.sum ./hyperfleet-db/ -COPY hyperfleet-operator/api/go.mod hyperfleet-operator/api/go.sum ./hyperfleet-operator/api/ +COPY api/go.mod api/go.sum ./api/ COPY hyperfleet-operator/go.mod hyperfleet-operator/go.sum ./hyperfleet-operator/ RUN cd hyperfleet-operator && go mod download +COPY api/ ./api/ COPY hyperfleet-db/ ./hyperfleet-db/ COPY hyperfleet-operator/ ./hyperfleet-operator/ diff --git a/hyperfleet-operator/PROJECT b/hyperfleet-operator/PROJECT index 54059540..f9bc7075 100644 --- a/hyperfleet-operator/PROJECT +++ b/hyperfleet-operator/PROJECT @@ -15,7 +15,7 @@ resources: controller: true domain: hyperfleet.io kind: Cluster - path: github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1 + path: github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -23,7 +23,7 @@ resources: controller: true domain: hyperfleet.io kind: NodePool - path: github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1 + path: github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -31,6 +31,6 @@ resources: controller: true domain: hyperfleet.io kind: Placement - path: github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1 + path: github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/hyperfleet-operator/cmd/manager/main.go b/hyperfleet-operator/cmd/manager/main.go index 2acb2c8e..6e6215f1 100644 --- a/hyperfleet-operator/cmd/manager/main.go +++ b/hyperfleet-operator/cmd/manager/main.go @@ -38,7 +38,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/controller" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo/statusstream" diff --git a/hyperfleet-operator/go.mod b/hyperfleet-operator/go.mod index 19060ce4..196806ff 100644 --- a/hyperfleet-operator/go.mod +++ b/hyperfleet-operator/go.mod @@ -3,8 +3,8 @@ module github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator go 1.26.3 replace ( + github.com/openshift-online/rosa-hyperfleet-api/api => ../api github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-db => ../hyperfleet-db - github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api => ./api ) require ( @@ -18,8 +18,8 @@ require ( github.com/jackc/pgx/v5 v5.10.0 github.com/onsi/ginkgo/v2 v2.27.4 github.com/onsi/gomega v1.42.1 + github.com/openshift-online/rosa-hyperfleet-api/api v0.0.0 github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-db v0.0.0 - github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api v0.0.0 github.com/openshift/api v0.0.0-20260416105050-3c6b218b8a80 github.com/openshift/hypershift/api v0.0.0-20260625052409-9acec4759a16 github.com/prometheus/client_golang v1.23.2 diff --git a/hyperfleet-operator/internal/controller/cluster_controller.go b/hyperfleet-operator/internal/controller/cluster_controller.go index 3aa3a9fc..05ba5b94 100644 --- a/hyperfleet-operator/internal/controller/cluster_controller.go +++ b/hyperfleet-operator/internal/controller/cluster_controller.go @@ -39,7 +39,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/render" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" diff --git a/hyperfleet-operator/internal/controller/cluster_controller_test.go b/hyperfleet-operator/internal/controller/cluster_controller_test.go index a52077b4..94abb58c 100644 --- a/hyperfleet-operator/internal/controller/cluster_controller_test.go +++ b/hyperfleet-operator/internal/controller/cluster_controller_test.go @@ -32,7 +32,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/render" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" diff --git a/hyperfleet-operator/internal/controller/manifest_controller.go b/hyperfleet-operator/internal/controller/manifest_controller.go index 414613f8..bd905ada 100644 --- a/hyperfleet-operator/internal/controller/manifest_controller.go +++ b/hyperfleet-operator/internal/controller/manifest_controller.go @@ -38,7 +38,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/source" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" ) diff --git a/hyperfleet-operator/internal/controller/manifest_controller_test.go b/hyperfleet-operator/internal/controller/manifest_controller_test.go index 710d6733..e921e1c6 100644 --- a/hyperfleet-operator/internal/controller/manifest_controller_test.go +++ b/hyperfleet-operator/internal/controller/manifest_controller_test.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" ) diff --git a/hyperfleet-operator/internal/controller/nodepool_controller.go b/hyperfleet-operator/internal/controller/nodepool_controller.go index ecf8008d..d378648c 100644 --- a/hyperfleet-operator/internal/controller/nodepool_controller.go +++ b/hyperfleet-operator/internal/controller/nodepool_controller.go @@ -37,7 +37,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/source" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/render" ) diff --git a/hyperfleet-operator/internal/controller/nodepool_controller_test.go b/hyperfleet-operator/internal/controller/nodepool_controller_test.go index a2b2b035..68a11499 100644 --- a/hyperfleet-operator/internal/controller/nodepool_controller_test.go +++ b/hyperfleet-operator/internal/controller/nodepool_controller_test.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" ) diff --git a/hyperfleet-operator/internal/controller/placement_controller.go b/hyperfleet-operator/internal/controller/placement_controller.go index a316fbb0..f8a09d84 100644 --- a/hyperfleet-operator/internal/controller/placement_controller.go +++ b/hyperfleet-operator/internal/controller/placement_controller.go @@ -34,7 +34,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) // PlacementReconciler watches Cluster CRs and ensures each has a Placement. diff --git a/hyperfleet-operator/internal/controller/placement_controller_test.go b/hyperfleet-operator/internal/controller/placement_controller_test.go index 2da4cee0..a1150d8e 100644 --- a/hyperfleet-operator/internal/controller/placement_controller_test.go +++ b/hyperfleet-operator/internal/controller/placement_controller_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) var _ = Describe("Placement Controller", func() { diff --git a/hyperfleet-operator/internal/controller/suite_test.go b/hyperfleet-operator/internal/controller/suite_test.go index d26f75cf..916b38e7 100644 --- a/hyperfleet-operator/internal/controller/suite_test.go +++ b/hyperfleet-operator/internal/controller/suite_test.go @@ -36,7 +36,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - hyperfleetiov1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetiov1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/hyperfleet-operator/internal/dynamo/statusstream/manager.go b/hyperfleet-operator/internal/dynamo/statusstream/manager.go index fa5cd53b..3b298446 100644 --- a/hyperfleet-operator/internal/dynamo/statusstream/manager.go +++ b/hyperfleet-operator/internal/dynamo/statusstream/manager.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/dynamodbstreams" "sigs.k8s.io/controller-runtime/pkg/client" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) type watcherHandle struct { diff --git a/hyperfleet-operator/internal/render/cluster.go b/hyperfleet-operator/internal/render/cluster.go index 44fa4b57..0217fd56 100644 --- a/hyperfleet-operator/internal/render/cluster.go +++ b/hyperfleet-operator/internal/render/cluster.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) // ClusterResources generates the 7 Kubernetes resources for a cluster on the MC. diff --git a/hyperfleet-operator/internal/render/cluster_test.go b/hyperfleet-operator/internal/render/cluster_test.go index df102cb1..8d8b1134 100644 --- a/hyperfleet-operator/internal/render/cluster_test.go +++ b/hyperfleet-operator/internal/render/cluster_test.go @@ -3,7 +3,7 @@ package render import ( "testing" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/hyperfleet-operator/internal/render/nodepool.go b/hyperfleet-operator/internal/render/nodepool.go index 9eaf6e36..f7d85440 100644 --- a/hyperfleet-operator/internal/render/nodepool.go +++ b/hyperfleet-operator/internal/render/nodepool.go @@ -7,7 +7,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) // NodePoolResource generates the HyperShift NodePool resource for the MC. diff --git a/hyperfleet-operator/internal/render/nodepool_test.go b/hyperfleet-operator/internal/render/nodepool_test.go index 36a70213..b91fdc43 100644 --- a/hyperfleet-operator/internal/render/nodepool_test.go +++ b/hyperfleet-operator/internal/render/nodepool_test.go @@ -3,7 +3,7 @@ package render import ( "testing" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/hyperfleet-operator/test/cluster_test.go b/hyperfleet-operator/test/cluster_test.go index c6cf6690..5cf60ed7 100644 --- a/hyperfleet-operator/test/cluster_test.go +++ b/hyperfleet-operator/test/cluster_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" dynamo "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" ) diff --git a/hyperfleet-operator/test/helpers_test.go b/hyperfleet-operator/test/helpers_test.go index 4dff72d7..9c1cba35 100644 --- a/hyperfleet-operator/test/helpers_test.go +++ b/hyperfleet-operator/test/helpers_test.go @@ -8,7 +8,7 @@ import ( dynamodbtypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" "github.com/openshift/hypershift/api/util/ipnet" corev1 "k8s.io/api/core/v1" diff --git a/hyperfleet-operator/test/manifest_test.go b/hyperfleet-operator/test/manifest_test.go index cb7b740e..c9de9dbe 100644 --- a/hyperfleet-operator/test/manifest_test.go +++ b/hyperfleet-operator/test/manifest_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/controller" dynamo "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" ) diff --git a/hyperfleet-operator/test/suite_test.go b/hyperfleet-operator/test/suite_test.go index ea6b5740..bcba6f27 100644 --- a/hyperfleet-operator/test/suite_test.go +++ b/hyperfleet-operator/test/suite_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/controller" dynamo "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo" "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/internal/dynamo/statusstream" diff --git a/platform-api/Containerfile b/platform-api/Containerfile index ffb84f0c..d6efa411 100644 --- a/platform-api/Containerfile +++ b/platform-api/Containerfile @@ -7,12 +7,12 @@ ARG TARGETARCH=amd64 WORKDIR /app COPY hyperfleet-db/go.mod hyperfleet-db/go.sum ./hyperfleet-db/ -COPY hyperfleet-operator/api/go.mod hyperfleet-operator/api/go.sum ./hyperfleet-operator/api/ +COPY api/go.mod api/go.sum ./api/ COPY platform-api/go.mod platform-api/go.sum ./platform-api/ RUN cd platform-api && go mod download COPY hyperfleet-db/ ./hyperfleet-db/ -COPY hyperfleet-operator/api/ ./hyperfleet-operator/api/ +COPY api/ ./api/ COPY platform-api/ ./platform-api/ RUN cd platform-api && \ diff --git a/platform-api/go.mod b/platform-api/go.mod index b422bdf5..06368a42 100644 --- a/platform-api/go.mod +++ b/platform-api/go.mod @@ -3,8 +3,8 @@ module github.com/openshift-online/rosa-hyperfleet-api/platform-api go 1.26.3 replace ( + github.com/openshift-online/rosa-hyperfleet-api/api => ../api github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-db => ../hyperfleet-db - github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api => ../hyperfleet-operator/api ) require ( @@ -20,8 +20,8 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/onsi/ginkgo/v2 v2.28.1 + github.com/openshift-online/rosa-hyperfleet-api/api v0.0.0 github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-db v0.0.0 - github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api v0.0.0 github.com/openshift/hypershift/api v0.0.0-20260625052409-9acec4759a16 github.com/prometheus/client_golang v1.23.2 github.com/redis/go-redis/v9 v9.21.0 diff --git a/platform-api/pkg/clients/hyperfleetdb/client.go b/platform-api/pkg/clients/hyperfleetdb/client.go index e7b20a67..e0d79fe9 100644 --- a/platform-api/pkg/clients/hyperfleetdb/client.go +++ b/platform-api/pkg/clients/hyperfleetdb/client.go @@ -12,7 +12,7 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) const accountIDLabel = "hyperfleet.io/account-id" diff --git a/platform-api/pkg/clients/hyperfleetdb/client_test.go b/platform-api/pkg/clients/hyperfleetdb/client_test.go index 933c3036..cd0380ef 100644 --- a/platform-api/pkg/clients/hyperfleetdb/client_test.go +++ b/platform-api/pkg/clients/hyperfleetdb/client_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) func testScheme() *runtime.Scheme { diff --git a/platform-api/pkg/clients/hyperfleetdb/convert.go b/platform-api/pkg/clients/hyperfleetdb/convert.go index 7c1c8377..786f99ae 100644 --- a/platform-api/pkg/clients/hyperfleetdb/convert.go +++ b/platform-api/pkg/clients/hyperfleetdb/convert.go @@ -7,7 +7,7 @@ import ( hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/types" ) diff --git a/platform-api/pkg/clients/hyperfleetdb/convert_test.go b/platform-api/pkg/clients/hyperfleetdb/convert_test.go index 59829c07..ce807fd1 100644 --- a/platform-api/pkg/clients/hyperfleetdb/convert_test.go +++ b/platform-api/pkg/clients/hyperfleetdb/convert_test.go @@ -3,7 +3,7 @@ package hyperfleetdb import ( "testing" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/types" diff --git a/platform-api/pkg/handlers/cluster_test.go b/platform-api/pkg/handlers/cluster_test.go index 1ceb7838..c65b431c 100644 --- a/platform-api/pkg/handlers/cluster_test.go +++ b/platform-api/pkg/handlers/cluster_test.go @@ -18,7 +18,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/clients/hyperfleetdb" diff --git a/platform-api/pkg/handlers/management_cluster.go b/platform-api/pkg/handlers/management_cluster.go index cb8fe488..5edc4551 100644 --- a/platform-api/pkg/handlers/management_cluster.go +++ b/platform-api/pkg/handlers/management_cluster.go @@ -8,7 +8,7 @@ import ( "github.com/gorilla/mux" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/clients/hyperfleetdb" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/middleware" diff --git a/platform-api/pkg/handlers/zoa_test.go b/platform-api/pkg/handlers/zoa_test.go index 419b32ca..ab57b532 100644 --- a/platform-api/pkg/handlers/zoa_test.go +++ b/platform-api/pkg/handlers/zoa_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/clients/hyperfleetdb" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/middleware" diff --git a/platform-api/pkg/types/cluster.go b/platform-api/pkg/types/cluster.go index ac03c971..bc771397 100644 --- a/platform-api/pkg/types/cluster.go +++ b/platform-api/pkg/types/cluster.go @@ -3,7 +3,7 @@ package types import ( "time" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) // Cluster represents a cluster resource diff --git a/platform-api/pkg/types/nodepool.go b/platform-api/pkg/types/nodepool.go index 62f63dff..a6c96daf 100644 --- a/platform-api/pkg/types/nodepool.go +++ b/platform-api/pkg/types/nodepool.go @@ -3,7 +3,7 @@ package types import ( "time" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) // NodePool represents a nodepool resource diff --git a/platform-api/pkg/zoa/jobbuilder.go b/platform-api/pkg/zoa/jobbuilder.go index d971eb5f..0d8d6659 100644 --- a/platform-api/pkg/zoa/jobbuilder.go +++ b/platform-api/pkg/zoa/jobbuilder.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" ) const ( diff --git a/platform-api/pkg/zoa/reconciler.go b/platform-api/pkg/zoa/reconciler.go index 54655c65..21a70674 100644 --- a/platform-api/pkg/zoa/reconciler.go +++ b/platform-api/pkg/zoa/reconciler.go @@ -6,7 +6,7 @@ import ( "log/slog" "time" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/clients/hyperfleetdb" ) diff --git a/platform-api/pkg/zoa/reconciler_test.go b/platform-api/pkg/zoa/reconciler_test.go index d342fb8a..67ea8562 100644 --- a/platform-api/pkg/zoa/reconciler_test.go +++ b/platform-api/pkg/zoa/reconciler_test.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + hyperfleetv1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" "github.com/openshift-online/rosa-hyperfleet-api/platform-api/pkg/clients/hyperfleetdb" ) diff --git a/test/e2e-sdk/sdk_sanity_test.go b/test/e2e-sdk/sdk_sanity_test.go index 62e23a95..e52d13df 100644 --- a/test/e2e-sdk/sdk_sanity_test.go +++ b/test/e2e-sdk/sdk_sanity_test.go @@ -54,7 +54,7 @@ import ( hyperfleet "github.com/openshift-online/rosa-hyperfleet-api/clientset" hfrest "github.com/openshift-online/rosa-hyperfleet-api/clientset/rest" "github.com/openshift-online/rosa-hyperfleet-api/clientset/wrappers" - v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api/v1alpha1" + v1alpha1 "github.com/openshift-online/rosa-hyperfleet-api/api/v1alpha1" awstest "github.com/openshift-online/rosa-hyperfleet-api/test/helpers/aws" hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/go.mod b/test/go.mod index e2dd11e4..f93256c0 100644 --- a/test/go.mod +++ b/test/go.mod @@ -9,8 +9,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.45.0 github.com/onsi/ginkgo/v2 v2.28.1 github.com/onsi/gomega v1.39.1 + github.com/openshift-online/rosa-hyperfleet-api/api v0.0.0 github.com/openshift-online/rosa-hyperfleet-api/clientset v0.0.0 - github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api v0.0.0 github.com/openshift/hypershift/api v0.0.0-20260625052409-9acec4759a16 k8s.io/apimachinery v0.36.0 ) @@ -75,6 +75,6 @@ require ( ) replace ( + github.com/openshift-online/rosa-hyperfleet-api/api => ../api github.com/openshift-online/rosa-hyperfleet-api/clientset => ../clientset - github.com/openshift-online/rosa-hyperfleet-api/hyperfleet-operator/api => ../hyperfleet-operator/api )