support for GCS snapshots

upmc-enterprises · May 23, 2018 · f2ff75b · f2ff75b
1 parent d19545d
commit f2ff75b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/pkg/apis/elasticsearchoperator/v1/cluster.go b/pkg/apis/elasticsearchoperator/v1/cluster.go
@@ -133,7 +133,10 @@ type Snapshot struct {
 	// Enabled determines if snapshots are enabled
 	SchedulerEnabled bool `json:"scheduler-enabled"`
 
-	// BucketName defines the AWS S3 bucket to store snapshots
+	// RepoType defines the type of Elasticsearch Repository, s3 or gcs
+	RepoType string `json:"type"`
+
+	// BucketName defines the AWS S3 or GCS bucket to store snapshots
 	BucketName string `json:"bucket-name"`
 
 	// CronSchedule defines how to run the snapshots
@@ -204,7 +207,8 @@ type Cerebro struct {
 
 // Scheduler stores info about how to snapshot the cluster
 type Scheduler struct {
-	S3bucketName string
+	RepoType     string
+	BucketName   string
 	CronSchedule string
 	Enabled      bool
 	Auth         SchedulerAuthentication

diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go
@@ -165,6 +165,7 @@ func (p *Processor) refreshClusters() error {
 					KeepSecretsOnDelete: cluster.Spec.KeepSecretsOnDelete,
 					Snapshot: myspec.Snapshot{
 						SchedulerEnabled: cluster.Spec.Snapshot.SchedulerEnabled,
+						RepoType:         cluster.Spec.Snapshot.RepoType,
 						BucketName:       cluster.Spec.Snapshot.BucketName,
 						CronSchedule:     cluster.Spec.Snapshot.CronSchedule,
 					},
@@ -175,7 +176,8 @@ func (p *Processor) refreshClusters() error {
 						VolumeReclaimPolicy:    cluster.Spec.Storage.VolumeReclaimPolicy,
 					},
 					Scheduler: myspec.Scheduler{
-						S3bucketName: cluster.Spec.Snapshot.BucketName,
+						RepoType:     cluster.Spec.Snapshot.RepoType,
+						BucketName:   cluster.Spec.Snapshot.BucketName,
 						CronSchedule: cluster.Spec.Snapshot.CronSchedule,
 						Enabled:      cluster.Spec.Snapshot.SchedulerEnabled,
 						Auth: myspec.SchedulerAuthentication{
@@ -210,6 +212,7 @@ func (p *Processor) refreshClusters() error {
 				},
 			},
 			Scheduler: snapshot.New(
+				cluster.Spec.Snapshot.RepoType,
 				cluster.Spec.Snapshot.BucketName,
 				cluster.Spec.Snapshot.CronSchedule,
 				cluster.Spec.Snapshot.SchedulerEnabled,

diff --git a/pkg/snapshot/scheduler.go b/pkg/snapshot/scheduler.go
@@ -53,17 +53,22 @@ type Scheduler struct {
 }
 
 // New creates an instance of Scheduler
-func New(bucketName, cronSchedule string, enabled, useSSL bool, userName, password, image,
+func New(repoType, bucketName, cronSchedule string, enabled, useSSL bool, userName, password, image,
 	elasticURL, clusterName, namespace string, kc kubernetes.Interface) *Scheduler {
 
+	if repoType == "" {
+		repoType = "s3"
+	}
+
 	if image == "" {
 		image = defaultCronImage
 	}
 
 	return &Scheduler{
 		Kclient: kc,
 		CRD: enterprisesv1.Scheduler{
-			S3bucketName: bucketName,
+			RepoType:     repoType,
+			BucketName:   bucketName,
 			CronSchedule: cronSchedule,
 			ElasticURL:   elasticURL,
 			Auth: enterprisesv1.SchedulerAuthentication{
@@ -214,7 +219,8 @@ func (s *Scheduler) CreateCronJob(namespace, clusterName, action, cronSchedule s
 										},
 										Args: []string{
 											fmt.Sprintf("--action=%s", action),
-											fmt.Sprintf("--s3-bucket-name=%s", s.CRD.S3bucketName),
+											fmt.Sprintf("--repo-type=%s", s.CRD.RepoType),
+											fmt.Sprintf("--bucket-name=%s", s.CRD.BucketName),
 											fmt.Sprintf("--elastic-url=%s", s.CRD.ElasticURL),
 											fmt.Sprintf("--auth-username=%s", s.CRD.Auth.UserName),
 											fmt.Sprintf("--auth-password=%s", s.CRD.Auth.Password),