From 4725eff42032cb2596f8f82d28d09ef25828c287 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Tue, 21 Jan 2025 17:30:08 -0500 Subject: [PATCH 1/5] fix(influxdb3-clustered): rename "hostingEnvironment.eks" to "hostingEnvironment.aws" --- charts/influxdb3-clustered/templates/app-instance.yml | 4 ++-- charts/influxdb3-clustered/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/influxdb3-clustered/templates/app-instance.yml b/charts/influxdb3-clustered/templates/app-instance.yml index 6d2a92b2..0cf2b0d8 100644 --- a/charts/influxdb3-clustered/templates/app-instance.yml +++ b/charts/influxdb3-clustered/templates/app-instance.yml @@ -12,8 +12,8 @@ spec: spec: {{- if .Values.hostingEnvironment}} hostingEnvironment: - {{- if hasKey .Values.hostingEnvironment "eks"}} - eks: {{.Values.hostingEnvironment.eks | include "mapTrim" | trim | nindent 10}} + {{- if hasKey .Values.hostingEnvironment "aws"}} + aws: {{.Values.hostingEnvironment.aws | include "mapTrim" | trim | nindent 10}} {{- else if hasKey .Values.hostingEnvironment "openshift"}} openshift: {{.Values.hostingEnvironment.openshift | include "mapTrim" | trim | nindent 10}} {{- else if hasKey .Values.hostingEnvironment "gke"}} diff --git a/charts/influxdb3-clustered/values.yaml b/charts/influxdb3-clustered/values.yaml index 9cd22a29..bb959cd3 100644 --- a/charts/influxdb3-clustered/values.yaml +++ b/charts/influxdb3-clustered/values.yaml @@ -16,7 +16,7 @@ operatorImageOverride: "" skipOperator: false hostingEnvironment: {} -# eks: +# aws: # eksRoleArn: "" # "arn:aws:iam::111111111111:role/your-influxdb-clustered-role" # # Note: there are currently no OpenShift-specific parameters. The empty object is still required for proper function # openshift: {} From ae12e10783039afcf610c707edaf06a0470eb008 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Tue, 21 Jan 2025 17:32:38 -0500 Subject: [PATCH 2/5] chore(influxdb3-clustered): add "seviceMonitor" configuration --- charts/influxdb3-clustered/templates/app-instance.yml | 6 ++++++ charts/influxdb3-clustered/values.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/charts/influxdb3-clustered/templates/app-instance.yml b/charts/influxdb3-clustered/templates/app-instance.yml index 0cf2b0d8..7de93193 100644 --- a/charts/influxdb3-clustered/templates/app-instance.yml +++ b/charts/influxdb3-clustered/templates/app-instance.yml @@ -67,6 +67,12 @@ spec: {{- if .Values.featureFlags}} featureFlags: {{.Values.featureFlags | toYaml | nindent 6}} {{- end}} + {{- if .Values.observability.serviceMonitor}} + observability: + serviceMonitor: + interval: {{required "missing observability.serviceMonitor.interval" .Values.observability.serviceMonitor.interval}} + scrapeTimeout: {{required "missing observability.serviceMonitor.scrapeTimeout" .Values.observability.serviceMonitor.scrapeTimeout}} + {{- end}} --- {{- end }} diff --git a/charts/influxdb3-clustered/values.yaml b/charts/influxdb3-clustered/values.yaml index bb959cd3..8ac260a0 100644 --- a/charts/influxdb3-clustered/values.yaml +++ b/charts/influxdb3-clustered/values.yaml @@ -221,3 +221,9 @@ egress: # This can be used to enable certain features that are still in testing featureFlags: [] + +# Parameters to tune observability configuration, such as Prometheus ServiceMonitor's. +observability: {} + # serviceMonitor: + # interval: 10s + # scrapeTimeout: 30s From 4baf56e6bd18688236399c81c931a016896a21f2 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Tue, 21 Jan 2025 17:59:55 -0500 Subject: [PATCH 3/5] fix: specify "target-branch" for ct --- .github/workflows/helm-charts-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-charts-test.yaml b/.github/workflows/helm-charts-test.yaml index 0dc9b9b4..9454a83e 100644 --- a/.github/workflows/helm-charts-test.yaml +++ b/.github/workflows/helm-charts-test.yaml @@ -35,13 +35,13 @@ jobs: - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed) + changed=$(ct list-changed --target-branch=master) if [[ -n "$changed" ]]; then echo "changed=true" >> "$GITHUB_OUTPUT" fi - name: Run chart-testing (lint) - run: ct lint + run: ct lint --target-branch=master - name: Create kind cluster uses: helm/kind-action@v1 From da9aa68ae2913c79c9dbdc2253102f9c6bf58b6a Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Tue, 21 Jan 2025 18:03:57 -0500 Subject: [PATCH 4/5] chore(influxdb3-clustered): increment chart version --- charts/influxdb3-clustered/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/influxdb3-clustered/Chart.yaml b/charts/influxdb3-clustered/Chart.yaml index a3d3b0d0..22ee539e 100644 --- a/charts/influxdb3-clustered/Chart.yaml +++ b/charts/influxdb3-clustered/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application -version: 0.1.9 +version: 0.1.10 appVersion: "20241217-1494922" name: influxdb3-clustered description: InfluxDB 3.0 Clustered From e16beceae8600de4f43fe2d688f6c9b9a8761dbf Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Tue, 21 Jan 2025 18:24:08 -0500 Subject: [PATCH 5/5] chore(influxdb3-clustered): add "resources.catalog" key --- charts/influxdb3-clustered/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/influxdb3-clustered/values.yaml b/charts/influxdb3-clustered/values.yaml index 8ac260a0..81372fb6 100644 --- a/charts/influxdb3-clustered/values.yaml +++ b/charts/influxdb3-clustered/values.yaml @@ -184,6 +184,10 @@ resources: router: requests: limits: + # The Catalog stores metadata related to schema information and physical locations of partitions. + catalog: + requests: + limits: admin: # The list of users to grant access to Clustered via influxctl