Skip to content

Commit 02b9332

Browse files
RandoooomRandoooom
committed
chore: update helm chartr
1 parent 5c3f348 commit 02b9332

14 files changed

+354
-226
lines changed

‎charts/feedback-fusion/README.md‎

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,11 @@ helm install feedback-fusion feedback-fusion/feedback-fusion
1818

1919
| Key | Type | Default | Description |
2020
|-----|------|---------|-------------|
21-
| api.affinity | object | `{}` | |
22-
| api.fullnameOverride | string | `""` | full name override |
23-
| api.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
24-
| api.image.repository | string | `"ghcr.io/onelitefeathernet/feedback-fusion"` | image repository |
25-
| api.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
26-
| api.imagePullSecrets | list | `[]` | optional pull secrets |
27-
| api.ingress.annotations | object | `{}` | annotations to attach to the ingress resource |
28-
| api.ingress.className | string | `""` | which ingress class to use |
29-
| api.ingress.enabled | bool | `false` | wether to create the ingress |
30-
| api.ingress.hosts | string | `nil` | hosts to listen on |
31-
| api.ingress.tls | list | `[]` | tls secret reference |
32-
| api.livenessProbe.grpc.port | int | `8000` | |
33-
| api.livenessProbe.periodSeconds | int | `5` | |
34-
| api.nameOverride | string | `""` | name override |
35-
| api.nodeSelector | object | `{}` | |
36-
| api.podAnnotations | object | `{}` | annotatiosn to attach to the pod |
37-
| api.podLabels | object | `{}` | labels to attach to the pod |
38-
| api.podSecurityContext | object | `{}` | the pod security context |
39-
| api.replicaCount | int | `1` | If you want to use high availability make sure to configure skytable distributed caching as otherwise the replicas won't know a different instance modified the dataset. See https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/caching.html#caching |
40-
| api.resources | object | `{}` | pod resources |
41-
| api.securityContext | object | `{}` | security context |
42-
| api.service.type | string | `"ClusterIP"` | service type |
43-
| api.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
44-
| api.serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |
45-
| api.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
46-
| api.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
47-
| api.startupProbe.failureThreshold | int | `10` | |
48-
| api.startupProbe.grpc.port | int | `8000` | |
49-
| api.startupProbe.periodSeconds | int | `2` | |
50-
| api.tolerations | list | `[]` | |
51-
| api.volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. |
52-
| api.volumes | list | `[]` | Additional volumes on the output Deployment definition. |
5321
| dashboard.affinity | object | `{}` | |
5422
| dashboard.enabled | bool | `true` | |
55-
| dashboard.fullnameOverride | string | `""` | full name override |
5623
| dashboard.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
5724
| dashboard.image.repository | string | `"ghcr.io/onelitefeathernet/feedback-fusion-dashboard"` | image repository |
5825
| dashboard.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
59-
| dashboard.imagePullSecrets | list | `[]` | optional pull secrets |
6026
| dashboard.ingress.annotations | object | `{}` | annotations to attach to the ingress resource |
6127
| dashboard.ingress.className | string | `""` | which ingress class to use |
6228
| dashboard.ingress.enabled | bool | `false` | wether to create the ingress |
@@ -65,7 +31,6 @@ helm install feedback-fusion feedback-fusion/feedback-fusion
6531
| dashboard.livenessProbe.httpGet.path | string | `"/"` | |
6632
| dashboard.livenessProbe.httpGet.port | int | `3000` | |
6733
| dashboard.livenessProbe.periodSeconds | int | `5` | |
68-
| dashboard.nameOverride | string | `""` | name override |
6934
| dashboard.nodeSelector | object | `{}` | |
7035
| dashboard.podAnnotations | object | `{}` | annotatiosn to attach to the pod |
7136
| dashboard.podLabels | object | `{}` | labels to attach to the pod |
@@ -74,20 +39,69 @@ helm install feedback-fusion feedback-fusion/feedback-fusion
7439
| dashboard.resources | object | `{}` | pod resources |
7540
| dashboard.securityContext | object | `{}` | security context |
7641
| dashboard.service.type | string | `"ClusterIP"` | service type |
77-
| dashboard.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
78-
| dashboard.serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |
79-
| dashboard.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
80-
| dashboard.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
8142
| dashboard.startupProbe.failureThreshold | int | `10` | |
8243
| dashboard.startupProbe.httpGet.path | string | `"/"` | |
8344
| dashboard.startupProbe.httpGet.port | int | `3000` | |
8445
| dashboard.startupProbe.periodSeconds | int | `2` | |
8546
| dashboard.tolerations | list | `[]` | |
8647
| dashboard.volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. |
8748
| dashboard.volumes | list | `[]` | Additional volumes on the output Deployment definition. |
88-
| feedbackFusion.config.secret | string | `"feedback-fusion-config"` | the secret containing the config.yaml For all configuration options see https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/configuration/server |
49+
| feedbackFusion.config.secret | string | `"feedback-fusion-config"` | the secret containing the config.hcl For all configuration options see https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/configuration/server |
8950
| feedbackFusion.dashboard.config.secret | string | `"feedback-fusion-dashboard-config"` | the secret containing the dashboard config For all configuration options see https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/configuration/dashboard |
51+
| feedbackFusion.indexer.config.secret | string | `"feedback-fusion-indexer-config"` | the secret containing the config.hcl For all configuration options see https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/configuration/indexer |
9052
| feedbackFusion.log | string | `"INFO"` | see https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/observability/logging.html |
53+
| fullnameOverride | string | `""` | full name override |
54+
| imagePullSecrets | list | `[]` | |
55+
| indexer.affinity | object | `{}` | |
56+
| indexer.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
57+
| indexer.image.repository | string | `"ghcr.io/onelitefeathernet/feedback-fusion-indexer"` | image repository |
58+
| indexer.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
59+
| indexer.livenessProbe.grpc.port | int | `8000` | |
60+
| indexer.livenessProbe.periodSeconds | int | `5` | |
61+
| indexer.nodeSelector | object | `{}` | |
62+
| indexer.podAnnotations | object | `{}` | annotatiosn to attach to the pod |
63+
| indexer.podLabels | object | `{}` | labels to attach to the pod |
64+
| indexer.podSecurityContext | object | `{}` | the pod security context |
65+
| indexer.replicaCount | int | `1` | If you want to use high availability make sure to configure skytable distributed caching as otherwise the replicas won't know a different instance modified the dataset. See https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/caching.html#caching |
66+
| indexer.resources | object | `{}` | pod resources |
67+
| indexer.securityContext | object | `{}` | security context |
68+
| indexer.service.type | string | `"ClusterIP"` | service type |
69+
| indexer.startupProbe.failureThreshold | int | `10` | |
70+
| indexer.startupProbe.grpc.port | int | `8000` | |
71+
| indexer.startupProbe.periodSeconds | int | `2` | |
72+
| indexer.tolerations | list | `[]` | |
73+
| indexer.volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. |
74+
| indexer.volumes | list | `[]` | Additional volumes on the output Deployment definition. |
75+
| nameOverride | string | `""` | name override |
76+
| server.affinity | object | `{}` | |
77+
| server.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
78+
| server.image.repository | string | `"ghcr.io/onelitefeathernet/feedback-fusion"` | image repository |
79+
| server.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
80+
| server.ingress.annotations | object | `{}` | annotations to attach to the ingress resource |
81+
| server.ingress.className | string | `""` | which ingress class to use |
82+
| server.ingress.enabled | bool | `false` | wether to create the ingress |
83+
| server.ingress.hosts | string | `nil` | hosts to listen on |
84+
| server.ingress.tls | list | `[]` | tls secret reference |
85+
| server.livenessProbe.grpc.port | int | `8000` | |
86+
| server.livenessProbe.periodSeconds | int | `5` | |
87+
| server.nodeSelector | object | `{}` | |
88+
| server.podAnnotations | object | `{}` | annotatiosn to attach to the pod |
89+
| server.podLabels | object | `{}` | labels to attach to the pod |
90+
| server.podSecurityContext | object | `{}` | the pod security context |
91+
| server.replicaCount | int | `1` | If you want to use high availability make sure to configure skytable distributed caching as otherwise the replicas won't know a different instance modified the dataset. See https://onelitefeathernet.github.io/feedback-fusion/nightly/docs/caching.html#caching |
92+
| server.resources | object | `{}` | pod resources |
93+
| server.securityContext | object | `{}` | security context |
94+
| server.service.type | string | `"ClusterIP"` | service type |
95+
| server.startupProbe.failureThreshold | int | `10` | |
96+
| server.startupProbe.grpc.port | int | `8000` | |
97+
| server.startupProbe.periodSeconds | int | `2` | |
98+
| server.tolerations | list | `[]` | |
99+
| server.volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. |
100+
| server.volumes | list | `[]` | Additional volumes on the output Deployment definition. |
101+
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
102+
| serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |
103+
| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
104+
| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
91105

92106
----------------------------------------------
93107
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

‎charts/feedback-fusion/templates/_helpers.tpl‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -60,58 +60,3 @@ Create the name of the service account to use
6060
{{- default "default" .Values.api.serviceAccount.name }}
6161
{{- end }}
6262
{{- end }}
63-
64-
{{- define "feedback-fusion-dashboard.name" -}}
65-
{{- default "feedback-fusion-dashboard" .Values.nameOverride | trunc 63 | trimSuffix "-" }}
66-
{{- end }}
67-
68-
{{- define "feedback-fusion-dashboard.fullname" -}}
69-
{{- if .Values.dashboard.fullnameOverride }}
70-
{{- .Values.dashboard.fullnameOverride | trunc 63 | trimSuffix "-" }}
71-
{{- else }}
72-
{{- $name := default (printf "%s-%s" .Chart.Name "dashboard") .Values.dashboard.nameOverride }}
73-
{{- if contains $name (printf "%s-%s" .Release.Name "dashboard") }}
74-
{{- printf "%s-%s" .Release.Name "dashboard" | trunc 63 | trimSuffix "-" }}
75-
{{- else }}
76-
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
77-
{{- end }}
78-
{{- end }}
79-
{{- end }}
80-
81-
{{/*
82-
Create chart name and version as used by the chart label.
83-
*/}}
84-
{{- define "feedback-fusion-dashboard.chart" -}}
85-
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
86-
{{- end }}
87-
88-
{{/*
89-
Common labels
90-
*/}}
91-
{{- define "feedback-fusion-dashboard.labels" -}}
92-
helm.sh/chart: {{ include "feedback-fusion-dashboard.chart" . }}
93-
{{ include "feedback-fusion-dashboard.selectorLabels" . }}
94-
{{- if .Chart.AppVersion }}
95-
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
96-
{{- end }}
97-
app.kubernetes.io/managed-by: {{ .Release.Service }}
98-
{{- end }}
99-
100-
{{/*
101-
Selector labels
102-
*/}}
103-
{{- define "feedback-fusion-dashboard.selectorLabels" -}}
104-
app.kubernetes.io/name: {{ include "feedback-fusion-dashboard.name" . }}
105-
app.kubernetes.io/instance: {{ .Release.Name }}
106-
{{- end }}
107-
108-
{{/*
109-
Create the name of the service account to use
110-
*/}}
111-
{{- define "feedback-fusion-dashboard.serviceAccountName" -}}
112-
{{- if .Values.dashboard.serviceAccount.create }}
113-
{{- default (include "feedback-fusion-dashboard.fullname" .) .Values.dashboard.serviceAccount.name }}
114-
{{- else }}
115-
{{- default "default" .Values.dashboard.serviceAccount.name }}
116-
{{- end }}
117-
{{- end }}

‎charts/feedback-fusion/templates/dashboard-serviceaccount.yaml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎charts/feedback-fusion/templates/dashboard-deployment.yaml‎ renamed to ‎charts/feedback-fusion/templates/deployment-dashboard.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
5-
name: {{ include "feedback-fusion-dashboard.fullname" . }}
5+
name: {{ include "feedback-fusion.fullname" . }}
66
labels:
7-
{{- include "feedback-fusion-dashboard.labels" . | nindent 4 }}
7+
{{- include "feedback-fusion.labels" . | nindent 4 }}
88
spec:
99
replicas: {{ .Values.dashboard.replicaCount }}
1010
selector:
1111
matchLabels:
12-
{{- include "feedback-fusion-dashboard.selectorLabels" . | nindent 6 }}
12+
{{- include "feedback-fusion.selectorLabels" . | nindent 6 }}
13+
onelitefeather.net/feedback-fusion-component: dashboard
1314
template:
1415
metadata:
1516
{{- with .Values.dashboard.podAnnotations }}
1617
annotations:
1718
{{- toYaml . | nindent 8 }}
1819
{{- end }}
1920
labels:
20-
{{- include "feedback-fusion-dashboard.labels" . | nindent 8 }}
21+
{{- include "feedback-fusion.labels" . | nindent 8 }}
2122
{{- with .Values.dashboard.podLabels }}
2223
{{- toYaml . | nindent 8 }}
2324
{{- end }}
@@ -26,7 +27,7 @@ spec:
2627
imagePullSecrets:
2728
{{- toYaml . | nindent 8 }}
2829
{{- end }}
29-
serviceAccountName: {{ include "feedback-fusion-dashboard.serviceAccountName" . }}
30+
serviceAccountName: {{ include "feedback-fusion.serviceAccountName" . }}
3031
securityContext:
3132
{{- toYaml .Values.dashboard.podSecurityContext | nindent 8 }}
3233
containers:
@@ -48,7 +49,7 @@ spec:
4849
envFrom:
4950
- secretRef:
5051
name: {{ .Values.feedbackFusion.dashboard.config.secret }}
51-
volumes:
52+
volumes:
5253
{{- with .Values.dashboard.volumes }}
5354
{{- toYaml . | nindent 8 }}
5455
{{- end }}

‎charts/feedback-fusion/templates/deployment-indexer.yaml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: {{ include "feedback-fusion.fullname" . }}-indexer
5+
labels:
6+
{{- include "feedback-fusion.labels" . | nindent 4 }}
7+
spec:
8+
replicas: {{ .Values.indexer.replicaCount }}
9+
selector:
10+
matchLabels:
11+
{{- include "feedback-fusion.selectorLabels" . | nindent 6 }}
12+
onelitefeather.net/feedback-fusion-component: indexer
13+
template:
14+
metadata:
15+
{{- with .Values.indexer.podAnnotations }}
16+
annotations:
17+
{{- toYaml . | nindent 8 }}
18+
{{- end }}
19+
labels:
20+
{{- include "feedback-fusion.labels" . | nindent 8 }}
21+
{{- with .Values.indexer.podLabels }}
22+
{{- toYaml . | nindent 8 }}
23+
{{- end }}
24+
spec:
25+
{{- with .Values.imagePullSecrets }}
26+
imagePullSecrets:
27+
{{- toYaml . | nindent 8 }}
28+
{{- end }}
29+
serviceAccountName: {{ include "feedback-fusion.serviceAccountName" . }}
30+
securityContext:
31+
{{- toYaml .Values.indexer.podSecurityContext | nindent 8 }}
32+
containers:
33+
- name: {{ .Chart.Name }}-indexer
34+
securityContext:
35+
{{- toYaml .Values.indexer.securityContext | nindent 12 }}
36+
image: "{{ .Values.indexer.image.repository }}:{{ .Values.indexer.image.tag | default .Chart.AppVersion }}"
37+
imagePullPolicy: {{ .Values.indexer.image.pullPolicy }}
38+
ports:
39+
- name: health
40+
containerPort: 8080
41+
protocol: TCP
42+
- name: grpc
43+
containerPort: 7000
44+
protocol: TCP
45+
env:
46+
- name: RUST_LOG
47+
value: {{ .Values.feedbackFusion.log }}
48+
- name: FEEDBACK_FUSION_CONFIG
49+
value: /etc/config/config.hcl
50+
livenessProbe:
51+
{{- toYaml .Values.indexer.livenessProbe | nindent 12 }}
52+
startupProbe:
53+
{{- toYaml .Values.indexer.startupProbe | nindent 12 }}
54+
resources:
55+
{{- toYaml .Values.indexer.resources | nindent 12 }}
56+
volumeMounts:
57+
{{- with .Values.indexer.volumeMounts }}
58+
{{- toYaml . | nindent 12 }}
59+
{{- end }}
60+
61+
- name: {{ .Values.feedbackFusion.config.secret }}
62+
mountPath: /etc/config
63+
volumes:
64+
{{- with .Values.indexer.volumes }}
65+
{{- toYaml . | nindent 8 }}
66+
{{- end }}
67+
68+
- name: {{ .Values.feedbackFusion.config.secret }}
69+
secret:
70+
secretName: {{ .Values.feedbackFusion.config.secret }}
71+
{{- with .Values.indexer.nodeSelector }}
72+
nodeSelector:
73+
{{- toYaml . | nindent 8 }}
74+
{{- end }}
75+
{{- with .Values.indexer.affinity }}
76+
affinity:
77+
{{- toYaml . | nindent 8 }}
78+
{{- end }}
79+
{{- with .Values.indexer.tolerations }}
80+
tolerations:
81+
{{- toYaml . | nindent 8 }}
82+
{{- end }}

0 commit comments

Comments
 (0)