From 60298d9e200d2be541b0279e35baf325e0b72e2e Mon Sep 17 00:00:00 2001 From: runzexia Date: Thu, 12 Sep 2019 10:46:19 +0800 Subject: [PATCH 1/3] update devops flags default value Signed-off-by: runzexia --- cmd/ks-apiserver/app/server.go | 1 - pkg/simple/client/s2is3/options.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go index 2108d36b0..41a2dcdb1 100644 --- a/cmd/ks-apiserver/app/server.go +++ b/cmd/ks-apiserver/app/server.go @@ -189,7 +189,6 @@ func CreateClientSet(conf *apiserverconfig.Config, stopCh <-chan struct{}) error SetPrometheusOptions(conf.MonitoringOptions). SetRedisOptions(conf.RedisOptions) - client.NewClientSetFactory(csop, stopCh) return nil diff --git a/pkg/simple/client/s2is3/options.go b/pkg/simple/client/s2is3/options.go index 7e0551b79..247fe84fb 100644 --- a/pkg/simple/client/s2is3/options.go +++ b/pkg/simple/client/s2is3/options.go @@ -44,7 +44,7 @@ func (s *S3Options) AddFlags(fs *pflag.FlagSet) { "Endpoint to access to s3 object storage service, if left blank, the following options "+ "will be ignored.") - fs.StringVar(&s.Region, "s3-region", s.Region, ""+ + fs.StringVar(&s.Region, "s3-region", "us-east-1", ""+ "Region of s3 that will access to, like us-east-1.") fs.StringVar(&s.AccessKeyID, "s3-access-key-id", "AKIAIOSFODNN7EXAMPLE", "access key of s2i s3") @@ -55,7 +55,7 @@ func (s *S3Options) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.Bucket, "s3-bucket", "s2i-binaries", "bucket name of s2i s3") - fs.BoolVar(&s.DisableSSL, "s3-disable-SSL", s.DisableSSL, "disable ssl") + fs.BoolVar(&s.DisableSSL, "s3-disable-SSL", false, "disable ssl") fs.BoolVar(&s.ForcePathStyle, "s3-force-path-style", true, "force path style") } From 8d2d8f64a022137d48d7247099c48a3945d3613a Mon Sep 17 00:00:00 2001 From: runzexia Date: Thu, 12 Sep 2019 11:09:17 +0800 Subject: [PATCH 2/3] fix comment Signed-off-by: runzexia --- pkg/simple/client/s2is3/options.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/simple/client/s2is3/options.go b/pkg/simple/client/s2is3/options.go index 247fe84fb..a886f1875 100644 --- a/pkg/simple/client/s2is3/options.go +++ b/pkg/simple/client/s2is3/options.go @@ -18,14 +18,14 @@ type S3Options struct { func NewS3Options() *S3Options { return &S3Options{ - Endpoint: "", - Region: "", + Endpoint: "http://openpitrix-minio.openpitrix-system.svc:9000", + Region: "us-east-1", DisableSSL: true, ForcePathStyle: true, - AccessKeyID: "", - SecretAccessKey: "", + AccessKeyID: "AKIAIOSFODNN7EXAMPLE", + SecretAccessKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY", SessionToken: "", - Bucket: "", + Bucket: "s2i-binaries", } } @@ -55,7 +55,7 @@ func (s *S3Options) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.Bucket, "s3-bucket", "s2i-binaries", "bucket name of s2i s3") - fs.BoolVar(&s.DisableSSL, "s3-disable-SSL", false, "disable ssl") + fs.BoolVar(&s.DisableSSL, "s3-disable-SSL", true, "disable ssl") fs.BoolVar(&s.ForcePathStyle, "s3-force-path-style", true, "force path style") } From 85a0586529db3f7075b4bbec14e22742f81a7df3 Mon Sep 17 00:00:00 2001 From: runzexia Date: Thu, 12 Sep 2019 11:25:58 +0800 Subject: [PATCH 3/3] fix comment Signed-off-by: runzexia --- pkg/simple/client/s2is3/options.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/simple/client/s2is3/options.go b/pkg/simple/client/s2is3/options.go index a886f1875..d4bd1154d 100644 --- a/pkg/simple/client/s2is3/options.go +++ b/pkg/simple/client/s2is3/options.go @@ -18,7 +18,7 @@ type S3Options struct { func NewS3Options() *S3Options { return &S3Options{ - Endpoint: "http://openpitrix-minio.openpitrix-system.svc:9000", + Endpoint: "", Region: "us-east-1", DisableSSL: true, ForcePathStyle: true,