Skip to content

Commit

Permalink
Resolving conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@harneshalaka
harneshalaka committed Sep 26, 2024
1 parent 55c8815 commit 12571a1
Show file tree
Hide file tree
Showing 10 changed files with 2,556 additions and 389 deletions.
Binary file removed images/src/png/vm_security_create_vm.png
View file
Binary file not shown.
Binary file removed images/src/png/vm_security_create_vm_details.png
View file
Binary file not shown.
Binary file removed images/src/png/vm_security_create_vm_xml.png
View file
Binary file not shown.
211 changes: 31 additions & 180 deletions xml/art_modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,35 @@
This module contains packages relating to containers, including the container engine and
core container-related tools such as on-premise registry.
</para>
<note>
<title><package>docker-stable</package></title>
<para>
&suse; ships a package named <package>docker-stable</package>, based on selected versions
of the the Moby project, which is the upstream for <phrase
role="productname">&docker;</phrase>. When this version is no longer supported by the Moby
project, &suse; will provide reactive support for an additional 3 years, which may require
a LTSS subscription depending on the lifecycle of the underlying product.
</para>
</note>
<warning>
<title>Migration from <package>docker</package> to <package>docker-stable</package></title>
<para>
In alignment with Moby project practices, &suse; neither tests nor supports downgrading
<package>docker</package> to older versions. This policy is particularly relevant when
considering a migration from the latest <package>docker</package> package to the
<package>docker-stable</package> package, which in most cases would be an older version.
Such a downgrade can result in unexpected side effects, compatibility issues and even
disruptions to container production environments, and is not recommended for production
systems.
</para>
</warning>
<important>
<title>&docker; Swarm is not supported</title>
<para>
&suse; does not provide any support related to use of <phrase role="productname">&docker;
Swarm</phrase> orchestration. Related packages are shipped for customer convenience only.
</para>
</important>
<itemizedlist>
<listitem>
<para>
Expand All @@ -399,7 +428,8 @@
</listitem>
<listitem>
<para>
<emphasis role="bold">Lifecycle:</emphasis> 10 years
<emphasis role="bold">Lifecycle:</emphasis> By package; follows the upstream community
of the respective package.
</para>
</listitem>
<listitem>
Expand Down Expand Up @@ -460,185 +490,6 @@
for compiling and debugging applications. Replaces the former Software Development Kit
(SDK).
</para>
<note>
<title>Updated versions for certain packages</title>
<para>
For the following packages, &suse; reserves the right to stop supporting a version after
releasing a newer one, following the respective upstream community:
</para>
<itemizedlist>
<listitem>
<para>
<package>aardvark-dns</package>
</para>
</listitem>
<listitem>
<para>
<package>bmake</package>
</para>
</listitem>
<listitem>
<para>
<package>buildah</package>
</para>
</listitem>
<listitem>
<para>
<package>containerd-ctr</package>
</para>
</listitem>
<listitem>
<para>
<package>containerd-devel</package>
</para>
</listitem>
<listitem>
<para>
<package>container-diff</package>
</para>
</listitem>
<listitem>
<para>
<package>containerized-data-importer-manifests</package>
</para>
</listitem>
<listitem>
<para>
<package>distribution-registry</package>
</para>
</listitem>
<listitem>
<para>
<package>docker</package>
</para>
</listitem>
<listitem>
<para>
<package>helm</package>
</para>
</listitem>
<listitem>
<para>
<package>helm-bash-completion</package>
</para>
</listitem>
<listitem>
<para>
<package>helm-mirror</package>
</para>
</listitem>
<listitem>
<para>
<package>helm-zsh-completion</package>
</para>
</listitem>
<listitem>
<para>
<package>kubernetes-client</package>
</para>
</listitem>
<listitem>
<para>
<package>kubevirt-manifests</package>
</para>
</listitem>
<listitem>
<para>
<package>kubevirt-virtctl</package>
</para>
</listitem>
<listitem>
<para>
<package>libnvidia-container1</package>
</para>
</listitem>
<listitem>
<para>
<package>libnvidia-container-devel</package>
</para>
</listitem>
<listitem>
<para>
<package>libnvidia-container-static</package>
</para>
</listitem>
<listitem>
<para>
<package>netavark</package>
</para>
</listitem>
<listitem>
<para>
<package>nvidia-container-runtime</package>
</para>
</listitem>
<listitem>
<para>
<package>nvidia-container-toolkit</package>
</para>
</listitem>
<listitem>
<para>
<package>obs-service-docker_label_helper</package>
</para>
</listitem>
<listitem>
<para>
<package>open-vm-tools-containerinfo</package>
</para>
</listitem>
<listitem>
<para>
<package>python3-arrow</package>
</para>
</listitem>
<listitem>
<para>
<package>python3-cassandra-driver</package>
</para>
</listitem>
<listitem>
<para>
<package>python3-kubernetes</package>
</para>
</listitem>
<listitem>
<para>
<package>python3-seccomp</package>
</para>
</listitem>
<listitem>
<para>
<package>zypper-docker</package>
</para>
</listitem>
</itemizedlist>
</note>
<warning>
<title><package>docker</package> vs. <package>docker-stable</package></title>
<para>
&suse; ships a package named <package>docker-stable</package>, based on selected versions
of the the Moby project, which is the upstream for &docker;. When this version is no
longer supported by the Moby project, &suse; will provide reactive support for an
additional 3 years as part of an LTSS subscription. In alignment with Moby community
practices, &suse; neither tests nor supports downgrading to older versions.
</para>
<para>
This policy is particularly relevant when considering a migration from the latest
<package>docker</package> package to the <package>docker-stable</package> package, which
in most cases would be an older version.
Such a downgrade can result in unexpected side effects, compatibility issues and even
disruptions to container production environments, and is not recommended for production
systems.
</para>
</warning>
<important>
<title>&docker; Swarm is not supported</title>
<para>
&suse; does not provide any support related to use of <phrase role="productname">&docker;
Swarm</phrase> orchestration. Related packages are shipped for customer convenience only.
</para>
</important>
<para>
<emphasis role="bold">Dependencies:</emphasis> Basesystem, Desktop Applications
</para>
Expand Down
6 changes: 3 additions & 3 deletions xml/ay_general_options.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</callout>
<callout arearefs="co-ay-general-cio-ignore" arch="zseries">
<para>
<!-- Blacklisting Unused Devices on IBM z Systems -->
<!-- Ignoring Unused Devices on IBM z Systems -->
<xref linkend="CreateProfile-General-cio-ignore"/>
</para>
</callout>
Expand Down Expand Up @@ -705,10 +705,10 @@
</sect2>

<sect2 xml:id="CreateProfile-General-cio-ignore" arch="zseries">
<title>Blacklisting unused devices on &zseries;</title>
<title>Ignoring unused devices on &zseries;</title>
<para>
On &zseries;, you can prevent the kernel from looking at unused hardware
devices by running <command>cio_ignore</command> and blacklisting them. This
devices by running <command>cio_ignore</command> and ignoring them. This
is done by setting the &ay; parameter with the same name to
<literal>true</literal>. Setting this value is optional and only applies to
installations on &zseries; hardware. The default is
Expand Down
1 change: 1 addition & 0 deletions xml/book_tuning.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<xi:include href="tuning_cgroups.xml"/>
<xi:include href="tuning_numactl.xml"/>
<xi:include href="tuning_power.xml"/>
<xi:include os="sles" href="tuning_tuned.xml"/>
</part>

<!-- ===================================================================== -->
Expand Down
1 change: 0 additions & 1 deletion xml/book_virtualization.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
<!-- 14 Configuring Virtual Machines -->
<xi:include href="libvirt_configuration_gui.xml"/>
<xi:include href="libvirt_configuration_virsh.xml"/>
<xi:include href="vm_security.xml"/>
<xi:include href="libvirt_migrating_vms.xml"/>
<xi:include href="xen2kvm.xml"/>
</part>
Expand Down
6 changes: 5 additions & 1 deletion xml/product-entities.ent
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,8 @@
<!ENTITY exampleserver "sun">
<!ENTITY exampleserverip "&exampledomainip;.20">
<!ENTITY exampleclient "earth">
<!ENTITY exampleclientip "&exampledomainip;.1">
<!ENTITY exampleclientip "&exampledomainip;.1">

<!-- Packages and versions -->
<!ENTITY tunedver "v2.10.0">
<!ENTITY tunedapp "TuneD">
Loading

0 comments on commit 12571a1

Please sign in to comment.