s3insecure flag

Signed-off-by: Thor <[email protected]>

Author: Thor

pkg/cortex/modules.go

@@ -201,6 +201,7 @@ func (t *Cortex) initQuerier(cfg *Config) (err error) {
 			Endpoint:  cfg.Ingester.V2.S3Endpoint,
 			AccessKey: cfg.Ingester.V2.S3Key,
 			SecretKey: cfg.Ingester.V2.S3Secret,
+			Insecure:  cfg.Ingester.V2.S3Insecure,
 		}
 		store, err = querier.NewBlockQuerier(s3cfg, prometheus.DefaultRegisterer)
 		if err != nil {

pkg/ingester/ingester.go

@@ -151,6 +151,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 	f.StringVar(&cfg.V2.S3Secret, "ingester.v2.secret", "", "s3 secret")
 	f.StringVar(&cfg.V2.S3Bucket, "ingester.v2.bucket", "", "s3 bucket")
 	f.StringVar(&cfg.V2.S3Endpoint, "ingester.v2.endpoint", "", "s3 endpoint")
+	f.BoolVar(&cfg.V2.S3Insecure, "ingester.v2.s3insecure", false, "use http for s3 endpoints")
 	f.DurationVar(&cfg.V2.ShipInterval, "ingester.v2.shipinterval", 30*time.Second, "the frequency at which tsdb blocks are scanned for shipping")
 }
 

pkg/ingester/ingester_v2.go

@@ -37,6 +37,7 @@ type V2Config struct {
 	S3Bucket     string
 	S3Secret     string
 	S3Key        string
+	S3Insecure   bool // useful for test clusters without https
 }
 
 // NewV2 returns a new Ingester that uses prometheus block storage instead of chunk storage
@@ -48,6 +49,7 @@ func NewV2(cfg Config, clientConfig client.Config, limits *validation.Overrides,
 		Endpoint:  cfg.V2.S3Endpoint,
 		AccessKey: cfg.V2.S3Key,
 		SecretKey: cfg.V2.S3Secret,
+		Insecure:  cfg.V2.S3Insecure,
 	}
 	var err error
 	bkt, err = s3.NewBucketWithConfig(util.Logger, s3Cfg, "cortex")