.travis.yml,Makefile: add automatic scorecard image deployment (#952)

**Description of the change:** Build and push scorecard proxy images in travis


**Motivation for the change:** Closes #940

Author: AlexNPavel

.travis.yml

@@ -90,3 +90,10 @@ jobs:
       script:
         - make image/build/helm
         - make image/push/helm
+
+    # Build and deploy scorecard-proxy docker image
+    - <<: *deploy
+      name: Docker image for scorecard-proxy
+      script:
+        - make image/build/scorecard-proxy
+        - make image/push/scorecard-proxy

Makefile

@@ -16,9 +16,11 @@ PKGS = $(shell go list ./... | grep -v /vendor/)
 
 ANSIBLE_BASE_IMAGE = quay.io/operator-framework/ansible-operator
 HELM_BASE_IMAGE = quay.io/operator-framework/helm-operator
+SCORECARD_PROXY_BASE_IMAGE = quay.io/operator-framework/scorecard-proxy
 
 ANSIBLE_IMAGE ?= $(ANSIBLE_BASE_IMAGE)
 HELM_IMAGE ?= $(HELM_BASE_IMAGE)
+SCORECARD_PROXY_IMAGE ?= $(SCORECARD_PROXY_BASE_IMAGE)
 
 export CGO_ENABLED:=0
 
@@ -111,20 +113,26 @@ test/markdown:
 
 image: image/build image/push
 
-image/build: image/build/ansible image/build/helm
+image/build: image/build/ansible image/build/helm image/build/scorecard-proxy
 
 image/build/ansible: build/operator-sdk-dev-x86_64-linux-gnu
 	./hack/image/build-ansible-image.sh $(ANSIBLE_BASE_IMAGE):dev
 
 image/build/helm: build/operator-sdk-dev-x86_64-linux-gnu
 	./hack/image/build-helm-image.sh $(HELM_BASE_IMAGE):dev
 
-image/push: image/push/ansible image/push/helm
+image/build/scorecard-proxy:
+	./hack/image/build-scorecard-proxy-image.sh $(SCORECARD_PROXY_BASE_IMAGE):dev
+
+image/push: image/push/ansible image/push/helm image/push/scorecard-proxy
 
 image/push/ansible:
 	./hack/image/push-image-tags.sh $(ANSIBLE_BASE_IMAGE):dev $(ANSIBLE_IMAGE)
 
 image/push/helm:
 	./hack/image/push-image-tags.sh $(HELM_BASE_IMAGE):dev $(HELM_IMAGE)
 
+image/push/scorecard-proxy:
+	./hack/image/push-image-tags.sh $(SCORECARD_PROXY_BASE_IMAGE):dev $(SCORECARD_PROXY_IMAGE)
+
 .PHONY: image image/build image/build/ansible image/build/helm image/push image/push/ansible image/push/helm

commands/operator-sdk/cmd/scorecard.go

@@ -15,10 +15,14 @@
 package cmd
 
 import (
+	"fmt"
+	"strings"
+
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	"github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd/scorecard"
+	"github.com/operator-framework/operator-sdk/version"
 )
 
 func NewScorecardCmd() *cobra.Command {
@@ -39,7 +43,7 @@ func NewScorecardCmd() *cobra.Command {
 	scorecardCmd.Flags().StringVar(&scorecard.SCConf.NamespacedManifest, "namespaced-manifest", "", "Path to manifest for namespaced resources (e.g. RBAC and Operator manifest)")
 	scorecardCmd.Flags().StringVar(&scorecard.SCConf.GlobalManifest, "global-manifest", "", "Path to manifest for Global resources (e.g. CRD manifests)")
 	scorecardCmd.Flags().StringVar(&scorecard.SCConf.CRManifest, "cr-manifest", "", "Path to manifest for Custom Resource")
-	scorecardCmd.Flags().StringVar(&scorecard.SCConf.ProxyImage, "proxy-image", "quay.io/operator-framework/scorecard-proxy", "Image name for scorecard proxy")
+	scorecardCmd.Flags().StringVar(&scorecard.SCConf.ProxyImage, "proxy-image", fmt.Sprintf("quay.io/operator-framework/scorecard-proxy:%s", strings.TrimSuffix(version.Version, "+git")), "Image name for scorecard proxy")
 	scorecardCmd.Flags().StringVar(&scorecard.SCConf.ProxyPullPolicy, "proxy-pull-policy", "Always", "Pull policy for scorecard proxy image")
 	scorecardCmd.Flags().BoolVar(&scorecard.SCConf.Verbose, "verbose", false, "Enable verbose logging")
 	// Since it's difficult to handle multiple CRs, we will require users to specify what CR they want to test; we can handle this better in the future