Skip to content

Commit

Permalink
Removing Tiller support
Browse files Browse the repository at this point in the history
Removed Tiller support from Helm modules install kubernetes fragment.

Change-Id: I81db0055ae82c64218498ae3e2a4fcc802f8d0e4
(cherry picked from commit e3aaa89)
  • Loading branch information
darmach authored and mnasiadka committed Mar 28, 2024
1 parent 688e9f7 commit 4795099
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 374 deletions.
28 changes: 1 addition & 27 deletions doc/source/user/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,6 @@ the table are linked to more details elsewhere in the user guide.
+---------------------------------------+--------------------+---------------+
| `k8s_keystone_auth_tag`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `tiller_enabled`_ | - true | false |
| | - false | |
+---------------------------------------+--------------------+---------------+
| `tiller_tag`_ | see below | "" |
+---------------------------------------+--------------------+---------------+
| `tiller_namespace`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `helm_client_url`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `helm_client_sha256`_ | see below | see below |
Expand Down Expand Up @@ -1456,22 +1449,6 @@ _`k8s_keystone_auth_tag`
Train default: v1.14.0
Ussuri default: v1.18.0

_`tiller_enabled`
If set to true, tiller will be deployed in the kube-system namespace.
Ussuri default: false
Train default: false

_`tiller_tag`
This label allows users to override the default container tag for Tiller.
For additional tags, `refer to Tiller page
<https://github.com/helm/helm/tags>`_ and look for tags<v3.0.0.
Train default: v2.12.3
Ussuri default: v2.16.7

_`tiller_namespace`
The namespace in which Tiller and Helm v2 chart install jobs are installed.
Default: magnum-tiller

_`helm_client_url`
URL of the helm client binary.
Default: ''
Expand All @@ -1483,8 +1460,7 @@ _`helm_client_sha256`
_`helm_client_tag`
This label allows users to override the default container tag for Helm
client. For additional tags, `refer to Helm client page
<https://github.com/helm/helm/tags>`_. You must use identical tiller_tag if
you wish to use Tiller (for helm_client_tag<v3.0.0).
<https://github.com/helm/helm/tags>`_.
Ussuri default: v3.2.1

_`master_lb_floating_ip_enabled`
Expand Down Expand Up @@ -1715,8 +1691,6 @@ _`ingress_controller`
Controller is configured. For more details about octavia-ingress-controller
please refer to `cloud-provider-openstack document
<https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/octavia-ingress-controller/using-octavia-ingress-controller.md>`_
To use 'nginx' ingress controller, tiller_enabled must be true when using
helm_client_tag<v3.0.0.

_`ingress_controller_role`
This label defines the role nodes should have to run an instance of the
Expand Down
2 changes: 0 additions & 2 deletions doc/source/user/monitoring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ The installation of these services is controlled with the following labels:
_`metrics_server_enabled`
metrics_server_enabled is used to enable disable the installation of
the metrics server.
To use this service tiller_enabled must be true when using
helm_client_tag<v3.0.0.
Train default: true
Stein default: true

Expand Down

This file was deleted.

Loading

0 comments on commit 4795099

Please sign in to comment.