Skip to content

Commit 99d40d3

Browse files
authored
Merge pull request kubernetes#80137 from ialidzhikov/enh/better-naming
Rename dashboard-controller.yaml to dashboard-deployment.yaml
2 parents d87403c + b3dcbbf commit 99d40d3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed
File renamed without changes.

cluster/gce/gci/configure-helper.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ function update-event-exporter {
21242124
sed -i -e "s@{{ exporter_sd_endpoint }}@${STACKDRIVER_ENDPOINT:-}@g" "$1"
21252125
}
21262126

2127-
function update-dashboard-controller {
2127+
function update-dashboard-deployment {
21282128
if [ -n "${CUSTOM_KUBE_DASHBOARD_BANNER:-}" ]; then
21292129
sed -i -e "s@\( \+\)# PLATFORM-SPECIFIC ARGS HERE@\1- --system-banner=${CUSTOM_KUBE_DASHBOARD_BANNER}\n\1- --system-banner-severity=WARNING@" "$1"
21302130
fi
@@ -2419,8 +2419,8 @@ EOF
24192419
fi
24202420
if [[ "${ENABLE_CLUSTER_UI:-}" == "true" ]]; then
24212421
setup-addon-manifests "addons" "dashboard"
2422-
local -r dashboard_controller_yaml="${dst_dir}/dashboard/dashboard-controller.yaml"
2423-
update-dashboard-controller ${dashboard_controller_yaml}
2422+
local -r dashboard_deployment_yaml="${dst_dir}/dashboard/dashboard-deployment.yaml"
2423+
update-dashboard-deployment ${dashboard_deployment_yaml}
24242424
fi
24252425
if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "daemonset" ]]; then
24262426
setup-addon-manifests "addons" "node-problem-detector"

hack/local-up-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ function start_kubedashboard {
881881
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-secret.yaml"
882882
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-configmap.yaml"
883883
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-rbac.yaml"
884-
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-controller.yaml"
884+
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-deployment.yaml"
885885
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" apply -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-service.yaml"
886886
echo "kubernetes-dashboard deployment and service successfully deployed."
887887
fi

0 commit comments

Comments
 (0)