Merge pull request tektoncd#207 from chmouel/remove-bash-and-check-image

Remove bash and check removed images

Makefile

@@ -2,7 +2,7 @@
 
 CGO_ENABLED=0
 GOOS=linux
-CORE_IMAGES=./cmd/bash ./cmd/controller ./cmd/entrypoint ./cmd/gsutil ./cmd/kubeconfigwriter ./cmd/webhook ./cmd/imagedigestexporter ./cmd/pullrequest-init
+CORE_IMAGES=./cmd/controller ./cmd/entrypoint ./cmd/gsutil ./cmd/kubeconfigwriter ./cmd/webhook ./cmd/imagedigestexporter ./cmd/pullrequest-init
 CORE_IMAGES_WITH_GIT=./cmd/creds-init ./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
@@ -45,8 +45,22 @@ check-images:
 		echo "- Generate the dockerfiles by running 'make generate-dockerfiles'" ;\
 		echo "- Commit and PR these to 'openshift/release-next' remote/branch and 'openshift/master'" ;\
 		echo "- Make sure the images are added in the nightly quay jobs https://git.io/Jeu1I" ;\
+		echo "" ;\
 		exit 1 ;\
 	}
+	@notfound="" ;\
+	for cmd in $(ALL_IMAGES);do \
+		[[ -d $$cmd ]] || { \
+			echo "*ERROR*: $$cmd seems to have been removed from upstream" ;\
+			echo "" ;\
+			echo "- Remove the image name in one of the Makefile variable" ;\
+			echo "- Remove the image from the openshfit/release nightly https://git.io/Jez1j and variant https://git.io/JezMv" ;\
+			echo "- Remove the directory from openshift/ci-operator/knative-images/" ;\
+			echo "- Remove the image from the nightly quay job: https://git.io/Jeu1I" ;\
+			echo "" ;\
+			exit 1 ;\
+		} ;\
+	done
 .PHONY: check-images
 
 # Generate Dockerfiles used by ci-operator. The files need to be committed manually.

openshift/resolve-yamls.sh

@@ -14,11 +14,11 @@ 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/bash ./cmd/controller ./cmd/entrypoint ./cmd/gsutil ./cmd/kubeconfigwriter ./cmd/nop ./cmd/webhook ./cmd/imagedigestexporter
+  # CORE_IMAGES=./cmd/controller ./cmd/entrypoint ./cmd/gsutil ./cmd/kubeconfigwriter ./cmd/nop ./cmd/webhook ./cmd/imagedigestexporter
   # CORE_IMAGES_WITH_GIT=./cmd/creds-init ./cmd/git-init
   # to:
   #  % grep '^CORE_IMAGES' Makefile|sed -e 's/.*=//' -e 's,./cmd/,,g'|tr -d '\n'|sed -e 's/ /|/g' -e 's/^/(/' -e 's/$/)\n/'
-  # (bash|controller|entrypoint|gsutil|kubeconfigwriter|nop|webhook|imagedigestexportercreds-init|git-init)
+  # (controller|entrypoint|gsutil|kubeconfigwriter|nop|webhook|imagedigestexportercreds-init|git-init)
   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/')
@@ -73,4 +73,4 @@ function generate_pipeline_resources() {
       echo "---" >> $output_file
       cat ${yaml} >> $output_file
     done
-}
+}