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

fix(edge): Fixes enterprise helm chart to allow config of livenessProbe #671

Merged
merged 7 commits into from
Aug 28, 2024
Merged

fix(edge): Fixes enterprise helm chart to allow config of livenessProbe #671

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3689621
fix(edge): Fixes enterprise helm chart to allow config of livenessProbe
devanbenz Aug 28, 2024
58828a7
fix(edge): Fixes enterprise helm chart to allow config of livenessProbe
devanbenz Aug 28, 2024
6d36b0d
version bump
devanbenz Aug 28, 2024
9950f1c
fixes
devanbenz Aug 28, 2024
4709ded
fixes
devanbenz Aug 28, 2024
1623417
fixes
devanbenz Aug 28, 2024
66a28e8
pls use 1.23
devanbenz Aug 28, 2024
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
2 changes: 1 addition & 1 deletion charts/influxdb-enterprise/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
version: 0.1.22
version: 0.1.23
appVersion: 1.10.0
engine: gotpl

Expand Down
3 changes: 2 additions & 1 deletion charts/influxdb-enterprise/templates/data-statefulset.yaml
View file
Open in desktop
Copy link
Member

@jdockerty jdockerty Aug 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the same also need to be placed onto the meta nodes too?

Perhaps that wasn't the original ask, but a slight rejig to allowing something like:

# values.yaml
data:
  livenessProbe:
     ...

meta:
  livenessProbe:
    ...

might be quite worthwhile? I'm not authoritative on this though of course 😄

For reference, as the livenessProbe field exists in both files:

rg "livenessProbe" templates -l
templates/meta-statefulset.yaml
templates/data-statefulset.yaml

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll go ahead and add to the meta nodes too

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdockerty should I be splitting up the livenessProbe or maybe just have a single value in the helm chart? If customers indicate they want it split we can do so but as of right now I think the customer is just wanting to adjust the data nodes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

customer is just wanting to adjust the data nodes

In this case I think going to satisfy what a customer wants is fine, as it is a quick win, although it isn't my call too unfortunately. Might be worth checking with Geoffrey on that one 😄

Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,11 @@ spec:
protocol: UDP
livenessProbe:
httpGet:
path: /ping
path: {{ .Values.livenessProbe.path | default "/ping" }}
devanbenz marked this conversation as resolved.
Show resolved Hide resolved
port: http
{{- if .Values.data.https.enabled }}
scheme: HTTPS
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 3600 }}
{{- end }}
readinessProbe:
initialDelaySeconds: 30
Expand Down
8 changes: 8 additions & 0 deletions charts/influxdb-enterprise/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ serviceAccount:
name: ''
annotations: {}

## Customize liveness, readiness and startup probes
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
livenessProbe: {}
# path: "/ping"
# initialDelaySeconds: 30
# timeoutSeconds: 5
# scheme: HTTP
Copy link
Member

@jdockerty jdockerty Aug 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this scheme isn't consumed I think this might result in an YAML error for the templating engine through helm.

I've not tried this myself, but at a quick glance seeing that .Values.livenessProbe.scheme isn't used within the scheme field, it might be problematic if someone tries to use it from this example. I suspect the default can be HTTP in a similar manner to the /ping path

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with timeoutSeconds


## The name of a secret in the same kubernetes namespace which contain values
## to be added to the environment.
## This can be used, for example, to set the INFLUXDB_ENTERPRISE_LICENSE_KEY
Expand Down
Loading