Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: dynamic API client configuration #82

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: dynamic API client configuration #82

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
28 changes: 26 additions & 2 deletions cmd/linode-cosi-driver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ import (
"syscall"
"time"

"github.com/go-logr/logr"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
"github.com/linode/linode-cosi-driver/pkg/endpoint"
"github.com/linode/linode-cosi-driver/pkg/envflag"
"github.com/linode/linode-cosi-driver/pkg/grpc/handlers"
grpclogger "github.com/linode/linode-cosi-driver/pkg/grpc/logger"
"github.com/linode/linode-cosi-driver/pkg/kubereader/tracedkubereader"
"github.com/linode/linode-cosi-driver/pkg/linodeclient"
"github.com/linode/linode-cosi-driver/pkg/linodeclient/tracedclient"
maxprocslogger "github.com/linode/linode-cosi-driver/pkg/maxprocs/logger"
Expand All @@ -47,7 +49,11 @@ import (
semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
"go.uber.org/automaxprocs/maxprocs"
"google.golang.org/grpc"
v1 "k8s.io/api/core/v1"
cosi "sigs.k8s.io/container-object-storage-interface-spec"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/config"
ctrlLog "sigs.k8s.io/controller-runtime/pkg/log"
)

const (
Expand All @@ -67,12 +73,26 @@ func main() {

// TODO: any logger settup must be done here, before first log call.
log := slog.Default()
ctrlLog.SetLogger(logr.FromSlogHandler(log.Handler()))

kubeclient, err := client.New(config.GetConfigOrDie(), client.Options{
Cache: &client.CacheOptions{
DisableFor: []client.Object{
&v1.Secret{},
},
},
})
if err != nil {
slog.Error("initializing kube client failed", "error", err)
os.Exit(1)
}

if err := run(context.Background(), log, mainOptions{
cosiEndpoint: cosiEndpoint,
linodeToken: linodeToken,
linodeURL: linodeURL,
linodeAPIVersion: linodeAPIVersion,
kubeclient: kubeclient,
},
); err != nil {
slog.Error("critical failure", "error", err)
Expand All @@ -85,6 +105,7 @@ type mainOptions struct {
linodeToken string
linodeURL string
linodeAPIVersion string
kubeclient client.Client
}

func run(ctx context.Context, log *slog.Logger, opts mainOptions) error {
Expand Down Expand Up @@ -112,7 +133,7 @@ func run(ctx context.Context, log *slog.Logger, opts mainOptions) error {
// initialize Linode client
client, err := linodeclient.NewLinodeClient(
opts.linodeToken,
fmt.Sprintf("LinodeCOSI/%s", version.Version),
version.UserAgent(),
opts.linodeURL,
opts.linodeAPIVersion)
if err != nil {
Expand All @@ -121,10 +142,13 @@ func run(ctx context.Context, log *slog.Logger, opts mainOptions) error {

client.SetLogger(restylogger.Wrap(log))

podName := os.Getenv(envK8sPodName)

// create provisioner server
prvSrv, err := provisioner.New(
log,
tracedclient.NewClientWithTracing(client, os.Getenv(envK8sPodName)),
tracedclient.NewClientWithTracing(client, podName),
tracedkubereader.NewKubeReaderWithTracing(opts.kubeclient, podName),
)
if err != nil {
return fmt.Errorf("failed to create provisioner server: %w", err)
Expand Down
39 changes: 36 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
module github.com/linode/linode-cosi-driver

go 1.22
go 1.22.0

toolchain go1.22.3
toolchain go1.22.5

require (
github.com/go-logr/logr v1.4.2
github.com/go-resty/resty/v2 v2.13.1
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
github.com/linode/linodego v1.37.0
Expand All @@ -17,23 +18,42 @@ require (
go.opentelemetry.io/otel/trace v1.28.0
go.uber.org/automaxprocs v1.5.3
google.golang.org/grpc v1.65.0
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
sigs.k8s.io/container-object-storage-interface-spec v0.1.0
sigs.k8s.io/controller-runtime v0.18.4
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/go-logr/stdr v1.2.2 // 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/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // 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/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/contrib/bridges/prometheus v0.53.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
Expand All @@ -49,10 +69,23 @@ require (
go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // 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/client-go v0.30.3 // indirect
k8s.io/klog/v2 v2.120.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.3.0 // indirect
)
Loading
Loading