monorepo: move imported controller to 'controller'

pkg/imported-controller/Dockerfile → controller/Dockerfile

@@ -1,18 +1,25 @@
+# NOTE: context is expected to be repo root, not controller/ dir
+
 #
 # BUILDER
 #
-FROM docker.io/library/golang:1.22.2 AS builder
+FROM docker.io/library/golang:1.22.5 AS builder
 
 WORKDIR /buildroot
 
 # Cache deps before building and copying source, so that we don't need to re-download
 # as much and so that source changes don't invalidate our downloaded layer.
-COPY go.mod go.mod
-COPY go.sum go.sum
+COPY client/ client/
+COPY internal/ internal/
+COPY controller/go.mod controller/go.mod
+COPY controller/go.sum controller/go.sum
+
+WORKDIR /buildroot/controller
+
 RUN go mod download
 
-COPY cmd/ cmd/
-COPY pkg/ pkg/
+COPY controller/cmd/ cmd/
+COPY controller/pkg/ pkg/
 
 ENV CGO_ENABLED=0
 
@@ -29,8 +36,8 @@ LABEL description="COSI Controller"
 
 LABEL org.opencontainers.image.title="COSI Controller"
 LABEL org.opencontainers.image.description="Container Object Storage Interface (COSI) Controller"
-LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-controller"
+LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-api/controller"
 LABEL org.opencontainers.image.licenses="APACHE-2.0"
 
-COPY --from=builder /buildroot/artifacts/controller-manager .
+COPY --from=builder /buildroot/controller/artifacts/controller-manager .
 ENTRYPOINT ["/controller-manager"]

pkg/imported-controller/Makefile → controller/Makefile

@@ -1,5 +1,6 @@
 .DEFAULT_GOAL := help
 SHELL = /usr/bin/env bash
+THIS_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
 # 'go env' vars aren't always available in make environments, so get defaults for needed ones
 GOARCH ?= $(shell go env GOARCH)
@@ -22,7 +23,7 @@ IMAGE_TAG ?= cosi-controller:latest
 .PHONY: build
 ## Build local image for development, defaulting linux/<hostarch>
 build:
-	$(DOCKER) build --platform $(PLATFORM) --tag $(IMAGE_TAG) .
+	cd .. && $(DOCKER) build --file $(THIS_DIR)/Dockerfile --platform $(PLATFORM) --tag $(IMAGE_TAG) .
 
 .PHONY: test
 ## Test packages

pkg/imported-controller/cmd/controller-manager/controller-manager.go → controller/cmd/controller-manager/controller-manager.go

@@ -9,11 +9,9 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-
-	bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
-	"sigs.k8s.io/container-object-storage-interface-controller/pkg/bucketclaim"
-
 	"k8s.io/klog/v2"
+	"sigs.k8s.io/container-object-storage-interface-api/controller/pkg/bucketclaim"
+	bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/internal/runtime"
 )
 
 var cmd = &cobra.Command{

controller/go.mod

@@ -0,0 +1,79 @@
+module sigs.k8s.io/container-object-storage-interface-api/controller
+
+go 1.22.5
+
+replace sigs.k8s.io/container-object-storage-interface-api/client => ../client
+
+replace sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned => ../client/versioned
+
+replace sigs.k8s.io/container-object-storage-interface-api/internal => ../internal
+
+require (
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/viper v1.19.0
+	k8s.io/api v0.30.3
+	k8s.io/apimachinery v0.30.3
+	k8s.io/client-go v0.30.3
+	k8s.io/klog/v2 v2.130.1
+	sigs.k8s.io/container-object-storage-interface-api/client v0.0.0-00010101000000-000000000000
+	sigs.k8s.io/container-object-storage-interface-api/internal v0.0.0-00010101000000-000000000000
+	sigs.k8s.io/controller-runtime v0.18.4
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.4.1 // 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/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.4 // 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/uuid v1.4.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // 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/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
+)