images: Move hubble-proto into cilium-builder #16217
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gandro
added
release-note/misc
gandro
force-pushed
the
pr/gandro/move-protoplugins-to-builder
branch
from
6743e5d
to
924e7f0
Compare
This commit consolidates the `hubble-proto` image (used to build the Hubble protobuf definitions) and the `cilium-builder` image. While this increases the download size for developers just needing to regenerate the Hubble API definitions, removing `hubble-proto` reduces the maintenance overhead of our developer images (for example, `hubble-proto` currently lacks the required GitHub Action to build and push it to docker.io). The new api/v1/Makefile using this image will is added in a subsequent commit. Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
This replaces the current use of `hubble-proto` with `cilium-builder`. The generated files remain functionaly the same as the used plugin versions have not changed. The only difference in the output comes from the fact that `cilium-builder` installs the plugins via `go install` instead of `go get`. Therefore, the dependency set of the three built protoc plugins are not merged as they were in `hubble proto` due to it building them in a ad-hoc go module. Therefore `protoc-gen-go-grpc` is using the `protoc-gen-go` version specified in its go.mod file, which is slightly older than what was used before, but this has no effect on the generated Go lang source as the two versions are compatible. Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
gandro
force-pushed
the
pr/gandro/move-protoplugins-to-builder
branch
from
924e7f0
to
f79c5f6
Compare
maintainer-s-little-helper
bot
assigned nathanjsweet, nebril and glibsm and unassigned glibsm
rolinh
approved these changes
May 19, 2021
| cilium/hubble-proto:${version} | ||
| $(QUIET)$(CONTAINER_ENGINE) container run --rm \ | ||
| --volume $(CURDIR):/src \ | ||
| --user "$(shell id -u):$(shell id -g)" \ |
There was a problem hiding this comment.
Thanks for this, running as a regular user is definitely something we want (it was also part of my old draft PR #13405).
gandro
added a commit
to cilium/packer-ci-build
that referenced
this pull request
May 19, 2021
Based on cilium/cilium#16217 Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
|
test-me-please |
|
test-1.19-5.4 hit https://jenkins.cilium.io/job/Cilium-PR-K8s-1.19-kernel-5.4/143/ #16122 |
|
test-runtime hit https://jenkins.cilium.io/job/Cilium-PR-Runtime-4.9/4752/ #15604 |
|
test-1.16-netnext hit https://jenkins.cilium.io/job/Cilium-PR-K8s-1.16-net-next/564/ #15775 |
|
All required tests have passed. Marking as ready for merge. GH Actions seems stuck in the non-required ones, so the bot is unable to add the label itself. The |
gandro
added
the
ready-to-merge
tklauser
pushed a commit
to cilium/packer-ci-build
that referenced
this pull request
May 25, 2021
Based on cilium/cilium#16217 Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit consolidates the
hubble-protoimage (used to build theHubble protobuf definitions) and the
cilium-builderimage. While thisincreases the download size for developers just needing to regenerate
the Hubble API definitions, removing
hubble-protoreduces themaintenance overhead of our developer images (for example, it currently
lacks the required GitHub Action to build and push it to docker.io).