diff --git a/Makefile b/Makefile index ed9a8fbd5eb..70ab7700266 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,10 @@ GOOS=linux CORE_IMAGES=./cmd/controller ./cmd/entrypoint ./cmd/kubeconfigwriter ./cmd/webhook ./cmd/imagedigestexporter ./cmd/pullrequest-init CORE_IMAGES_WITH_GIT=./cmd/git-init -ADDN_IMAGES=./vendor/github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher # For the custom ones that are not auto generated CORE_IMAGES_CUSTOMED=./cmd/nop -ALL_IMAGES=$(CORE_IMAGES) $(CORE_IMAGES_WITH_GIT) $(ADDN_IMAGES) $(CORE_IMAGES_CUSTOMED) +ALL_IMAGES=$(CORE_IMAGES) $(CORE_IMAGES_WITH_GIT) $(CORE_IMAGES_CUSTOMED) ## # You need to provide a RELEASE_VERSION when using targets like `push-image`, you can do it directly @@ -63,7 +62,6 @@ check-images: # Generate Dockerfiles used by ci-operator. The files need to be committed manually. generate-dockerfiles: @./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/Dockerfile.in openshift/ci-operator/tekton-images $(CORE_IMAGES) - @./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/Dockerfile.in openshift/ci-operator/tekton-images $(ADDN_IMAGES) @./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/Dockerfile-git.in openshift/ci-operator/tekton-images $(CORE_IMAGES_WITH_GIT) @echo "INFO: There is some custom images that are only updated manually in:"; \ echo " $(CORE_IMAGES_CUSTOMED)"; diff --git a/openshift/ci-operator/tekton-images/gcs-fetcher/Dockerfile b/openshift/ci-operator/tekton-images/gcs-fetcher/Dockerfile deleted file mode 100644 index 87b137d3a77..00000000000 --- a/openshift/ci-operator/tekton-images/gcs-fetcher/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -# Do not edit! This file was generated via Makefile -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest - -ADD gcs-fetcher /ko-app/gcs-fetcher -ENTRYPOINT ["/ko-app/gcs-fetcher"] diff --git a/openshift/resolve-yamls.sh b/openshift/resolve-yamls.sh index 512a5ec1d23..4f1f54b810e 100755 --- a/openshift/resolve-yamls.sh +++ b/openshift/resolve-yamls.sh @@ -75,14 +75,6 @@ function resolve_resources() { echo >>$resolved_file_name done - # handle additional images which are not build from ./cmd (images not in $CORE_IMAGES) - if [[ -n ${image_tag} ]];then - sed -i -r -e "s,github.com/tektoncd/pipeline/vendor/github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher,${registry_prefix}-gcs-fetcher:${image_tag},g" $resolved_file_name - else - sed -i -r -e "s,github.com/tektoncd/pipeline/vendor/github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher,${registry_prefix}:tektoncd-pipeline-gcs-fetcher,g" $resolved_file_name - fi -} - function generate_pipeline_resources() { local output_file=$1 local image_prefix=$2