Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add branding options in ace installer #270

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Add branding options in ace installer #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/ace_ace_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ type AceSpec struct {
NodeSelector map[string]string `json:"nodeSelector"`
Tolerations []core.Toleration `json:"tolerations"`
Affinity *core.Affinity `json:"affinity"`
Branding AceBrandingSpec `json:"branding"`
}

type AceBilling struct {
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/ace_options_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ type AceOptionsSpec struct {
DNSProxy AceOptionsComponentSpec `json:"dns-proxy"`
SMTPRelay AceOptionsComponentSpec `json:"smtprelay"`
Minio AceOptionsComponentSpec `json:"minio"`
Branding AceBrandingSpec `json:"branding"`
}

type RegistrySpec struct {
Expand Down
9 changes: 9 additions & 0 deletions apis/installer/v1alpha1/ace_shared_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,12 @@ type AceSettingsSecretName struct {
type PersistenceSpec struct {
Size resource.Quantity `json:"size"`
}

type AceBrandingSpec struct {
//+optional
PrimaryColor string `json:"primaryColor"`
// +optional
Logo string `json:"logo"`
//+optional
Favicon string `json:"favicon"`
}
17 changes: 17 additions & 0 deletions apis/installer/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions charts/ace/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ The following table lists the configurable parameters of the `ace` chart and the
| nodeSelector | | <code>{}</code> |
| tolerations | | <code>[]</code> |
| affinity | | <code>{}</code> |
| branding.logo | | <code>""</code> |
| branding.favicon | | <code>""</code> |
| branding.primaryColor | | <code>""</code> |


Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
Expand Down
5 changes: 5 additions & 0 deletions charts/ace/templates/platform/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,8 @@ stringData:
NAMESPACE = {{ .Release.Namespace }}
LABELS = trickstercache.org/metadata.name={{ include "ace.fullname" . }}
{{- end }}

[branding]
LOGO = {{ .Values.branding.logo }}
FAVICON = {{ .Values.branding.favicon }}
PRIMARY_COLOR = {{ .Values.branding.primaryColor }}
10 changes: 10 additions & 0 deletions charts/ace/values.openapiv3_schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,15 @@ properties:
- settings
- summary
type: object
branding:
properties:
favicon:
type: string
logo:
type: string
primaryColor:
type: string
type: object
cluster-ui:
properties:
affinity:
Expand Down Expand Up @@ -17152,6 +17161,7 @@ required:
- accounts-ui
- affinity
- billing
- branding
- cluster-ui
- deploy-ui
- dns-proxy
Expand Down
5 changes: 5 additions & 0 deletions charts/ace/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,3 +427,8 @@ nodeSelector: {}
tolerations: []

affinity: {}

branding:
logo: ""
favicon: ""
primaryColor: ""
10 changes: 10 additions & 0 deletions schema/ace-options/values.openapiv3_schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ properties:
required:
- enabled
type: object
branding:
properties:
favicon:
type: string
logo:
type: string
primaryColor:
type: string
type: object
cluster-ui:
properties:
enabled:
Expand Down Expand Up @@ -1420,6 +1429,7 @@ properties:
required:
- accounts-ui
- billing
- branding
- cluster-ui
- context
- deploy-ui
Expand Down
Loading