From cbbb30f424ae3a65378f624f1a9214ba49c0a756 Mon Sep 17 00:00:00 2001 From: Joseph Webster <31218426+jwebster7@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:40:22 -0500 Subject: [PATCH] Bump version to 21.07.1 --- CHANGELOG.md | 8 +--- config/config.go | 2 +- deploy/bundle.yaml | 2 +- ...identorchestrator_cr_imagepullsecrets.yaml | 2 +- deploy/operator.yaml | 2 +- docs/kubernetes/deploying/operator-deploy.rst | 18 ++++----- .../deploying/tridentctl-deploy.rst | 10 ++--- docs/kubernetes/operations/tasks/managing.rst | 2 +- docs/kubernetes/upgrades/downgrading.rst | 6 +-- docs/kubernetes/upgrades/operator-upgrade.rst | 38 +++++++++---------- hack/VERSION | 2 +- helm/trident-operator/Chart.yaml | 2 +- storage_drivers/eseries/eseries_iscsi_test.go | 2 +- 13 files changed, 45 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef4faeb60..f5fca665a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,7 @@ - Fixed custom YAML installer issue with different image (Issue [#613](https://github.com/NetApp/trident/issues/613)). - Fixed snapshot size calculation (Issue [#611](https://github.com/NetApp/trident/issues/611)). -**Enhancements:** - -**Experimental Enhancements:** - -**Deprecations:** - -## v21.04.0 +## v21.07.0 - **IMPORTANT**: Trident has updated its recommendations for the iSCSI setup on worker nodes. Please carefully read the ``Preparing the worker node`` section of the documentation. Please ensure worker node multipathing diff --git a/config/config.go b/config/config.go index 7e7396093..1baf8e8a2 100644 --- a/config/config.go +++ b/config/config.go @@ -36,7 +36,7 @@ const ( OrchestratorName = "trident" OrchestratorClientName = OrchestratorName + "ctl" OrchestratorAPIVersion = "1" - DefaultOrchestratorVersion = "21.07.0" + DefaultOrchestratorVersion = "21.07.1" PersistentStoreBootstrapAttempts = 30 PersistentStoreBootstrapTimeout = PersistentStoreBootstrapAttempts * time.Second PersistentStoreTimeout = 10 * time.Second diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 7c56e7432..faaac0b1f 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -394,7 +394,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: trident-operator - image: netapp/trident-operator:21.07.0 + image: netapp/trident-operator:21.07.1 imagePullPolicy: IfNotPresent name: trident-operator nodeSelector: diff --git a/deploy/crds/tridentorchestrator_cr_imagepullsecrets.yaml b/deploy/crds/tridentorchestrator_cr_imagepullsecrets.yaml index 30351f69f..50b25d789 100644 --- a/deploy/crds/tridentorchestrator_cr_imagepullsecrets.yaml +++ b/deploy/crds/tridentorchestrator_cr_imagepullsecrets.yaml @@ -5,6 +5,6 @@ metadata: spec: debug: true namespace: trident - tridentImage: netapp/trident:21.07.0 + tridentImage: netapp/trident:21.07.1 imagePullSecrets: - thisisasecret diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 6b6b1f13c..2b5c04a9a 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -22,7 +22,7 @@ spec: serviceAccountName: trident-operator containers: - name: trident-operator - image: netapp/trident-operator:21.07.0 + image: netapp/trident-operator:21.07.1 command: - "/trident-operator" - "--debug" diff --git a/docs/kubernetes/deploying/operator-deploy.rst b/docs/kubernetes/deploying/operator-deploy.rst index 90d5a6227..79cd31336 100644 --- a/docs/kubernetes/deploying/operator-deploy.rst +++ b/docs/kubernetes/deploying/operator-deploy.rst @@ -63,7 +63,7 @@ Use the ``helm install`` command and specify a name for your deployment. See the .. code-block:: console - $ helm install trident-operator-21.07.0.tgz + $ helm install trident-operator-21.07.1.tgz There are two ways to pass configuration data during the install: @@ -74,7 +74,7 @@ For example, to change the default value of ``debug``, run the following --set c .. code-block:: console - $ helm install trident-operator-21.07.0.tgz --set tridentDebug=true + $ helm install trident-operator-21.07.1.tgz --set tridentDebug=true The ``values.yaml`` file, which is part of the Helm chart provides the list of keys and their default values. @@ -133,8 +133,8 @@ Download the latest version of the `Trident installer bundle`_ from the .. code-block:: console - wget https://github.com/NetApp/trident/releases/download/v21.07.0/trident-installer-21.07.0.tar.gz - tar -xf trident-installer-21.07.0.tar.gz + wget https://github.com/NetApp/trident/releases/download/v21.07.1/trident-installer-21.07.1.tar.gz + tar -xf trident-installer-21.07.1.tar.gz cd trident-installer .. _Trident installer bundle: https://github.com/NetApp/trident/releases/latest @@ -237,11 +237,11 @@ installation in the ``trident`` namespace. Kubelet Dir: /var/lib/kubelet Log Format: text Silence Autosupport: false - Trident Image: netapp/trident:21.07.0 + Trident Image: netapp/trident:21.07.1 Message: Trident installed Namespace: trident Status: Installed - Version: v21.07.0 + Version: v21.07.1 Events: Type Reason Age From Message ---- ------ ---- ---- ------- @@ -269,7 +269,7 @@ autosupportImage The container image for Autosupport Telemetry autosupportProxy The address/port of a proxy for sending Autosupport Telemetry "http://proxy.example.com:8888" uninstall A flag used to uninstall Trident 'false' logFormat Trident logging format to be used [text,json] "text" -tridentImage Trident image to install "netapp/trident:21.07" +tridentImage Trident image to install "netapp/trident:21.07.1" imageRegistry Path to internal registry, of the format ``[:port][/subpath]`` "k8s.gcr.io/sig-storage" kubeletDir Path to the kubelet directory on the host "/var/lib/kubelet" wipeout A list of resources to delete to perform a complete removal of Trident @@ -302,7 +302,7 @@ customize your Trident installation. Here's an example: spec: debug: true namespace: trident - tridentImage: netapp/trident:21.07.0 + tridentImage: netapp/trident:21.07.1 imagePullSecrets: - thisisasecret @@ -370,7 +370,7 @@ You can also use ``tridentctl`` to check the version of Trident installed. +----------------+----------------+ | SERVER VERSION | CLIENT VERSION | +----------------+----------------+ - | 21.07.0 | 21.07.0 | + | 21.07.1 | 21.07.1 | +----------------+----------------+ If that's what you see, you're done with this step, but **Trident is not diff --git a/docs/kubernetes/deploying/tridentctl-deploy.rst b/docs/kubernetes/deploying/tridentctl-deploy.rst index 7612f93e3..a0bf7f00b 100644 --- a/docs/kubernetes/deploying/tridentctl-deploy.rst +++ b/docs/kubernetes/deploying/tridentctl-deploy.rst @@ -81,12 +81,12 @@ Identify your Kubernetes server version. You will be using it when you Download the latest version of the `Trident installer bundle`_ from the *Downloads* section and extract it. -For example, if the latest version is 21.07.0: +For example, if the latest version is 21.07.1: .. code-block:: console - wget https://github.com/NetApp/trident/releases/download/v21.07.0/trident-installer-21.07.0.tar.gz - tar -xf trident-installer-21.07.0.tar.gz + wget https://github.com/NetApp/trident/releases/download/v21.07.1/trident-installer-21.07.1.tar.gz + tar -xf trident-installer-21.07.1.tar.gz cd trident-installer .. _Trident installer bundle: https://github.com/NetApp/trident/releases/latest @@ -113,7 +113,7 @@ Install Trident in the desired namespace by executing the INFO Waiting for Trident pod to start. INFO Trident pod started. namespace=trident pod=trident-csi-679648bd45-cv2mx INFO Waiting for Trident REST interface. - INFO Trident REST interface is up. version=21.07.0 + INFO Trident REST interface is up. version=21.07.1 INFO Trident installation succeeded. .... @@ -131,7 +131,7 @@ the number of nodes in your Kubernetes cluster, you may observe more pods: +----------------+----------------+ | SERVER VERSION | CLIENT VERSION | +----------------+----------------+ - | 21.07.0 | 21.07.0 | + | 21.07.1 | 21.07.1 | +----------------+----------------+ If that's what you see, you're done with this step, but **Trident is not diff --git a/docs/kubernetes/operations/tasks/managing.rst b/docs/kubernetes/operations/tasks/managing.rst index a6c933182..f25c29635 100644 --- a/docs/kubernetes/operations/tasks/managing.rst +++ b/docs/kubernetes/operations/tasks/managing.rst @@ -29,7 +29,7 @@ If Trident was installed using Helm, it can be uninstalled using ``helm uninstal #List the Helm release corresponding to the Trident install. $ helm ls -n trident NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION - trident trident 1 2021-04-20 00:26:42.417764794 +0000 UTC deployed trident-operator-21.07.0 21.07.0 + trident trident 1 2021-04-20 00:26:42.417764794 +0000 UTC deployed trident-operator-21.07.1 21.07.1 #Uninstall Helm release to remove Trident $ helm uninstall trident -n trident diff --git a/docs/kubernetes/upgrades/downgrading.rst b/docs/kubernetes/upgrades/downgrading.rst index 6d0e367f9..26759ae68 100644 --- a/docs/kubernetes/upgrades/downgrading.rst +++ b/docs/kubernetes/upgrades/downgrading.rst @@ -88,13 +88,13 @@ If you are unsure as to how Trident is installed, here is a simple test to run: +----------------+----------------+ | SERVER VERSION | CLIENT VERSION | +----------------+----------------+ - | 21.07.0 | 21.07.0 | + | 21.07.1 | 21.07.1 | +----------------+----------------+ $ kubectl describe pod trident-csi-79df798bdc-2jzpq -n trident | grep "Image" -A 2 -B 2 | head -4 trident-main: Container ID: docker://e088b1ffc7017ddba8144d334cbc1eb646bf3491be031ef583a3f189ed965213 - Image: netapp/trident:21.07.0 + Image: netapp/trident:21.07.1 Image ID: docker-pullable://netapp/trident@sha256:28095a20d8cfffaaaaakkkkkeeeeeec4925ac5d652341b6eaa2ea9352f1e0 #Is the version of Trident being used >=21.01? If yes, check if a ``tridentorchestrator`` is present. @@ -107,7 +107,7 @@ If you are unsure as to how Trident is installed, here is a simple test to run: Message: Trident installed Namespace: trident Status: Installed - Version: v21.07.0 + Version: v21.07.1 #Is the version of Trident being used in the range [20.04 - 20.10]? If yes, check if a ``tridentprovisioner`` is present. #If yes, then you have installed Trident using the operator. diff --git a/docs/kubernetes/upgrades/operator-upgrade.rst b/docs/kubernetes/upgrades/operator-upgrade.rst index 61eb89ff6..bd15c9582 100644 --- a/docs/kubernetes/upgrades/operator-upgrade.rst +++ b/docs/kubernetes/upgrades/operator-upgrade.rst @@ -104,9 +104,9 @@ To upgrade **from**: Trident 21.01 and later, here is the set of steps to be fol .. code-block:: bash - kubectl install -f 21.07/trident-installer/deploy/bundle.yaml -n trident. + kubectl install -f 21.07.1/trident-installer/deploy/bundle.yaml -n trident. -As part of this step, the 21.07 Trident operator will identify an existing Trident installation and upgrade it to the same version as the operator. +As part of this step, the 21.07.1 Trident operator will identify an existing Trident installation and upgrade it to the same version as the operator. Upgrading a namespace-scoped Trident operator install ===================================================== @@ -136,11 +136,11 @@ operator [versions ``20.07`` through ``20.10``], here is the set of steps to be .. code-block:: bash - # Download the release required [21.07] - $ mkdir 21.07.0 - $ cd 21.07.0 - $ wget https://github.com/NetApp/trident/releases/download/v21.07.0/trident-installer-21.07.0.tar.gz - $ tar -xf trident-installer-21.07.0.tar.gz + # Download the release required [21.07.1] + $ mkdir 21.07.1 + $ cd 21.07.1 + $ wget https://github.com/NetApp/trident/releases/download/v21.07.1/trident-installer-21.07.1.tar.gz + $ tar -xf trident-installer-21.07.1.tar.gz $ cd trident-installer $ kubectl create -f deploy/crds/trident.netapp.io_tridentorchestrators_crd_post1.16.yaml @@ -219,7 +219,7 @@ operator [versions ``20.07`` through ``20.10``], here is the set of steps to be #Ensure you are in the correct directory $ pwd - $ /root/21.07.0/trident-installer + $ /root/21.07.1/trident-installer #Install the cluster-scoped operator in the **same namespace** $ kubectl create -f deploy/bundle.yaml @@ -250,7 +250,7 @@ operator [versions ``20.07`` through ``20.10``], here is the set of steps to be Message: Trident installed Namespace: trident Status: Installed - Version: v21.07.0 + Version: v21.07.1 Installing the cluster-scoped operator will: @@ -259,7 +259,7 @@ operator [versions ``20.07`` through ``20.10``], here is the set of steps to be objects. ii. Delete ``TridentProvisioner`` objects and the ``tridentprovisioner`` CRD. iii. Upgrade Trident to the version of the cluster-scoped operator being used. - In the example above, Trident was upgraded to ``21.07.0``. + In the example above, Trident was upgraded to ``21.07.1``. Upgrading a Helm-based operator install ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -271,9 +271,9 @@ If you have a Helm-based operator install, to upgrade, do the following: .. code-block:: console - $ helm upgrade trident-operator-21.07.0.tgz + $ helm upgrade trident-operator-21.07.1.tgz -where ``trident-operator-21.07.0.tgz`` reflects the version that you want to upgrade to. +where ``trident-operator-21.07.1.tgz`` reflects the version that you want to upgrade to. If you run ``helm list``, the output shows that the chart and app version have both been upgraded. @@ -281,7 +281,7 @@ To pass configuration data during the upgrade, use --set. For example, to change .. code-block:: console - $ helm upgrade trident-operator-21.07.0-custom.tgz --set tridentDebug=true + $ helm upgrade trident-operator-21.07.1-custom.tgz --set tridentDebug=true If you run ``$ tridentctl logs``, you can see the debug messages. @@ -301,11 +301,11 @@ of the Trident Operator by following the instructions provided in the .. code-block:: bash - # Download the release required [21.07] - $ mkdir 21.07.0 - $ cd 21.07.0 - $ wget https://github.com/NetApp/trident/releases/download/v21.07.0/trident-installer-21.07.0.tar.gz - $ tar -xf trident-installer-21.07.0.tar.gz + # Download the release required [21.07.1] + $ mkdir 21.07.1 + $ cd 21.07.1 + $ wget https://github.com/NetApp/trident/releases/download/v21.07.1/trident-installer-21.07.1.tar.gz + $ tar -xf trident-installer-21.07.1.tar.gz $ cd trident-installer 2. Create the ``tridentorchestrator`` CRD from the manifest. @@ -359,7 +359,7 @@ of the Trident Operator by following the instructions provided in the Message: Trident installed Namespace: trident Status: Installed - Version: v21.07.0 + Version: v21.07.1 5. Existing backends and PVCs will be automatically available. diff --git a/hack/VERSION b/hack/VERSION index 16406cd4a..e8bbb3048 100644 --- a/hack/VERSION +++ b/hack/VERSION @@ -1 +1 @@ -21.07.0 +21.07.1 diff --git a/helm/trident-operator/Chart.yaml b/helm/trident-operator/Chart.yaml index 269518d7f..6a7697420 100644 --- a/helm/trident-operator/Chart.yaml +++ b/helm/trident-operator/Chart.yaml @@ -11,4 +11,4 @@ icon: "https://raw.githubusercontent.com/NetApp/trident/master/logo/trident.png" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 21.07.0 +appVersion: 21.07.1 diff --git a/storage_drivers/eseries/eseries_iscsi_test.go b/storage_drivers/eseries/eseries_iscsi_test.go index ef71d3a6e..57fbd6984 100644 --- a/storage_drivers/eseries/eseries_iscsi_test.go +++ b/storage_drivers/eseries/eseries_iscsi_test.go @@ -55,7 +55,7 @@ func newTestEseriesSANDriver(debugTraceFlags map[string]bool) *SANStorageDriver func newTestEseriesSANDriverAPI(config *drivers.ESeriesStorageDriverConfig) *api.Client { telemetry := make(map[string]string) - telemetry["version"] = "21.07.0" + telemetry["version"] = "21.07.1" telemetry["plugin"] = "eseries" telemetry["storagePrefix"] = *config.StoragePrefix