images: Move hubble-proto into cilium-builder

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>
cilium · May 20, 2021 · 2960b4e · 2960b4e
1 parent af183e0
commit 2960b4e
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 154 deletions.
diff --git a/images/README.md b/images/README.md
@@ -11,8 +11,8 @@ anyone reading this document should also read [`cilium/image-tools` documentatio
 
 This image is based on `runtime` image.
 
-It adds `protoc`, Go toolchain, and includes `ineffassign`. The aim is to
-include all the Go linters as well.
+It adds `protoc` and plugins, Go toolchain, and includes `ineffassign`.
+The aim is to include all the Go linters as well.
 
 ### [`runtime`](runtime/Dockerfile)
 

diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
@@ -58,6 +58,9 @@ RUN --mount=type=bind,readwrite,target=/go/src/github.com/cilium/cilium/images/b
 RUN --mount=type=bind,readwrite,target=/go/src/github.com/cilium/cilium/images/builder \
     ./install-protoc.sh
 
+RUN --mount=type=bind,readwrite,target=/go/src/github.com/cilium/cilium/images/builder \
+    ./install-protoplugins.sh
+
 # used to facilitate the verifier tests
 COPY --from=llvm-dist /usr/local/bin/llvm-objcopy /bin/
 

diff --git a/images/builder/install-protoc.sh b/images/builder/install-protoc.sh
@@ -18,4 +18,4 @@ unzip /tmp/protoc.zip -x readme.txt -d /usr/local
 
 # correct permissions for others
 chmod o+rx /usr/local/bin/protoc
-chmod o+rX -R /usr/local/include/google/protobuf
+chmod o+rX -R /usr/local/include/google/
diff --git a/images/builder/install-protoplugins.sh b/images/builder/install-protoplugins.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -o xtrace
+set -o errexit
+set -o pipefail
+set -o nounset
+
+# FIXME: Update these versions once etcd-client 3.5 is released.
+# These versions are pinned to support our older grpc-go 1.29 library,
+# which required to build the version of the etcd client used in Cilium.
+# See https://github.com/cilium/cilium/pull/13405#issuecomment-704766707
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@cee815d
+go install github.com/golang/protobuf/protoc-gen-go@v1.4.3
+go install github.com/mitchellh/protoc-gen-go-json@v1.0.0
diff --git a/images/cilium-test/Dockerfile b/images/cilium-test/Dockerfile
@@ -3,7 +3,7 @@
 # Copyright 2020-2021 Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:330ca61256fedd7b8cbfc34b31316c97d1880876@sha256:e535425dd77cf29f289fa402d8811491617e2b8fe741db4a36ca6acc590006c1
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:3e04d507e2f7a0b569490060ddc8b9423c9fc8f0@sha256:7949a297fd2f07a008ef8a163ed84bfb338a37f3b36b68c2c9c5fddb324d325f
 ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93
 
 FROM ${UBUNTU_IMAGE} as rootfs

diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile
@@ -3,7 +3,7 @@
 # Copyright 2020-2021 Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:330ca61256fedd7b8cbfc34b31316c97d1880876@sha256:e535425dd77cf29f289fa402d8811491617e2b8fe741db4a36ca6acc590006c1
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:3e04d507e2f7a0b569490060ddc8b9423c9fc8f0@sha256:7949a297fd2f07a008ef8a163ed84bfb338a37f3b36b68c2c9c5fddb324d325f
 ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:07ea8061d047c1085f99916c09d1d9b4c214040b@sha256:f3f8b38ab591055b94a1720d6cda0beabe75c65f2d74e32b65388e4333de7f2c
 
 # cilium-envoy from github.com/cilium/proxy

diff --git a/images/hubble-proto/Dockerfile b/images/hubble-proto/Dockerfile
diff --git a/images/hubble-proto/Makefile b/images/hubble-proto/Makefile
diff --git a/images/hubble-proto/Makefile.defs b/images/hubble-proto/Makefile.defs
diff --git a/images/hubble-proto/Makefile.docker b/images/hubble-proto/Makefile.docker
diff --git a/images/hubble-proto/install-glibc.sh b/images/hubble-proto/install-glibc.sh
diff --git a/images/hubble-proto/install-protoc.sh b/images/hubble-proto/install-protoc.sh
diff --git a/images/hubble-proto/install-protoplugins.sh b/images/hubble-proto/install-protoplugins.sh
diff --git a/test/k8sT/manifests/demo-customcalls.yaml b/test/k8sT/manifests/demo-customcalls.yaml
@@ -99,7 +99,7 @@ metadata:
 spec:
   containers:
   - name: cilium-builder
-    image: quay.io/cilium/cilium-builder:330ca61256fedd7b8cbfc34b31316c97d1880876@sha256:e535425dd77cf29f289fa402d8811491617e2b8fe741db4a36ca6acc590006c1
+    image: quay.io/cilium/cilium-builder:3e04d507e2f7a0b569490060ddc8b9423c9fc8f0@sha256:7949a297fd2f07a008ef8a163ed84bfb338a37f3b36b68c2c9c5fddb324d325f
     workingDir: /cilium
     command: ["sleep"]
     args:

diff --git a/test/k8sT/manifests/test-verifier.yaml b/test/k8sT/manifests/test-verifier.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: cilium-builder
-    image: quay.io/cilium/cilium-builder:330ca61256fedd7b8cbfc34b31316c97d1880876@sha256:e535425dd77cf29f289fa402d8811491617e2b8fe741db4a36ca6acc590006c1
+    image: quay.io/cilium/cilium-builder:3e04d507e2f7a0b569490060ddc8b9423c9fc8f0@sha256:7949a297fd2f07a008ef8a163ed84bfb338a37f3b36b68c2c9c5fddb324d325f
     workingDir: /cilium
     command: ["sleep"]
     args: