Dependabot hcsshim updates turned off #1036
Assignees
Milestone
Comments
jpayne3506
changed the title
|
The error seems to be coming from Ref for the changes in watcher: cilium/cilium@a7c3744#diff-de700d5d5ad261c8992314fc3b3414cc0ad58f907a80071f933278e09f114c4d. |
7 tasks
github-merge-queue bot
pushed a commit
that referenced
this issue
Apr 3, 2025
# Description Moving cilium from `v1.16.0-pre.1.0.20240403152809-b9853ecbcaeb` to top of the tree of main branch as it is blocking other package upgrades. As a result of that there is a major refactoring introduced in the codebase to accommodate the changes in Cillium. This pull request includes several changes to the `hubble` package and related files, focusing on improvements to the build process, dependency updates, and refactoring of the `hubble` integration. The most important changes are summarized below: ### Dependency Updates: * Updated the `k8s.io/client-go` dependency from version `v0.30.3` to `v0.32.3` in `go.mod`. * Updated the `github.com/AdaLogics/go-fuzz-headers` dependency to a newer version in `go.mod`. * Updated several other dependencies in `go.mod` to their latest versions. [[1]](diffhunk://#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6L36-R36) [[2]](diffhunk://#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6L45-R47) ### Refactoring and Code Cleanup: * Refactored imports and improved dependency management in `cmd/hubble/cells_linux.go`, `cmd/hubble/daemon_linux.go`, and `cmd/hubble/daemon_main_linux.go` to use the `hubblecell` package and other related packages. [[1]](diffhunk://#diff-34f9ff005ec325524611c6ffdc8f5854e36cc981f851de5348db0dc1ad3b79ddL10-L25) [[2]](diffhunk://#diff-ac5ea88a3aaa8e860f42e5243ee8924e41e1e1129548a3ac998da4dc24f46374L20-R28) [[3]](diffhunk://#diff-7b414b2b77ac018cf778290257b3cc7ad7d9b33bfc4776f1baf9aed8c2175e2dL12-R33) * Removed redundant configuration options related to `hubble` in `cmd/hubble/daemon_main_linux.go`. * Simplified the `Daemon` struct and its initialization in `cmd/hubble/daemon_linux.go` by incorporating the `hubble` integration directly. [[1]](diffhunk://#diff-ac5ea88a3aaa8e860f42e5243ee8924e41e1e1129548a3ac998da4dc24f46374L110-R112) [[2]](diffhunk://#diff-ac5ea88a3aaa8e860f42e5243ee8924e41e1e1129548a3ac998da4dc24f46374R128) These changes collectively improve the maintainability, performance, and functionality of the `hubble` package and its integration within the project. ## Related Issue #1036 #1010 #1009 #31 #874 ## Checklist - [X] I have read the [contributing documentation](https://retina.sh/docs/contributing). - [X] I signed and signed-off the commits (`git commit -S -s ...`). See [this documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification) on signing commits. - [X] I have correctly attributed the author(s) of the code. - [X] I have tested the changes locally. - [X] I have followed the project's style guidelines. - [X] I have updated the documentation, if necessary. - [X] I have added tests, if applicable. ## Screenshots (if applicable) or Testing Completed Was able to do `quick-build` and `quick-deploy` with the changes. ``` retina-agent-sqx4t 1/1 Running 0 2m26s 10.224.0.6 aks-nodepool1-15192462-vmss000000 <none> <none> retina-agent-t9pfh 1/1 Running 0 2m26s 10.224.0.5 aks-nodepool1-15192462-vmss000001 <none> <none> retina-agent-wvp2f 1/1 Running 0 2m26s 10.224.0.4 aks-nodepool1-15192462-vmss000002 <none> <none> retina-operator-657b5968d5-gjrwv 1/1 Running 0 2m26s 10.244.2.145 aks-nodepool1-15192462-vmss000001 <none> <none> ``` ## Additional Notes Add any additional notes or context about the pull request here. --- Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more information on how to contribute to this project. --------- Signed-off-by: Ritwik Ranjan <[email protected]> Co-authored-by: Anubhab Majumdar <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Describe the bug
#31 stopped minor version updates while still on
0.12.0-rc.3. Dependabot is now picking up0.13.0-rc.2instead of the latest within0.12.X(0.12.9) #1010Normal updating is blocked from potential indirect dependencies being built on top of causing image build errors in #1009. https://github.com/microsoft/retina/actions/runs/11864873863/job/33069095342#step:7:2570
Expected behavior
Update package out of release candidate usage.
Screenshots
Additional context
There are other dependabot package updates that are blocked in the image build process
The text was updated successfully, but these errors were encountered: