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

Fix(komodor-agent): Wrong values #325

Merged
merged 2 commits into from
Jun 30, 2024
Merged

Fix(komodor-agent): Wrong values #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9f83da
fix wong container name when enabling "enableMemLimitChecks"
Jun 30, 2024
c398d22
chore(legacy k8s versions test): remove version 1.23 and add version …
Jun 30, 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 .buildkite/tests/legacy_k8s_versions_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
CLUSTER_NAME = get_filename_as_cluster_name(__file__)


@pytest.mark.parametrize("setup_cluster", ["1.25.11", "1.23.17"], indirect=True)
@pytest.mark.parametrize("setup_cluster", ["1.25.11", "1.27.13"], indirect=True)
def test_agent_on_legacy_k8s_versions(setup_cluster, kube_client):
output, exit_code = helm_agent_install(CLUSTER_NAME)
assert exit_code == 0, "helm install failed, output: {}".format(output)
Expand Down
4 changes: 2 additions & 2 deletions charts/komodor-agent/templates/watcher/_containers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{{- define "watcher.container" -}}
- name: "k8s-watcher"
- name: {{ include "watcher.container.name" .}}
image: {{ .Values.imageRepo }}/{{ .Values.components.komodorAgent.watcher.image.name}}:{{ .Values.components.komodorAgent.watcher.image.tag | default .Chart.AppVersion }}
imagePullPolicy: {{ .Values.pullPolicy }}
command: ["watcher"]
Expand All @@ -15,7 +15,7 @@
- name: podinfo
mountPath: /etc/podinfo
{{- end }}
{{- if ((.Values.capabilities).events).helm }}
{{- if (.Values.capabilities).helm }}
- name: helm-data
mountPath: /opt/watcher/helm
{{- end }}
Expand Down
6 changes: 5 additions & 1 deletion charts/komodor-agent/templates/watcher/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{{- define "komodorAgent.secret.name" -}}
{{ include "komodorAgent.name" . }}-secret
{{- end -}}
{{- end -}}

{{- define "watcher.container.name" -}}
{{- print "k8s-watcher" | quote }}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/komodor-agent/templates/watcher/_volumes.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
items:
- path: "mem_limit"
resourceFieldRef:
containerName: {{ .Chart.Name }}
containerName: {{ include "watcher.container.name" . }}
resource: limits.memory
divisor: 1Mi
- name: helm-data
Expand Down