Skip to content

Commit

Permalink
Merge pull request tektoncd#620 from pradeepitm12/remove-gcs-fetcher-…
Browse files Browse the repository at this point in the history
…image

remove gcs-fetcher image as removed in upstream
  • Loading branch information
openshift-merge-robot authored Mar 3, 2021
2 parents fd10e8a + 22fd981 commit f2de711
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)";
Expand Down
5 changes: 0 additions & 5 deletions openshift/ci-operator/tekton-images/gcs-fetcher/Dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions openshift/resolve-yamls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f2de711

Please sign in to comment.