Makefile,scripts: Remove references to handling OCP helm charts/manifests

- Remove the scripts/add_release_annotation.sh bash script as it only
  injects OCP-related annotations.
- Remove any Makefile conditional checks for the OCP platform when
  generating release manifests.

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

Makefile

@@ -29,12 +29,12 @@ GO := GO111MODULE=on GOFLAGS="$(MOD_FLAGS)" go
 GINKGO := $(GO) run github.com/onsi/ginkgo/ginkgo
 BINDATA := $(GO) run github.com/go-bindata/go-bindata/v3/go-bindata
 
-# ART builds are performed in dist-git, with content (but not commits) copied 
+# ART builds are performed in dist-git, with content (but not commits) copied
 # from the source repo. Thus at build time if your code is inspecting the local
-# git repo it is getting unrelated commits and tags from the dist-git repo, 
+# git repo it is getting unrelated commits and tags from the dist-git repo,
 # not the source repo.
-# For ART image builds, SOURCE_GIT_COMMIT, SOURCE_GIT_TAG, SOURCE_DATE_EPOCH 
-# variables are inserted in Dockerfile to enable recovering the original git 
+# For ART image builds, SOURCE_GIT_COMMIT, SOURCE_GIT_TAG, SOURCE_DATE_EPOCH
+# variables are inserted in Dockerfile to enable recovering the original git
 # metadata at build time.
 GIT_COMMIT := $(if $(SOURCE_GIT_COMMIT),$(SOURCE_GIT_COMMIT),$(shell git rev-parse HEAD))
 
@@ -223,7 +223,6 @@ release: ver=$(shell cat OLM_VERSION)
 release: manifests
 	docker pull quay.io/operator-framework/olm:v$(ver)
 	$(MAKE) target=upstream ver=$(ver) quickstart=true package
-	$(MAKE) target=ocp ver=$(ver) package
 
 verify-release: release diff
 
@@ -240,9 +239,6 @@ endif
 	$(YQ_INTERNAL) w -i deploy/$(target)/values.yaml package.image.ref $(olmref)
 	./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
 	ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
-ifeq ($(target), ocp)
-	./scripts/add_release_annotation.sh deploy/$(target)/manifests/$(ver) "$(YQ_INTERNAL)"
-endif
 ifeq ($(quickstart), true)
 	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
 endif

scripts/add_release_annotation.sh

@@ -12,4 +12,3 @@ for f in "${CRD_PATH}"/*.yaml ; do
     echo "copying ${f}"
     cp "${f}" "${SCRIPT_ROOT}/deploy/chart/crds/0000_50_olm_00-$(basename "$f" | sed 's/^.*_\([^.]\+\)\.yaml/\1.crd.yaml/')"
 done
-

scripts/copy_crds.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ ${#@} < 3 ]]; then
+if [[ ${#@} -lt 3 ]]; then
     echo "Usage: $0 concatenate OLM's Kubernetes manifests into a single YAML stream and writes the result to a file"
     echo "* dir: the input directory that contains OLM's Kubernetes manifests"
     echo "* out: the output file for the combined OLM Kubernetes manifest"
@@ -32,4 +32,3 @@ done
 echo "Wrote manifests to ${out} and ${outcrds}"
 
 cp scripts/install.sh ${outscript}
-