Merge branch 'master' into refactor/controller-runtime-v0.2.0

Author: estroz

CHANGELOG.md

@@ -7,6 +7,8 @@
 
 ### Changed
 
+- Make `ready` package idempotent. Now, a user can call `Set()` or `Unset()` to set the operator's readiness without knowing the current state. ([#1761](https://github.com/operator-framework/operator-sdk/pull/1761))
+
 ### Breaking changes
 
 - CSV config field `role-path` is now `role-paths` and takes a list of strings. Users can now specify multiple `Role` and `ClusterRole` manifests using `role-paths`. ([#1704](https://github.com/operator-framework/operator-sdk/pull/1704))
@@ -39,6 +41,8 @@
 
 ### Bug Fixes
 
+- Check if `metadata.annotations['alm-examples']` is non-empty before creating contained CR manifests in the scorecard. ([#1789](https://github.com/operator-framework/operator-sdk/pull/1789))
+
 ## v0.9.0
 
 ### Added

Makefile

@@ -110,12 +110,18 @@ test/unit:
 
 test/subcommand: test/subcommand/test-local test/subcommand/scorecard test/subcommand/alpha-olm
 
+test/subcommand2:
+	./ci/tests/subcommand.sh
+
 test/subcommand/test-local:
 	./hack/tests/test-subcommand.sh
 
 test/subcommand/scorecard:
 	./hack/tests/scorecard-subcommand.sh
 
+test/subcommand/scorecard2:
+	./ci/tests/scorecard-subcommand.sh
+
 test/subcommand/alpha-olm:
 	./hack/tests/alpha-olm-subcommands.sh
 

ci/dockerfiles/scorecard-proxy.Dockerfile

@@ -0,0 +1,19 @@
+FROM osdk-builder as builder
+
+RUN ci/tests/scorecard-proxy-scaffold.sh
+
+FROM registry.access.redhat.com/ubi7/ubi-minimal:latest
+
+ENV PROXY=/usr/local/bin/scorecard-proxy \
+    USER_UID=1001 \
+    USER_NAME=proxy
+
+# install operator binary
+COPY --from=builder /scorecard/scorecard-proxy ${PROXY}
+
+COPY --from=builder /scorecard/bin /usr/local/bin
+RUN  /usr/local/bin/user_setup
+
+ENTRYPOINT ["/usr/local/bin/entrypoint"]
+
+USER ${USER_UID}

ci/tests/scorecard-proxy-scaffold.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -eux
+
+ROOTDIR="$(pwd)"
+SCORECARD_DIR="/scorecard"
+
+mkdir -p $SCORECARD_DIR
+
+GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
+  go build \
+  -gcflags "all=-trimpath=${ROOTDIR}" \
+  -asmflags "all=-trimpath=${ROOTDIR}" \
+  -o $SCORECARD_DIR/scorecard-proxy \
+  images/scorecard-proxy/cmd/proxy/main.go
+mv images/scorecard-proxy/bin $SCORECARD_DIR/bin

ci/tests/scorecard-subcommand.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+component="scorecard-proxy"
+eval IMAGE=$IMAGE_FORMAT
+CSV_PATH="deploy/olm-catalog/memcached-operator/0.0.3/memcached-operator.v0.0.3.clusterserviceversion.yaml"
+CONFIG_PATH=".test-osdk-scorecard.yaml"
+
+set -ex
+
+# the test framework directory has all the manifests needed to run the cluster
+pushd test/test-framework
+commandoutput="$(operator-sdk scorecard \
+  --cr-manifest deploy/crds/cache_v1alpha1_memcached_cr.yaml \
+  --cr-manifest deploy/crds/cache_v1alpha1_memcachedrs_cr.yaml \
+  --init-timeout 60 \
+  --csv-path "$CSV_PATH" \
+  --verbose \
+  --proxy-image "$IMAGE" \
+  2>&1)"
+echo $commandoutput | grep "Total Score: 82%"
+
+# test config file
+commandoutput2="$(operator-sdk scorecard \
+  --proxy-image "$IMAGE" \
+  --config "$CONFIG_PATH")"
+# check basic suite
+echo $commandoutput2 | grep '^.*"error": 0,[[:space:]]"pass": 3,[[:space:]]"partialPass": 0,[[:space:]]"fail": 0,[[:space:]]"totalTests": 3,[[:space:]]"totalScorePercent": 100,.*$'
+# check olm suite
+echo $commandoutput2 | grep '^.*"error": 0,[[:space:]]"pass": 2,[[:space:]]"partialPass": 3,[[:space:]]"fail": 0,[[:space:]]"totalTests": 5,[[:space:]]"totalScorePercent": 74,.*$'
+# check custom json result
+echo $commandoutput2 | grep '^.*"error": 0,[[:space:]]"pass": 1,[[:space:]]"partialPass": 1,[[:space:]]"fail": 0,[[:space:]]"totalTests": 2,[[:space:]]"totalScorePercent": 71,.*$'
+popd

ci/tests/subcommand.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+source hack/lib/test_lib.sh
+
+set -eux
+
+ROOTDIR="$(pwd)"
+mkdir -p $ROOTDIR/bin
+export PATH=$ROOTDIR/bin:$PATH
+
+if ! [ -x "$(command -v kubectl)" ]; then
+    curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.2/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl bin/
+fi
+
+if ! [ -x "$(command -v oc)" ]; then
+    curl -Lo oc.tar.gz https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz
+    tar xvzOf oc.tar.gz openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit/oc > oc && chmod +x oc && mv oc bin/ && rm oc.tar.gz
+fi
+
+oc version
+
+make install
+
+./hack/tests/test-subcommand.sh
+./ci/tests/scorecard-subcommand.sh
+# This can't run in openshift-ci because the test cluster already has OLM installed.
+#./hack/tests/alpha-olm-subcommands.sh

cmd/operator-sdk/main.go

@@ -145,7 +145,7 @@ func checkDepManager(dm projutil.DepManagerType) error {
 		}
 		if !goModOn {
 			return fmt.Errorf(`dependency manager "modules" requires working directory to be in $GOPATH/src` +
-				` and GO111MODULE=on, or outside of $GOPATH/src and GO111MODULE="on", "auto", or unset`)
+				` and GO111MODULE=on, or outside of $GOPATH/src and GO111MODULE="on", "auto", or unset. More info: https://github.com/operator-framework/operator-sdk/blob/master/doc/user-guide.md#go-modules`)
 		}
 	case projutil.DepManagerDep:
 		inGopathSrc, err := projutil.WdInGoPathSrc()

cmd/operator-sdk/new/cmd.go

@@ -189,7 +189,7 @@ func doGoScaffold() error {
 			return merr
 		} else if !goModOn {
 			return errors.New(`dependency manager "modules" requires working directory to be in $GOPATH/src` +
-				` and GO111MODULE=on, or outside of $GOPATH/src and GO111MODULE="on", "auto", or unset`)
+				` and GO111MODULE=on, or outside of $GOPATH/src and GO111MODULE="on", "auto", or unset. More info: https://github.com/operator-framework/operator-sdk/blob/master/doc/user-guide.md#go-modules`)
 		}
 		err = s.Execute(cfg, &scaffold.GoMod{}, &scaffold.Tools{})
 	default: