Merge branch 'master' into release-0.11

* master: hack/deploy-custom.sh: Stop copying clusterrole now that it lives in new directory
kube-reporting · Nov 27, 2018 · 0a46737 · 0a46737
2 parents 3a6c743 + f31ded9
commit 0a46737
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/hack/deploy-custom.sh b/hack/deploy-custom.sh
@@ -115,10 +115,6 @@ echo "Creating metering manifests"
 export MANIFEST_OUTPUT_DIR="$CUSTOM_DEPLOY_MANIFESTS_DIR"
 "$ROOT_DIR/hack/create-metering-manifests.sh"
 
-cp \
-    "${DEPLOY_MANIFESTS_DIR}/reporting-operator-clusterrole.yaml" \
-    "$CUSTOM_DEPLOY_MANIFESTS_DIR"
-
 echo "Deploying"
 export DEPLOY_MANIFESTS_DIR="$CUSTOM_DEPLOY_MANIFESTS_DIR"
 "${ROOT_DIR}/hack/deploy.sh"