Skip to content

Commit 30aff90

Browse files
Cherry pick extended agents image (#4240)
#### What this PR does / why we need it: Cherry-pick of fixes #### Changelog entry: Does this PR introduce a user-facing bug fix, feature, dependency update, or breaking change?? <!-- This section will go in the release notes for this version. Is this something users should be able to find easily? If no, just write "NONE" in the release-note block below. If yes, please add a release note in the block below describing this in 1-2 sentences for our changelog. --> ```release-note NONE ``` --------- Co-authored-by: Tamir David <[email protected]>
1 parent 8ae8284 commit 30aff90

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

helm/odigos/templates/odiglet/clusterrole.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ rules:
3535
- get
3636
- list
3737
- watch
38+
# with k8s-init-container, we don't run the odiglet init container
39+
# and does not update the node label
40+
{{- if not (eq .Values.instrumentor.mountMethod "k8s-init-container") }}
3841
- patch
3942
- update
43+
{{- end }}
4044
- apiGroups:
4145
- odigos.io
4246
resources:

helm/odigos/templates/odiglet/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
# if the mountMethod is k8s-init-container, we will pre-pull the agents image here as an init container
6565
# otherwise, we must be using a mountMethod that allows hostPathMounts and we will use the standard odiglet init
6666
initContainers:
67-
{{- if or (not .Values.odiglet.noHostPathMounts) (not (eq .Values.instrumentor.mountMethod "k8s-init-container")) }}
67+
{{- if (not (eq .Values.instrumentor.mountMethod "k8s-init-container")) }}
6868
- name: init
6969
{{- if include "odigos.secretExists" . }}
7070
image: {{ template "utils.imageName" (dict "Values" .Values "Component" "enterprise-odiglet" "Tag" $odigletImageTag) }}

tests/e2e/mount-method/chainsaw-test.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ spec:
6060
- assert:
6161
file: odiglet-ready.yaml
6262

63-
- name: '[1 - Setup] Verify Node Odiglet label has been added'
64-
try:
65-
- assert:
66-
file: ../../common/assert/node-odiglet-label.yaml
63+
# mount method is k8s-init-container, so node is not labeled by odigos.
6764

6865
- name: '[1 - Setup]Assert Trace DB is up'
6966
try:

tests/e2e/mount-method/odiglet-ready.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ metadata:
1212
name: odiglet
1313
spec:
1414
initContainers:
15-
- name: init
16-
image: registry.odigos.io/odigos-odiglet:e2e-test
1715
- name: odigos-agents-image-pull
1816
image: registry.odigos.io/odigos-agents:e2e-test
1917
containers:
@@ -86,8 +84,6 @@ metadata:
8684
name: odiglet
8785
spec:
8886
initContainers:
89-
- name: init
90-
image: registry.odigos.io/odigos-odiglet:e2e-test
9187
- name: odigos-agents-image-pull
9288
image: registry.odigos.io/odigos-agents:e2e-test
9389
containers:

0 commit comments

Comments
 (0)