Skip to content

Commit e3aaa89

Browse files
darmachmnasiadka
authored andcommitted
Removing Tiller support
Removed Tiller support from Helm modules install kubernetes fragment. Change-Id: I81db0055ae82c64218498ae3e2a4fcc802f8d0e4
1 parent d544698 commit e3aaa89

File tree

10 files changed

+54
-376
lines changed

10 files changed

+54
-376
lines changed

doc/source/user/index.rst

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,6 @@ the table are linked to more details elsewhere in the user guide.
399399
+---------------------------------------+--------------------+---------------+
400400
| `k8s_keystone_auth_tag`_ | see below | see below |
401401
+---------------------------------------+--------------------+---------------+
402-
| `tiller_enabled`_ | - true | false |
403-
| | - false | |
404-
+---------------------------------------+--------------------+---------------+
405-
| `tiller_tag`_ | see below | "" |
406-
+---------------------------------------+--------------------+---------------+
407-
| `tiller_namespace`_ | see below | see below |
408-
+---------------------------------------+--------------------+---------------+
409402
| `helm_client_url`_ | see below | see below |
410403
+---------------------------------------+--------------------+---------------+
411404
| `helm_client_sha256`_ | see below | see below |
@@ -1404,22 +1397,6 @@ _`k8s_keystone_auth_tag`
14041397
Train default: v1.14.0
14051398
Ussuri default: v1.18.0
14061399

1407-
_`tiller_enabled`
1408-
If set to true, tiller will be deployed in the kube-system namespace.
1409-
Ussuri default: false
1410-
Train default: false
1411-
1412-
_`tiller_tag`
1413-
This label allows users to override the default container tag for Tiller.
1414-
For additional tags, `refer to Tiller page
1415-
<https://github.com/helm/helm/tags>`_ and look for tags<v3.0.0.
1416-
Train default: v2.12.3
1417-
Ussuri default: v2.16.7
1418-
1419-
_`tiller_namespace`
1420-
The namespace in which Tiller and Helm v2 chart install jobs are installed.
1421-
Default: magnum-tiller
1422-
14231400
_`helm_client_url`
14241401
URL of the helm client binary.
14251402
Default: ''
@@ -1431,8 +1408,7 @@ _`helm_client_sha256`
14311408
_`helm_client_tag`
14321409
This label allows users to override the default container tag for Helm
14331410
client. For additional tags, `refer to Helm client page
1434-
<https://github.com/helm/helm/tags>`_. You must use identical tiller_tag if
1435-
you wish to use Tiller (for helm_client_tag<v3.0.0).
1411+
<https://github.com/helm/helm/tags>`_.
14361412
Ussuri default: v3.2.1
14371413

14381414
_`master_lb_floating_ip_enabled`
@@ -1683,8 +1659,6 @@ _`ingress_controller`
16831659
Controller is configured. For more details about octavia-ingress-controller
16841660
please refer to `cloud-provider-openstack document
16851661
<https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/octavia-ingress-controller/using-octavia-ingress-controller.md>`_
1686-
To use 'nginx' ingress controller, tiller_enabled must be true when using
1687-
helm_client_tag<v3.0.0.
16881662

16891663
_`ingress_controller_role`
16901664
This label defines the role nodes should have to run an instance of the

doc/source/user/monitoring.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@ The installation of these services is controlled with the following labels:
2828
_`metrics_server_enabled`
2929
metrics_server_enabled is used to enable disable the installation of
3030
the metrics server.
31-
To use this service tiller_enabled must be true when using
32-
helm_client_tag<v3.0.0.
3331
Train default: true
3432
Stein default: true
3533

3634
_`monitoring_enabled`
3735
Enable installation of cluster monitoring solution provided by the
3836
stable/prometheus-operator helm chart.
39-
To use this service tiller_enabled must be true when using
40-
helm_client_tag<v3.0.0.
4137
Default: false
4238

4339
_`prometheus_adapter_enabled`

magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh

Lines changed: 0 additions & 237 deletions
This file was deleted.

0 commit comments

Comments
 (0)