Skip to content

Commit 37de591

Browse files
tamalsahatamalsaha
authored
Add inbox server settings to ace config (#486)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 627b37a commit 37de591

8 files changed

Lines changed: 89 additions & 10 deletions

File tree

‎apis/installer/v1alpha1/ace_ace_types.go‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -421,15 +421,16 @@ type InfraFileserver struct {
421421
}
422422

423423
type Settings struct {
424-
DB DBSettings `json:"db"`
425-
Cache CacheSettings `json:"cache"`
426-
Smtp SmtpSettings `json:"smtp"`
427-
Nats NatsSettings `json:"nats"`
428-
Platform PlatformSettings `json:"platform"`
429-
Security SecuritySettings `json:"security"`
430-
Grafana GrafanaSettings `json:"grafana"`
431-
Contract ContractStorage `json:"contract"`
432-
Firebase FirebaseSettings `json:"firebase"`
424+
DB DBSettings `json:"db"`
425+
Cache CacheSettings `json:"cache"`
426+
Smtp SmtpSettings `json:"smtp"`
427+
Nats NatsSettings `json:"nats"`
428+
Platform PlatformSettings `json:"platform"`
429+
Security SecuritySettings `json:"security"`
430+
Grafana GrafanaSettings `json:"grafana"`
431+
InboxServer InboxServerSettings `json:"inboxServer"`
432+
Contract ContractStorage `json:"contract"`
433+
Firebase FirebaseSettings `json:"firebase"`
433434
}
434435

435436
type DBSettings struct {
@@ -531,6 +532,12 @@ type GrafanaSettings struct {
531532
SecretKey string `json:"secretKey"`
532533
}
533534

535+
type InboxServerSettings struct {
536+
JmapURL string `json:"jmapURL"`
537+
WebAdminURL string `json:"webAdminURL"`
538+
AdminJWTPrivateKey string `json:"adminJWTPrivateKey"`
539+
}
540+
534541
type ContractStorage struct {
535542
Bucket string `json:"bucket"`
536543
Prefix string `json:"prefix"`

‎apis/installer/v1alpha1/ace_options_types.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,12 @@ type GeneratedValues struct {
408408
// +optional
409409
JKSPassword string `json:"jksPassword"`
410410
// +optional
411-
GrafanaSecretKey string `json:"grafanaSecretKey"`
411+
GrafanaSecretKey string `json:"grafanaSecretKey"`
412+
InboxServer InboxServerValues `json:"inboxServer"`
413+
}
414+
415+
type InboxServerValues struct {
416+
AdminJWTPrivateKey string `json:"adminJWTPrivateKey"`
412417
}
413418

414419
type PromotionValues struct {

‎apis/installer/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/ace/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ The following table lists the configurable parameters of the `ace` chart and the
181181
| settings.platform.cookieRememberName | to auto sign in | <code>ace_incredible</code> |
182182
| settings.grafana.appMode | possible values : production, development | <code>production</code> |
183183
| settings.grafana.secretKey | | <code>4nHrUDNw00AjlhAq8hCGYPxBt6I1UCbmdC5ReY19IPWdy8qFDzTZzXkdCr5d6qwP</code> |
184+
| settings.inboxServer.jmapURL | | <code>""</code> |
185+
| settings.inboxServer.webAdminURL | | <code>""</code> |
186+
| settings.inboxServer.adminJWTPrivateKey | | <code>""</code> |
184187
| settings.security.oauth2JWTSecret | | <code>""</code> |
185188
| settings.security.csrfSecretKey | | <code>""</code> |
186189
| settings.contract.bucket | | <code>""</code> |

‎charts/ace/templates/platform/config.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,8 @@ stringData:
180180
[grafana]
181181
# used for signing
182182
SECRET_KEY = {{ .Values.settings.grafana.secretKey }}
183+
184+
[inbox_server]
185+
JMAP_URL = {{ .Values.settings.inboxServer.jmapURL }}
186+
WEB_ADMIN_URL = {{ .Values.settings.inboxServer.webAdminURL }}
187+
ENCODED_ADMIN_JWT_PRIVATE_KEY = {{ .Values.settings.inboxServer.adminJWTPrivateKey | b64enc }}

‎charts/ace/values.openapiv3_schema.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21814,6 +21814,19 @@ properties:
2181421814
required:
2181521815
- appMode
2181621816
type: object
21817+
inboxServer:
21818+
properties:
21819+
adminJWTPrivateKey:
21820+
type: string
21821+
jmapURL:
21822+
type: string
21823+
webAdminURL:
21824+
type: string
21825+
required:
21826+
- adminJWTPrivateKey
21827+
- jmapURL
21828+
- webAdminURL
21829+
type: object
2181721830
nats:
2181821831
properties:
2181921832
adminCreds:
@@ -21980,6 +21993,7 @@ properties:
2198021993
- db
2198121994
- firebase
2198221995
- grafana
21996+
- inboxServer
2198321997
- nats
2198421998
- platform
2198521999
- security

‎charts/ace/values.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,11 @@ settings:
374374
appMode: production
375375
secretKey: 4nHrUDNw00AjlhAq8hCGYPxBt6I1UCbmdC5ReY19IPWdy8qFDzTZzXkdCr5d6qwP
376376

377+
inboxServer:
378+
jmapURL: ""
379+
webAdminURL: ""
380+
adminJWTPrivateKey: ""
381+
377382
security:
378383
oauth2JWTSecret: ""
379384
csrfSecretKey: ""

‎schema/ace-options/values.openapiv3_schema.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@ properties:
186186
type: string
187187
hostedDomain:
188188
type: string
189+
inboxServer:
190+
properties:
191+
adminJWTPrivateKey:
192+
type: string
193+
required:
194+
- adminJWTPrivateKey
195+
type: object
189196
installerName:
190197
type: string
191198
jksPassword:
@@ -300,6 +307,7 @@ properties:
300307
type: string
301308
required:
302309
- deploymentType
310+
- inboxServer
303311
- installerName
304312
- licenseOwnerID
305313
- licenseOwnerName

0 commit comments

Comments
 (0)