Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update messaging around Helm 2 & 3 #738

Merged
merged 1 commit into from
Mar 4, 2020
Merged

Update messaging around Helm 2 & 3 #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions xml/cap_depl_install_caasp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,10 @@
<screen>&prompt.user;sudo zypper install helm</screen>
<para>
Alternatively, refer to the upstream documentation at
<link xlink:href="https://docs.helm.sh/using_helm/#installing-helm"/>. Usage
with &cap; requires &helm; 2 and/or iterations of its minor releases.
Compatibility between &cap; and &helm; 3 is not supported.
<link xlink:href="https://docs.helm.sh/using_helm/#installing-helm"/>. &cap;
is compatible with both &helm; 2 and &helm; 3. Examples in this guide are
based on &helm; 2. To use &helm; 3, refer to the &helm; documentation at
<link xlink:href="https://helm.sh/docs/"/>.
</para>
<para>
&tiller;, the &helm; server component, needs to be installed on your &kube;
Expand Down
6 changes: 0 additions & 6 deletions xml/cap_kube_requirements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,6 @@
<literal>containerd</literal> service definition must be set to infinity
</para>
</listitem>
<listitem>
<para>
Usage with &cap; requires &helm; 2 and/or iterations of its minor releases.
Compatibility between &cap; and &helm; 3 is not supported.
</para>
</listitem>
<listitem>
<para>
Helm's &tiller; has to be installed and active, with &tiller; on the &kube;
Expand Down
7 changes: 4 additions & 3 deletions xml/repeated-content-decl.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,9 +608,10 @@ suse/uaa &latestscfchart; &chart-appversion;
<para>
The &helm; client, <literal>helm</literal>, can be installed on your remote
administration computer by referring to the documentation at
<link xlink:href="https://v2.helm.sh/docs/using_helm/#installing-helm"/>. Usage
with &cap; requires &helm; 2 and/or iterations of its minor releases.
Compatibility between &cap; and &helm; 3 is not supported.
<link xlink:href="https://v2.helm.sh/docs/using_helm/#installing-helm"/>.
&cap; is compatible with both &helm; 2 and &helm; 3. Examples in this guide
are based on &helm; 2. To use &helm; 3, refer to the &helm; documentation at
<link xlink:href="https://helm.sh/docs/"/>.
</para>
<para>
&tiller;, the &helm; server component, needs to be installed on your &kube;
Expand Down