Skip to content

Conversation

tklauser
Copy link
Member

@tklauser tklauser commented Oct 22, 2024

@tklauser tklauser added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Oct 22, 2024
@tklauser tklauser marked this pull request as ready for review October 22, 2024 09:34
@tklauser tklauser requested review from a team as code owners October 22, 2024 09:34
@tklauser
Copy link
Member Author

/test-backport-1.14

@tklauser tklauser enabled auto-merge (rebase) October 22, 2024 09:34
mhofstetter and others added 4 commits October 23, 2024 10:28
[ upstream commit 9c1ef94 ]

Currently, failing attempts to obtain the eni link list while waiting for
net link devices are logged as error.

This leads to CI flakes due to the check `check-log-errors` in our test suite.

```
❌ Found 1 logs in cilium-cilium-9121495685-1.us-west-1.eksctl.io/kube-system/cilium-vkddg (cilium-agent) matching list of errors that must be investigated:
time="2024-05-17T01:39:54Z" level=error msg="failed to obtain eni link list" error="interrupted system call" subsys=ipam (1 occurrences)
```

Recent changes included this failure into the existing retry loop. Therefore it would
be sufficient to log this failure as warning (instead of an error). Exceeding the
retries would result in an error anyway.

Therefore, this commit lowers the loglevel from `error` to `warn` and improves
the log message by indicating the retry.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit a26427b ]

This is to avoid the below failure while chmod-ing symlink.

```
chmod: cannot operate on dangling symlink '/usr/local/bin/now'
```

Sample run: https://github.com/cilium/cilium/actions/runs/11343796440/job/31547213730?pr=35397

Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit e08929b ]

The jq flag 'argfile' has been removed. The solution is
to use slurpfile instead.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit f269eee ]

It is useful to keep the image digests as long as possible, thus this
commit removes the retention period of 10 days.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser force-pushed the pr/v1.14-backport-2024-10-22-11-34 branch from ba8d719 to 3af9552 Compare October 23, 2024 08:28
@tklauser
Copy link
Member Author

/test-backport-1.14

@tklauser tklauser merged commit ff9362d into v1.14 Oct 23, 2024
236 checks passed
@tklauser tklauser deleted the pr/v1.14-backport-2024-10-22-11-34 branch October 23, 2024 09:56
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants