Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit fed8fca

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #91 from BlaineEXE/monorepo-controller
monorepo: move imported controller to 'controller'
2 parents e38b4a8 + cc672f4 commit fed8fca

File tree

15 files changed

+364
-57
lines changed

15 files changed

+364
-57
lines changed

Diff for: ‎pkg/imported-controller/Dockerfile renamed to ‎controller/Dockerfile

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
1+
# NOTE: context is expected to be repo root, not controller/ dir
2+
13
#
24
# BUILDER
35
#
4-
FROM docker.io/library/golang:1.22.2 AS builder
6+
FROM docker.io/library/golang:1.22.5 AS builder
57

68
WORKDIR /buildroot
79

810
# Cache deps before building and copying source, so that we don't need to re-download
911
# as much and so that source changes don't invalidate our downloaded layer.
10-
COPY go.mod go.mod
11-
COPY go.sum go.sum
12+
COPY client/ client/
13+
COPY internal/ internal/
14+
COPY controller/go.mod controller/go.mod
15+
COPY controller/go.sum controller/go.sum
16+
17+
WORKDIR /buildroot/controller
18+
1219
RUN go mod download
1320

14-
COPY cmd/ cmd/
15-
COPY pkg/ pkg/
21+
COPY controller/cmd/ cmd/
22+
COPY controller/pkg/ pkg/
1623

1724
ENV CGO_ENABLED=0
1825

@@ -29,8 +36,8 @@ LABEL description="COSI Controller"
2936

3037
LABEL org.opencontainers.image.title="COSI Controller"
3138
LABEL org.opencontainers.image.description="Container Object Storage Interface (COSI) Controller"
32-
LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-controller"
39+
LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-api/controller"
3340
LABEL org.opencontainers.image.licenses="APACHE-2.0"
3441

35-
COPY --from=builder /buildroot/artifacts/controller-manager .
42+
COPY --from=builder /buildroot/controller/artifacts/controller-manager .
3643
ENTRYPOINT ["/controller-manager"]

Diff for: ‎pkg/imported-controller/Makefile renamed to ‎controller/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DEFAULT_GOAL := help
22
SHELL = /usr/bin/env bash
3+
THIS_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
34

45
# 'go env' vars aren't always available in make environments, so get defaults for needed ones
56
GOARCH ?= $(shell go env GOARCH)
@@ -22,7 +23,7 @@ IMAGE_TAG ?= cosi-controller:latest
2223
.PHONY: build
2324
## Build local image for development, defaulting linux/<hostarch>
2425
build:
25-
$(DOCKER) build --platform $(PLATFORM) --tag $(IMAGE_TAG) .
26+
cd .. && $(DOCKER) build --file $(THIS_DIR)/Dockerfile --platform $(PLATFORM) --tag $(IMAGE_TAG) .
2627

2728
.PHONY: test
2829
## Test packages

Diff for: ‎pkg/imported-controller/cloudbuild.yaml renamed to ‎controller/cloudbuild.yaml

File renamed without changes.

Diff for: ‎pkg/imported-controller/cmd/controller-manager/controller-manager.go renamed to ‎controller/cmd/controller-manager/controller-manager.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ import (
99

1010
"github.com/spf13/cobra"
1111
"github.com/spf13/viper"
12-
13-
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
14-
"sigs.k8s.io/container-object-storage-interface-controller/pkg/bucketclaim"
15-
1612
"k8s.io/klog/v2"
13+
"sigs.k8s.io/container-object-storage-interface-api/controller/pkg/bucketclaim"
14+
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/internal/runtime"
1715
)
1816

1917
var cmd = &cobra.Command{

Diff for: ‎controller/go.mod

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
module sigs.k8s.io/container-object-storage-interface-api/controller
2+
3+
go 1.22.5
4+
5+
replace sigs.k8s.io/container-object-storage-interface-api/client => ../client
6+
7+
replace sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned => ../client/versioned
8+
9+
replace sigs.k8s.io/container-object-storage-interface-api/internal => ../internal
10+
11+
require (
12+
github.com/spf13/cobra v1.8.1
13+
github.com/spf13/viper v1.19.0
14+
k8s.io/api v0.30.3
15+
k8s.io/apimachinery v0.30.3
16+
k8s.io/client-go v0.30.3
17+
k8s.io/klog/v2 v2.130.1
18+
sigs.k8s.io/container-object-storage-interface-api/client v0.0.0-00010101000000-000000000000
19+
sigs.k8s.io/container-object-storage-interface-api/internal v0.0.0-00010101000000-000000000000
20+
sigs.k8s.io/controller-runtime v0.18.4
21+
)
22+
23+
require (
24+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
25+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
27+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
28+
github.com/fsnotify/fsnotify v1.7.0 // indirect
29+
github.com/go-logr/logr v1.4.1 // indirect
30+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
31+
github.com/go-openapi/jsonreference v0.20.2 // indirect
32+
github.com/go-openapi/swag v0.22.3 // indirect
33+
github.com/gogo/protobuf v1.3.2 // indirect
34+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35+
github.com/golang/protobuf v1.5.4 // indirect
36+
github.com/google/gnostic-models v0.6.8 // indirect
37+
github.com/google/go-cmp v0.6.0 // indirect
38+
github.com/google/gofuzz v1.2.0 // indirect
39+
github.com/google/uuid v1.4.0 // indirect
40+
github.com/hashicorp/hcl v1.0.0 // indirect
41+
github.com/imdario/mergo v0.3.6 // indirect
42+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
43+
github.com/josharian/intern v1.0.0 // indirect
44+
github.com/json-iterator/go v1.1.12 // indirect
45+
github.com/magiconair/properties v1.8.7 // indirect
46+
github.com/mailru/easyjson v0.7.7 // indirect
47+
github.com/mitchellh/mapstructure v1.5.0 // indirect
48+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
49+
github.com/modern-go/reflect2 v1.0.2 // indirect
50+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
52+
github.com/pkg/errors v0.9.1 // indirect
53+
github.com/sagikazarmark/locafero v0.4.0 // indirect
54+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
55+
github.com/sourcegraph/conc v0.3.0 // indirect
56+
github.com/spf13/afero v1.11.0 // indirect
57+
github.com/spf13/cast v1.6.0 // indirect
58+
github.com/spf13/pflag v1.0.5 // indirect
59+
github.com/subosito/gotenv v1.6.0 // indirect
60+
go.uber.org/multierr v1.11.0 // indirect
61+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
62+
golang.org/x/net v0.24.0 // indirect
63+
golang.org/x/oauth2 v0.18.0 // indirect
64+
golang.org/x/sys v0.19.0 // indirect
65+
golang.org/x/term v0.19.0 // indirect
66+
golang.org/x/text v0.14.0 // indirect
67+
golang.org/x/time v0.5.0 // indirect
68+
google.golang.org/appengine v1.6.8 // indirect
69+
google.golang.org/protobuf v1.33.0 // indirect
70+
gopkg.in/inf.v0 v0.9.1 // indirect
71+
gopkg.in/ini.v1 v1.67.0 // indirect
72+
gopkg.in/yaml.v2 v2.4.0 // indirect
73+
gopkg.in/yaml.v3 v3.0.1 // indirect
74+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
75+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
76+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
77+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
78+
sigs.k8s.io/yaml v1.4.0 // indirect
79+
)

0 commit comments

Comments
 (0)