From e9134f61868766323da1e59772add1178622043c Mon Sep 17 00:00:00 2001 From: Piyush Garg Date: Fri, 8 Jan 2021 14:03:17 +0530 Subject: [PATCH] Update scripts for cmd added upstream --- Makefile | 2 +- .../ci-operator/tekton-images/interceptors/Dockerfile | 5 +++++ openshift/resolve-yamls.sh | 8 +++++--- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 openshift/ci-operator/tekton-images/interceptors/Dockerfile diff --git a/Makefile b/Makefile index 26cf1f3fa..d2273c4e0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ CGO_ENABLED=0 GOOS=linux -CORE_IMAGES=./cmd/controller ./cmd/eventlistenersink ./cmd/webhook +CORE_IMAGES=./cmd/controller ./cmd/eventlistenersink ./cmd/webhook ./cmd/interceptors ## # You need to provide a RELEASE_VERSION when using targets like `push-image`, you can do it directly diff --git a/openshift/ci-operator/tekton-images/interceptors/Dockerfile b/openshift/ci-operator/tekton-images/interceptors/Dockerfile new file mode 100644 index 000000000..c3f1ec91b --- /dev/null +++ b/openshift/ci-operator/tekton-images/interceptors/Dockerfile @@ -0,0 +1,5 @@ +# Do not edit! This file was generated via Makefile +FROM registry.access.redhat.com/ubi8/ubi-minimal:latest + +ADD interceptors /ko-app/interceptors +ENTRYPOINT ["/ko-app/interceptors"] diff --git a/openshift/resolve-yamls.sh b/openshift/resolve-yamls.sh index 3bc6d97a0..37a75805a 100755 --- a/openshift/resolve-yamls.sh +++ b/openshift/resolve-yamls.sh @@ -11,10 +11,10 @@ function resolve_resources() { # This would get only one set of truth from the Makefile for the image lists # # % grep "^CORE_IMAGES" Makefile - # CORE_IMAGES=./cmd/controller ./cmd/webhook ./cmd/eventlistener + # CORE_IMAGES=./cmd/controller ./cmd/webhook ./cmd/eventlistenersink ./cmd/interceptors # to: # % grep '^CORE_IMAGES' Makefile|sed -e 's/.*=//' -e 's,./cmd/,,g'|tr -d '\n'|sed -e 's/ /|/g' -e 's/^/(/' -e 's/$/)\n/' - # (controller|webhook|eventlistener) + # (controller|webhook|eventlistenersink/interceptors) local image_regexp=$(grep '^CORE_IMAGES' $(git rev-parse --show-toplevel)/Makefile| \ sed -e 's/.*=//' -e 's,./cmd/,,g'|tr '\n' ' '| \ sed -e 's/ /|/g' -e 's/^/(/' -e 's/|$/)\n/') @@ -40,9 +40,11 @@ function resolve_resources() { >>$resolved_file_name fi - # Remove runAsUser: id, openshift takes care of randoming them and we dont need a fixed uid for that + # Remove runAsUser: id and runAsGroup: id, openshift takes care of randoming them and we dont need a fixed uid for that sed -i '/runAsUser: [0-9]*/d' ${resolved_file_name} + sed -i '/runAsGroup: [0-9]*/d' ${resolved_file_name} + echo >>$resolved_file_name done }