Skip to content

Commit

Permalink
Updates for 18.04.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
adkerr committed Sep 26, 2018
1 parent fac0b9e commit a7a830c
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ GO=${DR} go
default: dist

## version variables
TRIDENT_VERSION ?= 18.04.0
TRIDENT_VERSION ?= 18.04.1
TRIDENT_IMAGE ?= trident
ifeq ($(BUILD_TYPE),custom)
TRIDENT_VERSION := ${TRIDENT_VERSION}-custom
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type Telemetry struct {
const (
/* Misc. orchestrator constants */
OrchestratorName = "trident"
orchestratorVersion = "18.04.0"
orchestratorVersion = "18.04.1"
OrchestratorAPIVersion = "1"
PersistentStoreBootstrapAttempts = 30
PersistentStoreBootstrapTimeout = PersistentStoreBootstrapAttempts * time.Second
Expand Down
2 changes: 1 addition & 1 deletion contrib/docker/plugin/pluginname
Original file line number Diff line number Diff line change
@@ -1 +1 @@
localhost:5000/trident-plugin:18.04.0
localhost:5000/trident-plugin:18.04.1
44 changes: 22 additions & 22 deletions docs/docker/install/host_config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,27 +108,27 @@ Traditional Install Method (Docker <= 1.12)
-------------------------------------------
#. Ensure you have Docker version 1.10 or above
.. code-block:: bash
docker --version
If your version is out of date, update to the latest.
.. code-block:: bash
curl -fsSL https://get.docker.com/ | sh
Or, `follow the instructions for your distribution <https://docs.docker.com/engine/installation/>`_.
#. After ensuring the correct version of Docker is installed, install and configure the NetApp Docker Volume Plugin. Note, you will need to ensure that NFS and/or iSCSI is configured for your system. See the installation instructions below for detailed information on how to do this.
.. code-block:: bash
# download and unpack the application
wget https://github.com/NetApp/trident/releases/download/v18.04.0/trident-installer-18.04.0.tar.gz
tar zxf trident-installer-18.04.0.tar.gz
wget https://github.com/NetApp/trident/releases/download/v18.04.1/trident-installer-18.04.1.tar.gz
tar zxf trident-installer-18.04.1.tar.gz
# move to a location in the bin path
sudo mv trident-installer/extras/bin/trident /usr/local/bin
Expand Down Expand Up @@ -187,24 +187,24 @@ Starting Trident at System Startup
A sample unit file for systemd based systems can be found at ``contrib/trident.service.example`` in the git repo. To use the file, with CentOS/RHEL:
.. code-block:: bash
# copy the file to the correct location. you must use unique names for the
# unit files if you have more than one instance running
cp contrib/trident.service.example /usr/lib/systemd/system/trident.service
# edit the file, change the description (line 2) to match the driver name and the
# configuration file path (line 9) to reflect your environment.
# reload systemd for it to ingest changes
systemctl daemon-reload
# enable the service, note this name will change depending on what you named the
# file in the /usr/lib/systemd/system directory
systemctl enable trident
# start the service, see note above about service name
systemctl start trident
# view the status
systemctl status trident
Expand Down Expand Up @@ -232,22 +232,22 @@ Docker Managed Plugin Method (Docker >= 1.13 / 17.03)
* ``debug`` - Specify whether debug logging is enabled. Default is false. Overrides log-level if true.
**Installing the Managed Plugin**
#. Ensure you have Docker Engine 17.03 (nee 1.13) or above installed.
.. code-block:: bash
docker --version
If your version is out of date, `follow the instructions for your distribution <https://docs.docker.com/engine/installation/>`_ to install or update.
#. Create a configuration file. The config file must be located in the ``/etc/netappdvp`` directory. The default filename is ``config.json``, however you can use any name you choose by specifying the ``config`` option with the file name. Be sure to use the correct options for your storage system.
.. code-block:: bash
# create a location for the config files
sudo mkdir -p /etc/netappdvp
# create the configuration file, see below for more configuration examples
cat << EOF > /etc/netappdvp/config.json
{
Expand All @@ -265,18 +265,18 @@ Docker Managed Plugin Method (Docker >= 1.13 / 17.03)
#. Start Trident using the managed plugin system.
.. code-block:: bash
docker plugin install --grant-all-permissions --alias netapp netapp/trident-plugin:18.04 config=myConfigFile.json
#. Begin using Trident to consume storage from the configured system.
.. code-block:: bash
# create a volume named "firstVolume"
docker volume create -d netapp --name firstVolume
# create a default volume at container instantiation
docker run --rm -it --volume-driver netapp --volume secondVolume:/my_vol alpine ash
# remove the volume "firstVolume"
docker volume rm firstVolume
10 changes: 5 additions & 5 deletions docs/kubernetes/deploying.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ you have the necessary privileges to.
Download the latest version of the `Trident installer bundle`_ from the
*Downloads* section and extract it.

For example, if the latest version is 18.04.0:
For example, if the latest version is 18.04.1:

.. code-block:: bash
wget https://github.com/NetApp/trident/releases/download/v18.04.0/trident-installer-18.04.0.tar.gz
tar -xf trident-installer-18.04.0.tar.gz
wget https://github.com/NetApp/trident/releases/download/v18.04.1/trident-installer-18.04.1.tar.gz
tar -xf trident-installer-18.04.1.tar.gz
cd trident-installer
.. _Trident installer bundle: https://github.com/NetApp/trident/releases/latest
Expand Down Expand Up @@ -165,7 +165,7 @@ It will look like this when the installer is complete:
+----------------+----------------+
| SERVER VERSION | CLIENT VERSION |
+----------------+----------------+
| 18.04.0 | 18.04.0 |
| 18.04.1 | 18.04.1 |
+----------------+----------------+
If that's what you see, you're done with this step, but **Trident is not
Expand Down Expand Up @@ -201,7 +201,7 @@ If you continue to have trouble, visit the
Customized Installation
-----------------------

Trident's installer allows you to customize attributes such as PV or PVC default names,
Trident's installer allows you to customize attributes such as PV or PVC default names,
by using the installer's ``--pv`` or ``--pvc`` parameters. You can also specify a
storage volume name and size by using ``--volume-name`` and ``--volume-size``.

Expand Down

0 comments on commit a7a830c

Please sign in to comment.