From 50b52c1c3fd3ec753c0fe6dcd8caa7780b178119 Mon Sep 17 00:00:00 2001 From: Chance Zibolski Date: Tue, 27 Nov 2018 10:54:01 -0800 Subject: [PATCH] hack,manifests: Move non-generated file out of manifests/deploy Other scripts override the DEPLOY_MANIFESTS_DIR since the content is auto-generated, so move the non-generated file so it can be referenced when DEPLOY_MANIFESTS_DIR is overriden. --- hack/lib/init.sh | 1 + hack/openshift-install.sh | 2 +- manifests/{deploy => rbac}/reporting-operator-clusterrole.yaml | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename manifests/{deploy => rbac}/reporting-operator-clusterrole.yaml (100%) diff --git a/hack/lib/init.sh b/hack/lib/init.sh index 5fce67d15..f26b88c28 100755 --- 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 index 1b5425848..434e30989 100755 --- 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/manifests/deploy/reporting-operator-clusterrole.yaml b/manifests/rbac/reporting-operator-clusterrole.yaml similarity index 100% rename from manifests/deploy/reporting-operator-clusterrole.yaml rename to manifests/rbac/reporting-operator-clusterrole.yaml