diff --git a/cluster/addons/dashboard/dashboard-controller.yaml b/cluster/addons/dashboard/dashboard-deployment.yaml similarity index 100% rename from cluster/addons/dashboard/dashboard-controller.yaml rename to cluster/addons/dashboard/dashboard-deployment.yaml diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index eabd82d9796..b92ff6d8833 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -2124,7 +2124,7 @@ function update-event-exporter { sed -i -e "s@{{ exporter_sd_endpoint }}@${STACKDRIVER_ENDPOINT:-}@g" "$1" } -function update-dashboard-controller { +function update-dashboard-deployment { if [ -n "${CUSTOM_KUBE_DASHBOARD_BANNER:-}" ]; then sed -i -e "s@\( \+\)# PLATFORM-SPECIFIC ARGS HERE@\1- --system-banner=${CUSTOM_KUBE_DASHBOARD_BANNER}\n\1- --system-banner-severity=WARNING@" "$1" fi @@ -2419,8 +2419,8 @@ EOF fi if [[ "${ENABLE_CLUSTER_UI:-}" == "true" ]]; then setup-addon-manifests "addons" "dashboard" - local -r dashboard_controller_yaml="${dst_dir}/dashboard/dashboard-controller.yaml" - update-dashboard-controller ${dashboard_controller_yaml} + local -r dashboard_deployment_yaml="${dst_dir}/dashboard/dashboard-deployment.yaml" + update-dashboard-deployment ${dashboard_deployment_yaml} fi if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "daemonset" ]]; then setup-addon-manifests "addons" "node-problem-detector" diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 787418c2625..17897d9c891 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -881,7 +881,7 @@ function start_kubedashboard { ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-secret.yaml" ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-configmap.yaml" ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-rbac.yaml" - ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-controller.yaml" + ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-deployment.yaml" ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-service.yaml" echo "kubernetes-dashboard deployment and service successfully deployed." fi