Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
86c5d0f6
Commit
86c5d0f6
authored
Feb 27, 2018
by
Konrad Delong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added dashboard banner passthrough to GCE kube-up.
parent
5cff6c90
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
dashboard-controller.yaml
cluster/addons/dashboard/dashboard-controller.yaml
+1
-0
config-default.sh
cluster/gce/config-default.sh
+1
-1
config-test.sh
cluster/gce/config-test.sh
+1
-1
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+8
-0
No files found.
cluster/addons/dashboard/dashboard-controller.yaml
View file @
86c5d0f6
...
...
@@ -42,6 +42,7 @@ spec:
-
containerPort
:
8443
protocol
:
TCP
args
:
# PLATFORM-SPECIFIC ARGS HERE
-
--auto-generate-certificates
volumeMounts
:
-
name
:
kubernetes-dashboard-certs
...
...
cluster/gce/config-default.sh
View file @
86c5d0f6
...
...
@@ -374,7 +374,7 @@ HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}"
HEAPSTER_GCP_CPU_PER_NODE
=
"
${
HEAPSTER_GCP_CPU_PER_NODE
:-
0
.5
}
"
# Adding to PROVIDER_VARS, since this is GCP-specific.
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE"
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE
CUSTOM_KUBE_DASHBOARD_BANNER
"
# prometheus-to-sd configuration
PROMETHEUS_TO_SD_ENDPOINT
=
"
${
PROMETHEUS_TO_SD_ENDPOINT
:-
https
://monitoring.googleapis.com/
}
"
...
...
cluster/gce/config-test.sh
View file @
86c5d0f6
...
...
@@ -404,7 +404,7 @@ HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}"
HEAPSTER_GCP_CPU_PER_NODE
=
"
${
HEAPSTER_GCP_CPU_PER_NODE
:-
0
.5
}
"
# Adding to PROVIDER_VARS, since this is GCP-specific.
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE"
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
FLUENTD_GCP_VERSION FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUEST FLUENTD_GCP_MEMORY_REQUEST HEAPSTER_GCP_BASE_MEMORY HEAPSTER_GCP_MEMORY_PER_NODE HEAPSTER_GCP_BASE_CPU HEAPSTER_GCP_CPU_PER_NODE
CUSTOM_KUBE_DASHBOARD_BANNER
"
# prometheus-to-sd configuration
PROMETHEUS_TO_SD_ENDPOINT
=
"
${
PROMETHEUS_TO_SD_ENDPOINT
:-
https
://monitoring.googleapis.com/
}
"
...
...
cluster/gce/gci/configure-helper.sh
View file @
86c5d0f6
...
...
@@ -1997,6 +1997,12 @@ function update-event-exporter {
sed
-i
-e
"s@{{ *event_exporter_zone *}}@
${
ZONE
:-}
@g"
"
$1
"
}
function
update-dashboard-controller
{
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
}
# Sets up the manifests of coreDNS for k8s addons.
function
setup-coredns-manifest
{
local
-r
coredns_file
=
"
${
dst_dir
}
/dns/coredns.yaml"
...
...
@@ -2156,6 +2162,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
}
fi
if
[[
"
${
ENABLE_NODE_PROBLEM_DETECTOR
:-}
"
==
"daemonset"
]]
;
then
setup-addon-manifests
"addons"
"node-problem-detector"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment