Skip to content

chore(helm): remove kvisor.apiGrpcAddr helper, inline grpcAddr directly #674

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
0msokolowski0 merged 1 commit into from
Mar 19, 2026
Merged

chore(helm): remove kvisor.apiGrpcAddr helper, inline grpcAddr directly #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions charts/kvisor/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,6 @@ Only used as a fallback when controller.extraArgs.cloud-provider is not set.
{{- dig "castai" "provider" "" (.Values.global | default dict) -}}
{{- end }}

{{/*
Resolve CASTAI_API_GRPC_ADDR: global.castai.grpcURL > .Values.castai.grpcAddr
*/}}
{{- define "kvisor.apiGrpcAddr" -}}
{{- coalesce (dig "castai" "grpcURL" "" (.Values.global | default dict)) .Values.castai.grpcAddr -}}
{{- end }}

{{/*
Resolve CASTAI_API_URL: global.castai.apiURL > .Values.castai.apiURL
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/kvisor/templates/agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ spec:
value: {{ if .Values.mockServer.enabled -}}
{{ (printf "%s:8443" (include "kvisor.castaiMockServer.service" .)) | quote }}
{{- else -}}
{{ include "kvisor.apiGrpcAddr" . | quote }}
{{ .Values.castai.grpcAddr | quote }}
{{- end }}
- name: CASTAI_API_URL
value: {{ if .Values.mockServer.enabled -}}
Expand Down
2 changes: 1 addition & 1 deletion charts/kvisor/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ spec:
value: {{ if .Values.mockServer.enabled -}}
{{ (printf "%s:8443" (include "kvisor.castaiMockServer.service" .)) | quote }}
{{- else -}}
{{ include "kvisor.apiGrpcAddr" . | quote }}
{{ .Values.castai.grpcAddr | quote }}
{{- end }}
- name: CASTAI_API_URL
value: {{ if .Values.mockServer.enabled -}}
Expand Down
114 changes: 0 additions & 114 deletions charts/kvisor/tests/global-values/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,6 @@ tests:
template: agent.yaml
documentIndex: 0

- it: should use global.castai.grpcURL over local default grpcAddr
set:
global:
castai:
grpcURL: "grpc.global.cast.ai:443"
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "grpc.global.cast.ai:443"
template: controller.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "grpc.global.cast.ai:443"
template: agent.yaml
documentIndex: 0

- it: should prefer global.castai.apiURL over local castai.apiURL
set:
castai.apiURL: "https://local.cast.ai/"
Expand All @@ -70,45 +49,6 @@ tests:
template: agent.yaml
documentIndex: 0

- it: should prefer global.castai.grpcURL over local castai.grpcAddr
set:
castai.grpcAddr: "grpc.local.cast.ai:443"
global:
castai:
grpcURL: "grpc.global.cast.ai:443"
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "grpc.global.cast.ai:443"
template: controller.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "grpc.global.cast.ai:443"
template: agent.yaml
documentIndex: 0

- it: should use default grpcAddr when neither local nor global is set
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "kvisor.prod-master.cast.ai:443"
template: controller.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "kvisor.prod-master.cast.ai:443"
template: agent.yaml
documentIndex: 0

- it: should use local castai.apiURL when global is not set
set:
castai.apiURL: "https://local.cast.ai/"
Expand All @@ -128,50 +68,10 @@ tests:
template: agent.yaml
documentIndex: 0

- it: should fall back to defaults when global is empty map
set:
global: {}
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "kvisor.prod-master.cast.ai:443"
template: controller.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "kvisor.prod-master.cast.ai:443"
template: agent.yaml
documentIndex: 0

- it: should fall back to defaults when global.castai is empty map
set:
global:
castai: {}
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "kvisor.prod-master.cast.ai:443"
template: controller.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "kvisor.prod-master.cast.ai:443"
template: agent.yaml
documentIndex: 0

- it: should use local values when global is empty map
set:
global: {}
castai.apiURL: "https://local.cast.ai/"
castai.grpcAddr: "grpc.local.cast.ai:443"
asserts:
- contains:
path: spec.template.spec.containers[0].env
Expand All @@ -180,27 +80,13 @@ tests:
value: "https://local.cast.ai/"
template: controller.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "grpc.local.cast.ai:443"
template: controller.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_URL
value: "https://local.cast.ai/"
template: agent.yaml
documentIndex: 0
- contains:
path: spec.template.spec.containers[0].env
content:
name: CASTAI_API_GRPC_ADDR
value: "grpc.local.cast.ai:443"
template: agent.yaml
documentIndex: 0

- it: should use global.castai.clusterID over local castai.clusterID
set:
Expand Down
Loading