Major refactor and bugfixes

cmd/objectstorage-sidecar/Dockerfile → Dockerfile

@@ -1,5 +1,5 @@
 FROM gcr.io/distroless/static:latest
-LABEL maintainers="Kubernetes Authors"
+LABEL maintainers="Kubernetes COSI Authors"
 LABEL description="Object Storage Sidecar"
 
 COPY ./bin/objectstorage-sidecar objectstorage-sidecar

Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CMDS=objectstorage-sidecar sample-driver
+CMDS=objectstorage-sidecar minio-cosi-driver
 
 all: reltools build
 .PHONY: reltools

cmd/minio-cosi-driver/cmd.go

@@ -0,0 +1,73 @@
+// Copyright 2021 The Kubernetes Authors.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// You may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"context"
+	"flag"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/provisioner"
+	"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/sampledriver"
+
+	"k8s.io/klog/v2"
+)
+
+const provisionerName = "minio.objectstorage.k8s.io"
+
+var (
+	driverAddress = "unix:///var/lib/cosi/cosi.sock"
+)
+
+var cmd = &cobra.Command{
+	Use:           "minio-cosi-driver",
+	Short:         "K8s COSI driver for MinIO object storage",
+	SilenceErrors: true,
+	SilenceUsage:  true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return run(cmd.Context(), args)
+	},
+	DisableFlagsInUseLine: true,
+}
+
+func init() {
+	viper.AutomaticEnv()
+
+	flag.Set("alsologtostderr", "true")
+	kflags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(kflags)
+
+	persistentFlags := cmd.PersistentFlags()
+	persistentFlags.AddGoFlagSet(kflags)
+
+	stringFlag := persistentFlags.StringVarP
+	stringFlag(&driverAddress,
+		"driver-addr",
+		"d",
+		driverAddress,
+		"path to unix domain socket where driver should listen")
+
+	viper.BindPFlags(cmd.PersistentFlags())
+}
+
+func run(ctx context.Context, args []string) error {
+	identityServer, bucketProvisioner := sampledriver.NewDriver(provisionerName)
+	server, err := provisioner.NewDefaultCOSIProvisionerServer(driverAddress, identityServer, bucketProvisioner)
+	if err != nil {
+		return err
+	}
+	return server.Run(ctx)
+}

cmd/minio-cosi-driver/main.go

@@ -0,0 +1,44 @@
+// Copyright 2021 The Kubernetes Authors.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// You may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"k8s.io/klog/v2"
+)
+
+func main() {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+
+	go func() {
+		sig := <-sigs
+		klog.InfoS("Signal received", "type", sig)
+		cancel()
+		<-time.After(30 * time.Second)
+		os.Exit(1)
+	}()
+
+	if err := cmd.ExecuteContext(ctx); err != nil {
+		klog.ErrorS(err, "Exiting on error")
+	}
+}

cmd/objectstorage-sidecar/cmd.go

@@ -0,0 +1,101 @@
+/* Copyright 2021 The Kubernetes Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+	"context"
+	"flag"
+
+	"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"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"k8s.io/klog/v2"
+)
+
+const DefaultProvisionerName = "provisioner.objectstorage.k8s.io"
+
+var (
+	driverAddress   = "unix:///var/lib/cosi/cosi.sock"
+	provisionerName = ""
+	kubeconfig      = ""
+	debug           = false
+)
+
+var cmd = &cobra.Command{
+	Use:           "objectstorage-sidecar",
+	Short:         "provisioner that interacts with cosi drivers to manage buckets and bucketAccesses",
+	SilenceErrors: true,
+	SilenceUsage:  true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return run(cmd.Context(), args)
+	},
+	DisableFlagsInUseLine: true,
+}
+
+func init() {
+	viper.AutomaticEnv()
+
+	flag.Set("alsologtostderr", "true")
+	kflags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(kflags)
+
+	persistentFlags := cmd.PersistentFlags()
+	persistentFlags.AddGoFlagSet(kflags)
+
+	stringFlag := persistentFlags.StringVarP
+	boolFlag := persistentFlags.BoolVarP
+
+	stringFlag(&kubeconfig, "kubeconfig", "", kubeconfig, "path to kubeconfig file")
+	stringFlag(&driverAddress, "driver-addr", "d", driverAddress, "path to unix domain socket where driver is listening")
+	stringFlag(&provisionerName, "provisioner", "p", DefaultProvisionerName, "The name of the provisioner")
+
+	boolFlag(&debug, "debug", "g", debug, "Logs all grpc requests and responses")
+
+	viper.BindPFlags(cmd.PersistentFlags())
+}
+
+func run(ctx context.Context, args []string) error {
+	if provisionerName == "" {
+		provisionerName = DefaultProvisionerName
+	}
+
+	ctrl, err := controller.NewDefaultObjectStorageController("cosi", provisionerName, 40)
+	if err != nil {
+		return err
+	}
+
+	klog.V(3).InfoS("Attempting connection to driver", "address", driverAddress)
+	cosiClient, err := provisioner.NewDefaultCOSIProvisionerClient(ctx, driverAddress, debug)
+	if err != nil {
+		return err
+	}
+	klog.V(3).InfoS("Successfully connected to driver")
+
+	ctrl.AddBucketListener(bucket.NewBucketListener(provisionerName, cosiClient))
+
+	bal, err := bucketaccess.NewBucketAccessListener(provisionerName, cosiClient)
+	if err != nil {
+		return err
+	}
+	ctrl.AddBucketAccessListener(bal)
+
+	return ctrl.Run(ctx)
+}