Skip to content

Commit

Permalink
Remove host field from cloud storage (#228)
Browse files Browse the repository at this point in the history 
Signed-off-by: Masudur Rahman <[email protected]>
  • Loading branch information
@masudur-rahman
masudur-rahman authored Oct 11, 2023
1 parent dd84710 commit e238ddd
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 20 deletions.
2 changes: 0 additions & 2 deletions apis/installer/v1alpha1/ace_ace_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ type InfraKms struct {
}

type InfraKubepack struct {
Host string `json:"host"`
Bucket string `json:"bucket"`
Prefix string `json:"prefix"`
}
Expand Down Expand Up @@ -461,7 +460,6 @@ type GrafanaSettings struct {
type ClusterConnectorSpec struct {
ImageReference `json:",inline,omitempty"`

Host string `json:"host"`
Bucket string `json:"bucket"`
Prefix string `json:"prefix"`
}
Expand Down
6 changes: 2 additions & 4 deletions charts/ace/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,12 @@ The following table lists the configurable parameters of the `ace` chart and the
| global.infra.stash.backup.password | | <code>""</code> |
| global.infra.stash.backup.schedule | | <code>'0 */4 * * *'</code> |
| global.infra.kms.masterKeyURL | location where the secret key resides | <code>""</code> |
| global.infra.kubepack.host | | <code>""</code> |
| global.infra.kubepack.bucket | | <code>""</code> |
| global.infra.kubepack.prefix | | <code>""</code> |
| global.infra.badger.mountPath | | <code>/badger</code> |
| global.infra.badger.levels | | <code>7</code> |
| global.infra.invoice.mountPath | | <code>/billing</code> |
| global.infra.invoice.bucket | host: https://console.cloud.google.com/storage/browser/invoice-storage-demo | <code>gs://invoice-storage-demo</code> |
| global.infra.invoice.bucket | | <code>gs://invoice-storage-demo</code> |
| global.infra.invoice.prefix | | <code>""</code> |
| global.infra.invoice.trackerEmail | | <code>[email protected]</code> |
| settings.db.version | | <code>"13.2"</code> |
Expand Down Expand Up @@ -177,8 +176,7 @@ The following table lists the configurable parameters of the `ace` chart and the
| settings.clusterConnector.repository | | <code>""</code> |
| settings.clusterConnector.tag | | <code>""</code> |
| settings.clusterConnector.pullPolicy | | <code>Always</code> |
| settings.clusterConnector.host | bucket to store cluster-connector yamls | <code>""</code> |
| settings.clusterConnector.bucket | | <code>""</code> |
| settings.clusterConnector.bucket | bucket to store cluster-connector yamls | <code>""</code> |
| settings.clusterConnector.prefix | | <code>""</code> |
| settings.contract.bucket | | <code>""</code> |
| settings.contract.prefix | | <code>""</code> |
Expand Down
9 changes: 4 additions & 5 deletions charts/ace/templates/platform/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ stringData:
AVATAR_UPLOAD_PATH = avatars

[storage]
HOST = {{ .Values.global.infra.objstore.host }}
BUCKET_URL = {{ .Values.global.infra.objstore.bucket }}
BUCKET_URL = {{ .Values.global.infra.objstore.bucket }}
BUCKET_ENDPOINT = {{ .Values.global.infra.objstore.endpoint }}
BUCKET_REGION = {{ .Values.global.infra.objstore.region }}
BUCKET_PREFIX = {{ .Values.global.infra.objstore.prefix }}

[database]
DB_TYPE = "postgres"
Expand Down Expand Up @@ -159,15 +161,13 @@ stringData:

[invoice]
PATH = {{ .Values.global.infra.invoice.mountPath }}
HOST = {{ .Values.global.infra.invoice.host }}
BUCKET = {{ .Values.global.infra.invoice.bucket }}
PREFIX = {{ .Values.global.infra.invoice.prefix }}
TRACKER_EMAIL = {{ .Values.global.infra.invoice.trackerEmail }}
{{- end }}

{{- if eq .Values.global.platform.deploymentType "Hosted" }}
[yaml_storage]
HOST = {{ .Values.global.infra.kubepack.host }}
BUCKET = {{ .Values.global.infra.kubepack.bucket }}
PREFIX = {{ .Values.global.infra.kubepack.prefix }}
{{- end }}
Expand All @@ -182,7 +182,6 @@ stringData:
{{- end }}

{{- if eq .Values.global.platform.deploymentType "Hosted" }}
HOST = {{ .Values.settings.clusterConnector.host }}
BUCKET = {{ .Values.settings.clusterConnector.bucket }}
PREFIX = {{ .Values.settings.clusterConnector.prefix }}

Expand Down
6 changes: 0 additions & 6 deletions charts/ace/values.openapiv3_schema.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3762,13 +3762,10 @@ properties:
properties:
bucket:
type: string
host:
type: string
prefix:
type: string
required:
- bucket
- host
- prefix
type: object
objstore:
Expand Down Expand Up @@ -13958,8 +13955,6 @@ properties:
properties:
bucket:
type: string
host:
type: string
prefix:
type: string
pullPolicy:
Expand All @@ -13972,7 +13967,6 @@ properties:
type: string
required:
- bucket
- host
- prefix
- pullPolicy
- registry
Expand Down
3 changes: 0 additions & 3 deletions charts/ace/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,13 @@ global:
# provider: "Google"
# masterKeyURL: gcpkms://projects/
kubepack:
host: ""
bucket: ""
prefix: ""
badger:
mountPath: /badger
levels: 7
invoice:
mountPath: /billing
# host: https://console.cloud.google.com/storage/browser/invoice-storage-demo
bucket: gs://invoice-storage-demo
prefix: ""
trackerEmail: [email protected]
Expand Down Expand Up @@ -354,7 +352,6 @@ settings:
tag: ""
pullPolicy: Always
# bucket to store cluster-connector yamls
host: ""
bucket: ""
prefix: ""

Expand Down

0 comments on commit e238ddd

Please sign in to comment.