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

monorepo: move imported sidecar to 'sidecar' #92

Merged
merged 1 commit into from
Aug 10, 2024
Merged

monorepo: move imported sidecar to 'sidecar' #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions controller/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ 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
replace (
sigs.k8s.io/container-object-storage-interface-api/client => ../client
sigs.k8s.io/container-object-storage-interface-api/internal => ../internal
)

require (
github.com/spf13/cobra v1.8.1
Expand Down
22 changes: 15 additions & 7 deletions pkg/imported-sidecar/Dockerfile → sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
# NOTE: context is expected to be repo root, not sidecar/ dir

#
# BUILDER
#
FROM docker.io/library/golang:1.22.3 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 proto/ proto/
COPY sidecar/go.mod sidecar/go.mod
COPY sidecar/go.sum sidecar/go.sum

WORKDIR /buildroot/sidecar

RUN go mod download

COPY cmd/ cmd/
COPY pkg/ pkg/
COPY sidecar/cmd/ cmd/
COPY sidecar/pkg/ pkg/

ENV CGO_ENABLED=0

Expand All @@ -29,8 +37,8 @@ LABEL description="COSI Storage Sidecar"

LABEL org.opencontainers.image.title="COSI Storage Sidecar"
LABEL org.opencontainers.image.description="Container Object Storage Interface (COSI) Storage Provisioner Sidecar"
LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-provisioner-sidecar"
LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-provisioner-api/sidecar"
LABEL org.opencontainers.image.licenses="APACHE-2.0"

COPY --from=builder /buildroot/artifacts/objectstorage-sidecar .
COPY --from=builder /buildroot/sidecar/artifacts/objectstorage-sidecar .
ENTRYPOINT ["/objectstorage-sidecar"]
3 changes: 2 additions & 1 deletion pkg/imported-sidecar/Makefile → sidecar/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -22,7 +23,7 @@ IMAGE_TAG ?= cosi-provisioner-sidecar: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
Expand Down
0 pkg/imported-sidecar/cloudbuild.yaml → sidecar/cloudbuild.yaml
View file
Open in desktop
File renamed without changes.
14 changes: 6 additions & 8 deletions ...-sidecar/cmd/objectstorage-sidecar/cmd.go → sidecar/cmd/objectstorage-sidecar/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@ import (
"flag"
"strings"

"sigs.k8s.io/container-object-storage-interface-api/controller"
"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/bucket"
"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/bucketaccess"
"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/provisioner"
cosi "sigs.k8s.io/container-object-storage-interface-spec"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/spf13/viper"

"k8s.io/klog/v2"
"sigs.k8s.io/container-object-storage-interface-api/internal/runtime"
cosi "sigs.k8s.io/container-object-storage-interface-api/proto"
"sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/bucket"
"sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/bucketaccess"
"sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/provisioner"
)

var (
Expand Down Expand Up @@ -90,7 +88,7 @@ func run(ctx context.Context, args []string) error {
}
klog.V(3).InfoS("Successfully connected to driver", "name", info.Name)

ctrl, err := controller.NewDefaultObjectStorageController("cosi", info.Name, 40)
ctrl, err := runtime.NewDefaultObjectStorageController("cosi", info.Name, 40)
if err != nil {
return err
}
Expand Down
0 ...sidecar/cmd/objectstorage-sidecar/main.go → sidecar/cmd/objectstorage-sidecar/main.go
View file
Open in desktop
File renamed without changes.
81 changes: 81 additions & 0 deletions sidecar/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
module sigs.k8s.io/container-object-storage-interface-api/sidecar

go 1.22.5

replace (
sigs.k8s.io/container-object-storage-interface-api/client => ../client
sigs.k8s.io/container-object-storage-interface-api/internal => ../internal
sigs.k8s.io/container-object-storage-interface-api/proto => ../proto
)

require (
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.19.0
google.golang.org/grpc v1.65.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/container-object-storage-interface-api/proto 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.6.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/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/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.25.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/protobuf v1.34.2 // 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
)
Loading