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(annotator): add Prometheus basic auth and bearer token authentication #56

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

feat(annotator): add Prometheus basic auth and bearer token authentication #56

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
6 changes: 5 additions & 1 deletion cmd/controller/app/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ func (o *Options) Flags(flag *pflag.FlagSet) error {

flag.StringVar(&o.PolicyConfigPath, "policy-config-path", o.PolicyConfigPath, "Path to annotator policy config")
flag.StringVar(&o.PrometheusAddr, "prometheus-address", o.PrometheusAddr, "The address of prometheus, from which we can pull metrics data.")
flag.StringVar(&o.PrometheusUser, "prometheus-user", o.PrometheusUser, "The username of prometheus.")
flag.StringVar(&o.PrometheusPassword, "prometheus-password", o.PrometheusPassword, "The password of prometheus.")
flag.StringVar(&o.PrometheusBearer, "prometheus-bearer", "Bearer", "The custom bearer auth header of prometheus.")
flag.StringVar(&o.PrometheusBearerToken, "prometheus-bearer-token", o.PrometheusBearerToken, "The bearer auth token of prometheus.")
flag.Int32Var(&o.BindingHeapSize, "binding-heap-size", o.BindingHeapSize, "Max size of binding heap size, used to store hot value data.")
flag.Int32Var(&o.ConcurrentSyncs, "concurrent-syncs", o.ConcurrentSyncs, "The number of annotator controller workers that are allowed to sync concurrently.")
flag.StringVar(&o.kubeconfig, "kubeconfig", o.kubeconfig, "Path to kubeconfig file with authorization information")
Expand Down Expand Up @@ -123,7 +127,7 @@ func (o *Options) Config() (*controllerappconfig.Config, error) {

c.LeaderElectionClient = clientset.NewForConfigOrDie(rest.AddUserAgent(kubeconfig, "leader-election"))

c.PromClient, err = prometheus.NewPromClient(o.PrometheusAddr)
c.PromClient, err = prometheus.NewPromClient(&o.PrometheusConfig)
if err != nil {
return nil, err
}
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@ require (
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // 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/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/onsi/gomega v1.18.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/runc v1.0.2 // indirect
Expand Down
13 changes: 13 additions & 0 deletions pkg/controller/annotator/config/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,26 @@ package config

// AnnotatorConfiguration holds configuration for a node annotator.
type AnnotatorConfiguration struct {
PrometheusConfig
// BindingHeapSize limits the size of Binding Heap, which stores the lastest
// pod scheduled imformation.
BindingHeapSize int32
// ConcurrentSyncs specified the number of annotator controller workers.
ConcurrentSyncs int32
// PolicyConfigPath specified the path of Scheduler Policy File.
PolicyConfigPath string
}

// PrometheusConfig holds configuration for a prometheus client.
type PrometheusConfig struct {
// PrometheusAddr is the address of Prometheus Service.
PrometheusAddr string
// PrometheusUser is the basic auth username of Prometheus Service.
PrometheusUser string
// PrometheusPassword is the basic auth password of Prometheus Service.
PrometheusPassword string
// PrometheusBearer is the custom bearer auth header of Prometheus Service.
PrometheusBearer string
// PrometheusBearerToken is the bearer auth token of Prometheus Service.
PrometheusBearerToken string
}
13 changes: 11 additions & 2 deletions pkg/controller/prometheus/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import (
"strconv"
"time"

annotatorconfig "github.com/gocrane/crane-scheduler/pkg/controller/annotator/config"
"github.com/prometheus/client_golang/api"
v1 "github.com/prometheus/client_golang/api/prometheus/v1"
pconfig "github.com/prometheus/common/config"
"github.com/prometheus/common/model"
"k8s.io/klog/v2"
)
Expand All @@ -32,9 +34,16 @@ type promClient struct {
}

// NewPromClient returns PromClient interface.
func NewPromClient(addr string) (PromClient, error) {
func NewPromClient(promconfig *annotatorconfig.PrometheusConfig) (PromClient, error) {
config := api.Config{
Address: addr,
Address: promconfig.PrometheusAddr,
}
if promconfig.PrometheusUser != "" && promconfig.PrometheusPassword != "" {
config.RoundTripper = pconfig.NewBasicAuthRoundTripper(promconfig.PrometheusUser,
pconfig.Secret(promconfig.PrometheusPassword), "", api.DefaultRoundTripper)
} else if promconfig.PrometheusBearerToken != "" {
config.RoundTripper = pconfig.NewAuthorizationCredentialsRoundTripper(promconfig.PrometheusBearer,
pconfig.Secret(promconfig.PrometheusBearerToken), api.DefaultRoundTripper)
}

client, err := api.NewClient(config)
Expand Down
Loading