backup cred related changes

apis/kubedb/constants.go

@@ -998,6 +998,7 @@ const (
 	SolrInitContainerName = "init-solr"
 	SolrAdmin             = "admin"
 	SecurityJSON          = "security.json"
+	GcsCredJSON           = "cred.json"
 	SolrZkDigest          = "zk-digest"
 	SolrZkReadonlyDigest  = "zk-digest-readonly"
 
@@ -1006,6 +1007,7 @@ const (
 	SolrVolumeAuthConfig    = "auth-config"
 	SolrVolumeData          = "data"
 	SolrVolumeConfig        = "slconfig"
+	SolrVolumeGcsCred       = "gcs-cred"
 
 	DistLibs              = "/opt/solr/dist"
 	ContribLibs           = "/opt/solr/contrib/%s/lib"
@@ -1064,6 +1066,7 @@ const (
 	SolrServerKeystorePath         = "/var/solr/etc/keystore.p12"
 	SolrServerTruststorePath       = "/var/solr/etc/truststore.p12"
 	SolrTLSMountPath               = "/var/solr/etc"
+	SolrGcsCredMountPath           = "/var/solr/backup"
 
 	ProxyDeploymentName = "s3proxy"
 	ProxyServiceName    = "proxy-svc"

apis/kubedb/v1alpha2/solr_helpers.go

@@ -109,17 +109,23 @@ func (s *Solr) SolrSecretKey() string {
 	return kubedb.SolrSecretKey
 }
 
-func (s *Solr) Merge(opt map[string]string) map[string]string {
-	if len(s.Spec.SolrOpts) == 0 {
-		return opt
-	}
+func (s *Solr) Merge(opt map[string]string, secret *v1.Secret) map[string]string {
 	for _, y := range s.Spec.SolrOpts {
 		sr := strings.Split(y, "=")
 		_, ok := opt[sr[0]]
 		if !ok || sr[0] != "-Dsolr.node.roles" {
 			opt[sr[0]] = sr[1]
 		}
 	}
+	if secret != nil {
+		if val, exist := secret.Data["AWS_ACCESS_KEY_ID"]; exist {
+			opt["-Daws.accessKeyId"] = string(val)
+		}
+
+		if val, exist := secret.Data["AWS_SECRET_ACCESS_KEY"]; exist {
+			opt["-Daws.secretAccessKey"] = string(val)
+		}
+	}
 	return opt
 }
 

apis/kubedb/v1alpha2/solr_types.go

@@ -137,6 +137,14 @@ type SolrSpec struct {
 	// Monitor is used monitor database instance
 	// +optional
 	Monitor *mona.AgentSpec `json:"monitor,omitempty"`
+
+	// GCS cred for solr backup
+	// +optional
+	GcsCredSecret *core.LocalObjectReference `json:"gcsCredSecret,omitempty"`
+
+	// S3 cred for solr backup
+	// +optional
+	S3CredSecret *core.LocalObjectReference `json:"s3CredSecret,omitempty"`
 }
 
 type SolrClusterTopology struct {

crds/gitops.kubedb.com_solrs.yaml

@@ -76,6 +76,13 @@ spec:
                 type: boolean
               enableSSL:
                 type: boolean
+              gcsCredSecret:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               healthChecker:
                 default:
                   failureThreshold: 3
@@ -3401,6 +3408,13 @@ spec:
               replicas:
                 format: int32
                 type: integer
+              s3CredSecret:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               serviceTemplates:
                 items:
                   properties:

crds/kubedb.com_solrs.yaml

@@ -101,6 +101,13 @@ spec:
                 type: boolean
               enableSSL:
                 type: boolean
+              gcsCredSecret:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               healthChecker:
                 default:
                   failureThreshold: 3
@@ -3426,6 +3433,13 @@ spec:
               replicas:
                 format: int32
                 type: integer
+              s3CredSecret:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               serviceTemplates:
                 items:
                   properties: