Skip to content

fix commandOverride for all charts #121

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

Merged
merged 9 commits into from
Apr 29, 2025
Merged

fix commandOverride for all charts #121

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
08fd343
update logic for commandOverride
jmtx1020 Apr 24, 2025
ff4249f
updated extraEnv to work for commandOverride users
jmtx1020 Apr 25, 2025
5696e9c
fixed the commandOverride logic in all charts
jmtx1020 Apr 25, 2025
471b918
version bump
jmtx1020 Apr 25, 2025
af96893
fixed issue where commandOverride.enabled was not rendering probes
jmtx1020 Apr 25, 2025
51758fb
let ports render even if using commandoverride
jmtx1020 Apr 25, 2025
b36916d
Merge branch 'main' into fix/command-override-das
chris-vest Apr 28, 2025
0ee482f
version bump for nitro chart
jmtx1020 Apr 28, 2025
b6b98a2
Merge branch 'fix/command-override-das' of github.com:jmtx1020/commun…
jmtx1020 Apr 28, 2025
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/das/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ maintainers:

type: application

version: 0.5.20
version: 0.5.21

appVersion: "v3.5.5-90ee45c"
10 changes: 3 additions & 7 deletions charts/das/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,8 @@ spec:
command: ["sleep"]
args: ["infinity"]
{{- else if .Values.commandOverride.enabled }}
{{- with .Values.commandOverride.command }}
command: {{- toYaml . | nindent 8}}
{{- end }}
{{- with .Values.commandOverride.args }}
args: {{- toYaml . | nindent 8 }}
{{- end }}
command: {{ .Values.commandOverride.command | toJson }}
args: {{ .Values.commandOverride.args | toJson }}
{{- else }}
command: [/usr/local/bin/daserver]
args:
Expand All @@ -87,6 +83,7 @@ spec:
{{- range $key, $value := .Values.customArgs }}
- --{{ $key }}={{ $value | quote }}
{{- end }}
{{- end }}
ports:
{{- if and .Values.configmap.data.http .Values.configmap.data.http.port}}
- name: http-rpc
Expand Down Expand Up @@ -194,7 +191,6 @@ spec:
{{- with .Values.extraEnv }}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- end }}
lifecycle:
{{- include "das.lifecycle" . | nindent 12 }}
{{- with .Values.lifecycle }}
Expand Down
2 changes: 1 addition & 1 deletion charts/nitro/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ maintainers:

type: application

version: 0.6.31
version: 0.6.32

appVersion: "v3.5.5-90ee45c"
10 changes: 3 additions & 7 deletions charts/nitro/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,8 @@ spec:
command: ["sleep"]
args: ["infinity"]
{{- else if .Values.commandOverride.enabled }}
{{- with .Values.commandOverride.command }}
command: {{- toYaml . | nindent 8}}
{{- end }}
{{- with .Values.commandOverride.args }}
args: {{- toYaml . | nindent 8 }}
{{- end }}
command: {{ .Values.commandOverride.command | toJson }}
args: {{ .Values.commandOverride.args | toJson }}
{{- else }}
command: [/usr/local/bin/nitro]
args:
Expand All @@ -81,6 +77,7 @@ spec:
{{- if .Values.customArgs }}
{{- include "nitro.customArgs" . | nindent 12 }}
{{- end }}
{{- end }}
ports:
{{- if and .Values.configmap.data.http .Values.configmap.data.http.port}}
- name: http-rpc
Expand Down Expand Up @@ -138,7 +135,6 @@ spec:
failureThreshold: {{ .Values.startupProbe.failureThreshold }}
periodSeconds: {{ .Values.startupProbe.periodSeconds }}
{{- end }}
{{- end }}
env:
- name: POD_NAME
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion charts/relay/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ maintainers:

type: application

version: 0.5.17
version: 0.5.18

appVersion: "v3.5.5-90ee45c"
10 changes: 3 additions & 7 deletions charts/relay/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,8 @@ spec:
command: ["sleep"]
args: ["infinity"]
{{- else if .Values.commandOverride.enabled }}
{{- with .Values.commandOverride.command }}
command: {{- toYaml . | nindent 8}}
{{- end }}
{{- with .Values.commandOverride.args }}
args: {{- toYaml . | nindent 8 }}
{{- end }}
command: {{ .Values.commandOverride.command | toJson }}
args: {{ .Values.commandOverride.args | toJson }}
{{- else }}
command: [/usr/local/bin/relay]
args:
Expand Down Expand Up @@ -77,6 +73,7 @@ spec:
containerPort: {{ index .Values "configmap" "data" "pprof-cfg" "port" }}
protocol: TCP
{{- end }}
{{- end }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
{{- if and .Values.livenessProbe.exec (kindIs "string" .Values.livenessProbe.exec.command) }}
Expand All @@ -101,7 +98,6 @@ spec:
{{- with .Values.extraEnv }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
lifecycle:
{{- include "relay.lifecycle" . | nindent 12 }}
{{- with .Values.lifecycle }}
Expand Down