Merge branch 'master' into release-0.11

* master: hack,manifests: Move non-generated file out of manifests/deploy
kube-reporting · Nov 27, 2018 · 3a6c743 · 3a6c743
2 parents 0674957 + 50b52c1
commit 3a6c743
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
@@ -24,6 +24,7 @@ source "${ROOT_DIR}/hack/lib/version.sh"
 METERING_NAMESPACE=$(sanetize_namespace "${METERING_NAMESPACE:-metering}")
 
 : "${DEPLOY_MANIFESTS_DIR:=$MANIFESTS_DIR/deploy}"
+: "${RBAC_MANIFESTS_DIR:=$MANIFESTS_DIR/rbac}"
 : "${INSTALLER_MANIFESTS_DIR:=$DEPLOY_MANIFESTS_DIR/$DEPLOY_PLATFORM/helm-operator}"
 : "${ALM_MANIFESTS_DIR:=$MANIFESTS_DIR/deploy/$DEPLOY_PLATFORM/alm}"
 : "${METERING_CR_FILE:=$INSTALLER_MANIFESTS_DIR/metering.yaml}"

diff --git a/hack/openshift-install.sh b/hack/openshift-install.sh
@@ -11,7 +11,7 @@ if [ "$METERING_INSTALL_REPORTING_OPERATOR_EXTRA_CLUSTERROLEBINDING" == "true" ]
     echo "Creating ClusterRole for reporting-operator"
     kubectl \
         apply -f \
-        "${DEPLOY_MANIFESTS_DIR}/reporting-operator-clusterrole.yaml"
+        "${RBAC_MANIFESTS_DIR}/reporting-operator-clusterrole.yaml"
 
     echo "Creating ClusterRoleBinding for reporting-operator"
     kubectl \

diff --git a/...eploy/reporting-operator-clusterrole.yaml → .../rbac/reporting-operator-clusterrole.yaml b/...eploy/reporting-operator-clusterrole.yaml → .../rbac/reporting-operator-clusterrole.yaml