Skip to content

Commit ec62b46

Browse files
authored
chore(influxdb3-clustered): update clustered helm chart (#701)
* fix(influxdb3-clustered): rename "hostingEnvironment.eks" to "hostingEnvironment.aws" * chore(influxdb3-clustered): add "seviceMonitor" configuration * fix: specify "target-branch" for ct * chore(influxdb3-clustered): increment chart version * chore(influxdb3-clustered): add "resources.catalog" key
1 parent bea415a commit ec62b46

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

.github/workflows/helm-charts-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
- name: Run chart-testing (list-changed)
3636
id: list-changed
3737
run: |
38-
changed=$(ct list-changed)
38+
changed=$(ct list-changed --target-branch=master)
3939
if [[ -n "$changed" ]]; then
4040
echo "changed=true" >> "$GITHUB_OUTPUT"
4141
fi
4242
4343
- name: Run chart-testing (lint)
44-
run: ct lint
44+
run: ct lint --target-branch=master
4545

4646
- name: Create kind cluster
4747
uses: helm/kind-action@v1

charts/influxdb3-clustered/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
type: application
33

4-
version: 0.1.9
4+
version: 0.1.10
55
appVersion: "20241217-1494922"
66
name: influxdb3-clustered
77
description: InfluxDB 3.0 Clustered

charts/influxdb3-clustered/templates/app-instance.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ spec:
1212
spec:
1313
{{- if .Values.hostingEnvironment}}
1414
hostingEnvironment:
15-
{{- if hasKey .Values.hostingEnvironment "eks"}}
16-
eks: {{.Values.hostingEnvironment.eks | include "mapTrim" | trim | nindent 10}}
15+
{{- if hasKey .Values.hostingEnvironment "aws"}}
16+
aws: {{.Values.hostingEnvironment.aws | include "mapTrim" | trim | nindent 10}}
1717
{{- else if hasKey .Values.hostingEnvironment "openshift"}}
1818
openshift: {{.Values.hostingEnvironment.openshift | include "mapTrim" | trim | nindent 10}}
1919
{{- else if hasKey .Values.hostingEnvironment "gke"}}
@@ -67,6 +67,12 @@ spec:
6767
{{- if .Values.featureFlags}}
6868
featureFlags: {{.Values.featureFlags | toYaml | nindent 6}}
6969
{{- end}}
70+
{{- if .Values.observability.serviceMonitor}}
71+
observability:
72+
serviceMonitor:
73+
interval: {{required "missing observability.serviceMonitor.interval" .Values.observability.serviceMonitor.interval}}
74+
scrapeTimeout: {{required "missing observability.serviceMonitor.scrapeTimeout" .Values.observability.serviceMonitor.scrapeTimeout}}
75+
{{- end}}
7076
---
7177
{{- end }}
7278

charts/influxdb3-clustered/values.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ operatorImageOverride: ""
1616
skipOperator: false
1717

1818
hostingEnvironment: {}
19-
# eks:
19+
# aws:
2020
# eksRoleArn: "" # "arn:aws:iam::111111111111:role/your-influxdb-clustered-role"
2121
# # Note: there are currently no OpenShift-specific parameters. The empty object is still required for proper function
2222
# openshift: {}
@@ -184,6 +184,10 @@ resources:
184184
router:
185185
requests:
186186
limits:
187+
# The Catalog stores metadata related to schema information and physical locations of partitions.
188+
catalog:
189+
requests:
190+
limits:
187191

188192
admin:
189193
# The list of users to grant access to Clustered via influxctl
@@ -221,3 +225,9 @@ egress:
221225

222226
# This can be used to enable certain features that are still in testing
223227
featureFlags: []
228+
229+
# Parameters to tune observability configuration, such as Prometheus ServiceMonitor's.
230+
observability: {}
231+
# serviceMonitor:
232+
# interval: 10s
233+
# scrapeTimeout: 30s

0 commit comments

Comments
 (0)