Skip to content

Commit 0d16e90

Browse files
Merge pull request #528 from danifr/dashboard_download_url
Support for kubernetes dashboard version 2.0.0 and onwards
2 parents 070824b + d097cf7 commit 0d16e90

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

manifests/init.pp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@
328328
#
329329
# [*kubernetes_dashboard_url*]
330330
# The URL to get the Kubernetes Dashboard yaml file.
331-
# Defaults to the upstream source. `kube_tool` sets this value.
331+
# Default is based on dashboard_version.
332332
#
333333
# [*dashboard_version*]
334334
# The version of Kubernetes dashboard you want to install.
335-
# Defaults to v1.10.1
335+
# Defaults to 1.10.1
336336
#
337337
# [*schedule_on_controller*]
338338
# A flag to remove the control plane role and allow pod scheduling on controllers
@@ -579,9 +579,8 @@
579579
Optional[String] $cni_provider = undef,
580580
Optional[String] $cni_rbac_binding = undef,
581581
Boolean $install_dashboard = false,
582-
String $dashboard_version = 'v1.10.1',
583-
String $kubernetes_dashboard_url =
584-
"https://raw.githubusercontent.com/kubernetes/dashboard/${dashboard_version}/src/deploy/recommended/kubernetes-dashboard.yaml",
582+
String $dashboard_version = '1.10.1',
583+
Optional[String] $kubernetes_dashboard_url = undef,
585584
Boolean $schedule_on_controller = false,
586585
Integer $api_server_count = undef,
587586
Boolean $delegated_pki = false,
@@ -684,6 +683,12 @@
684683
notify { "The OS family ${facts['os']['family']} is not supported by this module": }
685684
}
686685

686+
if versioncmp($dashboard_version, '2.0.0') >= 0 {
687+
$dashboard_url = pick($kubernetes_dashboard_url, "https://raw.githubusercontent.com/kubernetes/dashboard/v${dashboard_version}/aio/deploy/recommended.yaml")
688+
} else {
689+
$dashboard_url = pick($kubernetes_dashboard_url, "https://raw.githubusercontent.com/kubernetes/dashboard/v${dashboard_version}/src/deploy/recommended/kubernetes-dashboard.yaml")
690+
}
691+
687692
# Some cloud providers override or fix the node name, so we can't override
688693
case $cloud_provider {
689694
# k8s controller in AWS with delete any nodes it can't query in the metadata

manifests/kube_addons.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
Optional[String] $cni_rbac_binding = $kubernetes::cni_rbac_binding,
99
Boolean $install_dashboard = $kubernetes::install_dashboard,
1010
String $dashboard_version = $kubernetes::dashboard_version,
11+
String $dashboard_url = $kubernetes::dashboard_url,
1112
String $kubernetes_version = $kubernetes::kubernetes_version,
12-
String $kubernetes_dashboard_url = $kubernetes::kubernetes_dashboard_url,
1313
Boolean $controller = $kubernetes::controller,
1414
Optional[Boolean] $schedule_on_controller = $kubernetes::schedule_on_controller,
1515
String $node_name = $kubernetes::node_name,
@@ -86,7 +86,7 @@
8686
}
8787

8888
if $install_dashboard {
89-
$shellsafe_source = shell_escape($kubernetes_dashboard_url)
89+
$shellsafe_source = shell_escape($dashboard_url)
9090
exec { 'Install Kubernetes dashboard':
9191
command => "kubectl apply -f ${shellsafe_source}",
9292
onlyif => 'kubectl get nodes',

spec/classes/kube_addons_spec.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
'cni_rbac_binding' => 'foo',
2222
'cni_network_provider' => 'https://foo.test',
2323
'install_dashboard' => false,
24-
'dashboard_version' => 'v1.10.1',
2524
'kubernetes_version' => '1.10.2',
2625
'schedule_on_controller' => true,
2726
'node_name' => 'foo',
@@ -43,7 +42,6 @@
4342
'cni_network_provider' => 'https://foo.test',
4443
'cni_provider' => 'calico',
4544
'install_dashboard' => false,
46-
'dashboard_version' => 'v1.10.1',
4745
'kubernetes_version' => '1.10.2',
4846
'node_name' => 'foo',
4947
}
@@ -63,7 +61,6 @@
6361
'cni_network_provider' => 'https://foo.test',
6462
'cni_provider' => 'calico-tigera',
6563
'install_dashboard' => false,
66-
'dashboard_version' => 'v1.10.1',
6764
'kubernetes_version' => '1.10.2',
6865
'node_name' => 'foo',
6966
}
@@ -82,7 +79,6 @@
8279
'cni_network_provider' => 'https://foo.test',
8380
'install_dashboard' => false,
8481
'kubernetes_version' => '1.10.2',
85-
'dashboard_version' => 'v1.10.1',
8682
'schedule_on_controller' => false,
8783
'node_name' => 'foo',
8884
}
@@ -97,7 +93,7 @@
9793
'cni_network_provider' => 'https://foo.test',
9894
'install_dashboard' => true,
9995
'kubernetes_version' => '1.10.2',
100-
'dashboard_version' => 'v1.10.1',
96+
'dashboard_version' => '1.10.1',
10197
'schedule_on_controller' => false,
10298
'node_name' => 'foo',
10399
}

0 commit comments

Comments
 (0)