Add option to use cloud storage in self-hosted mode (#200)

Signed-off-by: Masudur Rahman <[email protected]>
appscode-cloud · Oct 10, 2023 · dd84710 · dd84710
1 parent c648926
commit dd84710
Show file tree

Hide file tree

Showing 19 changed files with 98 additions and 20 deletions.
diff --git a/apis/installer/v1alpha1/ace_ace_types.go b/apis/installer/v1alpha1/ace_ace_types.go
@@ -302,8 +302,10 @@ const (
 
 type InfraObjstore struct {
 	Provider  ObjstoreProvider `json:"provider"`
-	Host      string           `json:"host"`
 	Bucket    string           `json:"bucket"`
+	Prefix    string           `json:"prefix,omitempty"`
+	Endpoint  string           `json:"endpoint,omitempty"`
+	Region    string           `json:"region,omitempty"`
 	MountPath string           `json:"mountPath"`
 	S3        *S3Auth          `json:"s3,omitempty"`
 	Azure     *AzureAuth       `json:"azure,omitempty"`

diff --git a/apis/installer/v1alpha1/ace_options_types.go b/apis/installer/v1alpha1/ace_options_types.go
@@ -152,8 +152,12 @@ type AceOptionsInfraCloudServices struct {
 }
 
 type AceOptionsInfraObjstore struct {
-	Host   string       `json:"host"`
-	Bucket string       `json:"bucket"`
+	Bucket string `json:"bucket"`
+	Prefix string `json:"prefix,omitempty"`
+	// Required for s3 type buckets other than AWS s3 buckets
+	Endpoint string `json:"endpoint,omitempty"`
+	// Required for s3 buckets
+	Region string       `json:"region,omitempty"`
 	Auth   ObjstoreAuth `json:"auth"`
 }
 

diff --git a/apis/installer/v1alpha1/stash_presets_types.go b/apis/installer/v1alpha1/stash_presets_types.go
@@ -88,7 +88,7 @@ type S3 struct {
 type S3Auth struct {
 	AwsAccessKeyID     string `json:"AWS_ACCESS_KEY_ID"`
 	AwsSecretAccessKey string `json:"AWS_SECRET_ACCESS_KEY"`
-	CaCertData         string `json:"CA_CERT_DATA"`
+	CaCertData         string `json:"CA_CERT_DATA,omitempty"`
 }
 
 type Azure struct {

diff --git a/charts/accounts-ui/templates/deployment.yaml b/charts/accounts-ui/templates/deployment.yaml
@@ -87,6 +87,18 @@ spec:
                   key: AWS_REGION
             {{- end }}
           {{- end }}
+          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "azure") }}
+            - name: AZURE_STORAGE_ACCOUNT
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_NAME
+            - name: AZURE_STORAGE_KEY
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_KEY
+          {{- end }}
           volumeMounts:
             - name: tmp
               mountPath: /tmp

diff --git a/charts/ace/README.md b/charts/ace/README.md
@@ -94,8 +94,7 @@ The following table lists the configurable parameters of the `ace` chart and the
 | global.infra.dns.provider                            |                                                                                                                                                                                                                                                | <code>"cloudflare" # external,cloudflare,route53</code> |
 | global.infra.dns.auth.cloudflare.token               |                                                                                                                                                                                                                                                | <code>xyz</code>                                        |
 | global.infra.objstore.provider                       |                                                                                                                                                                                                                                                | <code>"" # s3,azure,gcs,swift</code>                    |
-| global.infra.objstore.host                           | might be a file storage prefixed with file://                                                                                                                                                                                                  | <code>""</code>                                         |
-| global.infra.objstore.bucket                         |                                                                                                                                                                                                                                                | <code>gs://ace-data</code>                              |
+| global.infra.objstore.bucket                         | might be a file storage prefixed with file://                                                                                                                                                                                                  | <code>gs://ace-data</code>                              |
 | global.infra.objstore.mountPath                      |                                                                                                                                                                                                                                                | <code>/data/credentials</code>                          |
 | global.infra.stash.backup.password                   |                                                                                                                                                                                                                                                | <code>""</code>                                         |
 | global.infra.stash.backup.schedule                   |                                                                                                                                                                                                                                                | <code>'0 */4 * * *'</code>                              |

diff --git a/charts/ace/templates/platform/setup-job.yaml b/charts/ace/templates/platform/setup-job.yaml
@@ -81,6 +81,18 @@ spec:
                   key: AWS_REGION
             {{- end }}
           {{- end }}
+          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "azure") }}
+            - name: AZURE_STORAGE_ACCOUNT
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_NAME
+            - name: AZURE_STORAGE_KEY
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_KEY
+          {{- end }}
           volumeMounts:
             - name: tmp
               mountPath: /tmp

diff --git a/charts/ace/values.openapiv3_schema.yaml b/charts/ace/values.openapiv3_schema.yaml
@@ -3785,6 +3785,8 @@ properties:
                 type: object
               bucket:
                 type: string
+              endpoint:
+                type: string
               gcs:
                 properties:
                   GOOGLE_PROJECT_ID:
@@ -3795,17 +3797,19 @@ properties:
                 - GOOGLE_PROJECT_ID
                 - GOOGLE_SERVICE_ACCOUNT_JSON_KEY
                 type: object
-              host:
-                type: string
               mountPath:
                 type: string
+              prefix:
+                type: string
               provider:
                 enum:
                 - gcs
                 - s3
                 - azure
                 - swift
                 type: string
+              region:
+                type: string
               s3:
                 properties:
                   AWS_ACCESS_KEY_ID:
@@ -3817,7 +3821,6 @@ properties:
                 required:
                 - AWS_ACCESS_KEY_ID
                 - AWS_SECRET_ACCESS_KEY
-                - CA_CERT_DATA
                 type: object
               swift:
                 properties:
@@ -3867,7 +3870,6 @@ properties:
                 type: object
             required:
             - bucket
-            - host
             - mountPath
             - provider
             type: object

diff --git a/charts/ace/values.yaml b/charts/ace/values.yaml
@@ -152,7 +152,6 @@ global:
     objstore:
       provider: "" # s3,azure,gcs,swift
       # might be a file storage prefixed with file://
-      host: ""
       bucket: gs://ace-data
       mountPath: /data/credentials
       # gcs:

diff --git a/charts/billing/templates/processor.yaml b/charts/billing/templates/processor.yaml
@@ -86,6 +86,18 @@ spec:
                   key: AWS_REGION
             {{- end }}
           {{- end }}
+          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "azure") }}
+            - name: AZURE_STORAGE_ACCOUNT
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_NAME
+            - name: AZURE_STORAGE_KEY
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_KEY
+          {{- end }}
           volumeMounts:
             - name: tmp
               mountPath: /tmp

diff --git a/charts/billing/templates/summary.yaml b/charts/billing/templates/summary.yaml
@@ -55,6 +55,18 @@ spec:
                       key: AWS_REGION
                 {{- end }}
               {{- end }}
+              {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "azure") }}
+                - name: AZURE_STORAGE_ACCOUNT
+                  valueFrom:
+                    secretRef:
+                      name: {{ include "settings.objstoreSecretName" . }}
+                      key: AZURE_ACCOUNT_NAME
+                - name: AZURE_STORAGE_KEY
+                  valueFrom:
+                    secretRef:
+                      name: {{ include "settings.objstoreSecretName" . }}
+                      key: AZURE_ACCOUNT_KEY
+              {{- end }}
               volumeMounts:
                 - name: tmp
                   mountPath: /tmp

diff --git a/charts/kubestash-presets/README.md b/charts/kubestash-presets/README.md
@@ -59,7 +59,6 @@ The following table lists the configurable parameters of the `kubestash-presets`
 | kubestash.backend.s3.spec.bucket                           |             | <code>""</code>                         |
 | kubestash.backend.s3.auth.AWS_ACCESS_KEY_ID                |             | <code>""</code>                         |
 | kubestash.backend.s3.auth.AWS_SECRET_ACCESS_KEY            |             | <code>""</code>                         |
-| kubestash.backend.s3.auth.CA_CERT_DATA                     |             | <code>""</code>                         |
 | kubestash.backend.azure.spec.container                     |             | <code>""</code>                         |
 | kubestash.backend.azure.auth.AZURE_ACCOUNT_NAME            |             | <code>""</code>                         |
 | kubestash.backend.azure.auth.AZURE_ACCOUNT_KEY             |             | <code>""</code>                         |

diff --git a/charts/kubestash-presets/values.openapiv3_schema.yaml b/charts/kubestash-presets/values.openapiv3_schema.yaml
@@ -107,7 +107,6 @@ properties:
                 required:
                 - AWS_ACCESS_KEY_ID
                 - AWS_SECRET_ACCESS_KEY
-                - CA_CERT_DATA
                 type: object
               spec:
                 properties:

diff --git a/charts/kubestash-presets/values.yaml b/charts/kubestash-presets/values.yaml
@@ -22,7 +22,7 @@ kubestash:
       auth:
         AWS_ACCESS_KEY_ID: ""
         AWS_SECRET_ACCESS_KEY: ""
-        CA_CERT_DATA: ""
+        # CA_CERT_DATA: ""
     azure:
       spec:
         container: ""

diff --git a/charts/platform-api/templates/statefulset.yaml b/charts/platform-api/templates/statefulset.yaml
@@ -89,6 +89,18 @@ spec:
                   key: AWS_REGION
             {{- end }}
           {{- end }}
+          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "azure") }}
+            - name: AZURE_STORAGE_ACCOUNT
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_NAME
+            - name: AZURE_STORAGE_KEY
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_KEY
+          {{- end }}
           volumeMounts:
             - name: tmp
               mountPath: /tmp

diff --git a/charts/platform-links/templates/deployment.yaml b/charts/platform-links/templates/deployment.yaml
@@ -87,6 +87,18 @@ spec:
                   key: AWS_REGION
             {{- end }}
           {{- end }}
+          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "azure") }}
+            - name: AZURE_STORAGE_ACCOUNT
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_NAME
+            - name: AZURE_STORAGE_KEY
+              valueFrom:
+                secretRef:
+                  name: {{ include "settings.objstoreSecretName" . }}
+                  key: AZURE_ACCOUNT_KEY
+          {{- end }}
           volumeMounts:
             - name: tmp
               mountPath: /tmp

diff --git a/charts/stash-presets/README.md b/charts/stash-presets/README.md
@@ -59,7 +59,6 @@ The following table lists the configurable parameters of the `stash-presets` cha
 | stash.backend.s3.spec.bucket                           |             | <code>""</code>                         |
 | stash.backend.s3.auth.AWS_ACCESS_KEY_ID                |             | <code>""</code>                         |
 | stash.backend.s3.auth.AWS_SECRET_ACCESS_KEY            |             | <code>""</code>                         |
-| stash.backend.s3.auth.CA_CERT_DATA                     |             | <code>""</code>                         |
 | stash.backend.azure.spec.container                     |             | <code>""</code>                         |
 | stash.backend.azure.auth.AZURE_ACCOUNT_NAME            |             | <code>""</code>                         |
 | stash.backend.azure.auth.AZURE_ACCOUNT_KEY             |             | <code>""</code>                         |

diff --git a/charts/stash-presets/values.openapiv3_schema.yaml b/charts/stash-presets/values.openapiv3_schema.yaml
@@ -107,7 +107,6 @@ properties:
                 required:
                 - AWS_ACCESS_KEY_ID
                 - AWS_SECRET_ACCESS_KEY
-                - CA_CERT_DATA
                 type: object
               spec:
                 properties:

diff --git a/charts/stash-presets/values.yaml b/charts/stash-presets/values.yaml
@@ -22,7 +22,7 @@ stash:
       auth:
         AWS_ACCESS_KEY_ID: ""
         AWS_SECRET_ACCESS_KEY: ""
-        CA_CERT_DATA: ""
+        # CA_CERT_DATA: ""
     azure:
       spec:
         container: ""

diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml
@@ -312,7 +312,6 @@ properties:
                     required:
                     - AWS_ACCESS_KEY_ID
                     - AWS_SECRET_ACCESS_KEY
-                    - CA_CERT_DATA
                     type: object
                   swift:
                     properties:
@@ -363,12 +362,17 @@ properties:
                 type: object
               bucket:
                 type: string
-              host:
+              endpoint:
+                description: Required for s3 type buckets other than AWS s3 buckets
+                type: string
+              prefix:
+                type: string
+              region:
+                description: Required for s3 buckets
                 type: string
             required:
             - auth
             - bucket
-            - host
             type: object
           provider:
             enum: