[VOL-5252] Update release matrix for repo:voltha-openonu-adapter-go
release_notes/voltha_2.12.rst
-----------------------------
o Update release matrix with onu-adapter-go artifact and chart version.
howto/release/tasks/charts.rst
------------------------------
o Create an anchored document for chart editing.
o This common document can then be referenced by per-repo chart edit docs.
howto/release/charts/notes.rst
howto/release/charts/voltha-openolt-adapter.rst
howto/release/charts/voltha-openonu-adapter.rst
-----------------------------------------------
o Document edits for openonu.
o Re-arrange some of the content.
howto/code/index.rst
howto/code/lint/
howto/code/linting.rst
----------------------
o Move help topics lint-chart and lint-helm into an individual rst file.
o This helps support creation of an anchor for document linking.
Change-Id: I03bf4742a3ce8075c93827004466f9c1d7408859
diff --git a/VERSION b/VERSION
index 2e21b72..83ed3cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12.31
+2.12.32
diff --git a/howto/code/index.rst b/howto/code/index.rst
index 4639434..c9d6af7 100644
--- a/howto/code/index.rst
+++ b/howto/code/index.rst
@@ -7,6 +7,7 @@
commit-message
job-failures
linting
+ lint/index
pull_request
release-bugfix
voltha-protos
diff --git a/howto/code/lint/index.rst b/howto/code/lint/index.rst
new file mode 100644
index 0000000..0668a27
--- /dev/null
+++ b/howto/code/lint/index.rst
@@ -0,0 +1,44 @@
+Development & Source Code
+=========================
+
+.. toctree::
+ :maxdepth: 1
+
+ index.rst
+ lint-helm.rst
+
+
+======================================
+Makefile Lint Targets: Syntax Checking
+======================================
+
+Targets
+=======
+
+.. code:: bash
+
+ git clone ssh://gerrit.opencord.org:29418/voltha-helm-charts.git
+ cd voltha-helm-charts
+ make help | grep lint
+ lint-chart chart_version_check.sh
+ lint-doc8 Syntax check *.rst documentation files.
+ lint-helm Syntax check helm configs
+ lint-json Syntax check json sources
+ lint-license Verify sources contain a license block.
+ lint-robot Syntax check robot sources using rflint
+ lint-shell Syntax check bash,bourne,etc sources
+ lint-yaml Syntax check yaml source using yamllint
+ UNSTABLE= Build targets prone to failure (lint-helm)
+
+ [PYTHON]
+ lint-python Syntax check using available python tools
+ lint-flake8 Syntax check using tool flake8
+ lint-pylint Syntax check using tool pylint
+
+|
+
+.. seealso::
+
+- :ref:`Makefile Target lint-chart`
+- :ref:`Makefile Target lint-helm`
+
diff --git a/howto/code/lint/lint-chart.rst b/howto/code/lint/lint-chart.rst
new file mode 100644
index 0000000..c6f67ea
--- /dev/null
+++ b/howto/code/lint/lint-chart.rst
@@ -0,0 +1,24 @@
+.. _Makefile Target lint-chart:
+
+LINT: lint-chart
+================
+
+Helm Charts
+===========
+
+### Command(s):
+
+- `chart_version_check.sh <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master/chart_version_check.sh>`_
+
+.. code:: bash
+
+ make clean
+ make lint-chart 2>&1 | tee log
+
+Sources:
+
+- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/helm/include.mk <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/helm/include.mk>`_
+- [`master <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master>`__] `helm-repo-tools <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools>`_
+
+|
diff --git a/howto/code/lint/lint-helm.rst b/howto/code/lint/lint-helm.rst
new file mode 100644
index 0000000..18994fc
--- /dev/null
+++ b/howto/code/lint/lint-helm.rst
@@ -0,0 +1,23 @@
+.. _Makefile Target lint-helm:
+
+LINT: lint-helm
+===============
+
+Helm Charts
+===========
+
+Command(s):
+- `helmlint.sh <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master/helmlint.sh>`_
+
+.. code:: bash
+
+ make clean
+ make lint-helm 2>&1 | tee log
+
+Sources:
+
+- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/helm/include.mk <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/helm/include.mk>`_
+- [`master <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master>`__] `helm-repo-tools <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools>`_
+
+|
diff --git a/howto/code/linting.rst b/howto/code/linting.rst
index b75b96a..2763e53 100644
--- a/howto/code/linting.rst
+++ b/howto/code/linting.rst
@@ -11,7 +11,6 @@
git clone ssh://gerrit.opencord.org:29418/voltha-helm-charts.git
cd voltha-helm-charts
-
make help | grep lint
lint-chart chart_version_check.sh
lint-doc8 Syntax check *.rst documentation files.
@@ -30,6 +29,11 @@
|
+.. seealso::
+
+- :ref:`Makefile Target lint-chart`
+- :ref:`Makefile Target lint-helm`
+
All Sources
===========
diff --git a/howto/release/charts/notes.rst b/howto/release/charts/notes.rst
index b1a4f20..1851adb 100644
--- a/howto/release/charts/notes.rst
+++ b/howto/release/charts/notes.rst
@@ -6,7 +6,7 @@
- For release remove all version decorations: -dev, -SNAPSHOT
-- Release job will `publish to <https://gerrit.opencord.org/plugins/gitiles/cord-charts-repo/+/refs/heads/master>`_.
+- Release job will publish to `cord-charts-repo <https://gerrit.opencord.org/plugins/gitiles/cord-charts-repo/+/refs/heads/master>`_.
- lint/syntax checking
@@ -18,5 +18,3 @@
----
- Update ONOS components `voltha-infra/values.yaml <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-infra/values.yaml>`_
-
-
diff --git a/howto/release/charts/voltha-openolt-adapter.rst b/howto/release/charts/voltha-openolt-adapter.rst
index 86de231..e3aeb73 100644
--- a/howto/release/charts/voltha-openolt-adapter.rst
+++ b/howto/release/charts/voltha-openolt-adapter.rst
@@ -2,15 +2,8 @@
## HOWTO: Helm Chart Update
-.. code-block:: shell-session
- :caption: Cookbook of edits
-
- % git clone "ssh://gerrit.opencord.org:29418/voltha-helm-charts.git"
- % cd voltha-helm-charts
- % vi $(grep -r 'adapter' . | cut -d: -f1 | sort -u)
-
- % make lint-chart
- % make lint-helm
+- Update copyright notices :ref:`Release Task Copyright`
+- Update VOLTHA artifact and chart versions :ref:`Release Task Helm Charts`
- Increment repository `VERSION file <https://gerrit.opencord.org/plugins/gitiles/voltha-openolt-adapter/+/refs/heads/master/VERSION>`_. Build, test and deploy.
- Modify repo:voltha-helm-charts
@@ -42,9 +35,12 @@
* - `voltha-adapter-openolt/Chart.yaml <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml>`_
- Chart.yaml : appVersion
- Assign `repo:voltha-openolt-adapter::VERSION <https://gerrit.opencord.org/plugins/gitiles/voltha-openolt-adapter/+/refs/heads/master/VERSION>`_ to `Chart.yaml::appVersion <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml#35>`_
+ * - `voltha-adapter-openolt/Chart.yaml <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml>`_
+ - Chart.yaml : version
+ - Increment `OLT chart version <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml#20>`_
* - voltha-infra/Chart.yaml
-
- -
+ - N/A
* - voltha-stack/Chart.yaml
- dependencies : name=voltha-adapter-openolt : version
- Component openolt-adapter modified so update `dependencies : name='voltha-adapter-olt' : version="2.12.6" <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#38>`_
@@ -63,8 +59,7 @@
### Extra Credit
-- Update copyright notices :ref:`Release Task Copyright`
-- make lint # lint everything
+- make lint
.. seealso::
diff --git a/howto/release/charts/voltha-openonu-adapter.rst b/howto/release/charts/voltha-openonu-adapter.rst
new file mode 100644
index 0000000..bd4ad85
--- /dev/null
+++ b/howto/release/charts/voltha-openonu-adapter.rst
@@ -0,0 +1,68 @@
+# Update Helm Chart for repo:votlha-openonu-adapter
+
+## HOWTO: Helm Chart Update
+
+- Update copyright notices :ref:`Release Task Copyright`
+- Update VOLTHA artifact and chart versions :ref:`Release Task Helm Charts`
+
+- Increment repository `VERSION file <https://gerrit.opencord.org/plugins/gitiles/voltha-openonu-adapter/+/refs/heads/master/VERSION>`_. Build, test and deploy.
+- Modify repo:voltha-helm-charts
+
+ - Update component version in the component chart file.
+ - Update chart version for all charts dependent on the component chart.
+ - Run ``make lint-chart lint-helm`` to validate chart changes.
+ - chart:voltha, chart:voltha-infra and chart:voltha-stack can be confusing
+ due to a layer of indirection:
+
+ - chart:voltha-{infra,stack} are not not named for code repositories,
+ they are a container chart used to capture a list of dependencies
+ and versions.
+ - chart:voltha depends on these two charts which in turn depend on
+ sets of voltha components & versions.
+ - When ``make lint-chart`` report this error
+
+ - [ERROR] Chart modified but version unchanged: voltha/Chart.yaml (2.12.11)
+ - It will imply that a component like openonu-adapter has been updated
+ but chart:voltha and chart:voltha-{infra,stack} have not.
+
+.. list-table:: repo:voltha-helm-charts edits
+ :widths: 10, 20, 60
+ :header-rows: 1
+
+ * - Repository Path
+ - Key
+ - Description
+ * - `voltha-adapter-openonu/Chart.yaml <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml>`_
+ - Chart.yaml : appVersion
+ - Assign `repo:voltha-openonu-adapter::VERSION <https://gerrit.opencord.org/plugins/gitiles/voltha-openonu-adapter/+/refs/heads/master/VERSION>`_ to `Chart.yaml::appVersion <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml#35>`_
+ * - `voltha-adapter-openonu/Chart.yaml <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml>`_
+ - Chart.yaml : version
+ - Increment `ONU chart version <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml#17>`_
+
+ * - voltha-infra/Chart.yaml
+ -
+ -
+ * - voltha-stack/Chart.yaml
+ - dependencies : name=voltha-adapter-openonu : version
+ - Component openonu-adapter modified so update `dependencies : name='voltha-adapter-onu' : version="2.12.2" <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#38>`_
+ * - voltha-stack/Chart.yaml
+ - Chart.yaml : version
+ - voltha-adapter-openonu/Chart.yaml modified so notify voltha-stack. Update `version="2.12.2" <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#30>`_.
+ * - voltha-stack/Chart.yaml
+ - dependency : name=voltha : version
+ - voltha-stack/Chart.yaml modified so notify chart voltha. Update `dependencies : name=voltha : version="2.12.14" <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#34>`_
+ * - voltha/Chart.yaml
+ - Chart.yaml : version
+ - voltha/Chart.yaml updated so modify chart `Chart.yaml : version='"2.12.14"' <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha/Chart.yaml#17>`_
+ * - voltha/Chart.yaml
+ - Chart.yaml : version
+ - Update `voltha/Chart.yaml : version='"2.12.14"' <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha/Chart.yaml#17>`_ to match `voltha-stack:dependencies : name=voltha : version='"2.12.14"' <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha/Chart.yaml#17>`_.
+
+### Extra Credit
+
+- Update copyright notices :ref:`Release Task Copyright`
+- make lint # lint everything
+
+.. seealso::
+
+`voltha-docs::charts <../charts/index>`
diff --git a/howto/release/tasks/charts.rst b/howto/release/tasks/charts.rst
new file mode 100644
index 0000000..c6b70aa
--- /dev/null
+++ b/howto/release/tasks/charts.rst
@@ -0,0 +1,21 @@
+.. _Release Task Helm Charts:
+
+Helm Chart Update
+=================
+
+.. code-block:: shell-session
+ :caption: Update helm charts for deployed VOLTHA and ONOS artifacts
+
+ # clone repo:voltha-helm-charts
+ % git clone "ssh://gerrit.opencord.org:29418/voltha-helm-charts.git"
+ % cd voltha-helm-charts
+
+ # Gather files to edit
+ % vi $(grep -r 'adapter' . | cut -d: -f1 | sort -u)
+
+ # Gather indirect dependencies to edit
+ vi voltha/Chart.yaml voltha-infra/Chart.yaml voltha-stack/Chart.yaml
+
+ # Sanity check edits
+ % make lint-chart
+ % make lint-helm
diff --git a/release_notes/voltha_2.12.rst b/release_notes/voltha_2.12.rst
index 07d6c90..265c33b 100644
--- a/release_notes/voltha_2.12.rst
+++ b/release_notes/voltha_2.12.rst
@@ -414,22 +414,22 @@
-
- ``N``
* - `voltha-openolt-adapter <https://gerrit.opencord.org/gitweb?p=voltha-openolt-adapter.git;a=tree>`_
- - ``v4.4.11`` from ``4.4.9``
- - ``2.12.6``
+ - `4.4.11 <https://gerrit.opencord.org/plugins/gitiles/voltha-openolt-adapter/+/7a14e562d5a1d392230069a644f904fa0a676863/VERSION>`_
+ - `2.12.6 <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml#20>`_
- `X <https://gerrit.opencord.org/plugins/gitiles/voltha-openolt-adapter/+/refs/tags/v4.4.11>`__
- `X <https://github.com/opencord/voltha-openolt-adapter/releases/tag/v4.4.11>`__
- `X <https://hub.docker.com/layers/voltha/voltha-openolt-adapter/4.4.11/images/sha256-eed64f687f6029f4cbf531162a10d5e496ea454878987ec0212cd5dbf4c6d9cf?context=explore>`__
- ``N/A``
- ``N/A``
- - ``N`` `VOL-5055 <https://jira.opencord.org/browse/VOL-5055>`_
+ - ``N``
* - `voltha-openonu-adapter-go <https://gerrit.opencord.org/gitweb?p=voltha-openonu-adapter-go.git;a=tree>`_
- - ``2.7.3`` ``?``
- -
- -
+ - `2.11.12 <https://gerrit.opencord.org/plugins/gitiles/voltha-openonu-adapter-go/+/refs/heads/voltha-2.12/VERSION>`_
+ - `2.12.2 <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml#17>`_
- `X <https://gerrit.opencord.org/plugins/gitiles/voltha-openonu-adapter-go/+/refs/tags/v2.11.12>`__
- - `X <https://github.com/opencord/voltha-openonu-adapter-go/tree/v2.11.12>`__
+ - `X <https://github.com/opencord/voltha-openonu-adapter-go/releases/tag/v2.11.12>`_
- `X <https://hub.docker.com/layers/voltha/voltha-openonu-adapter-go/2.11.12/images/sha256-e9484a8963d08748af5766a6a8ce7f7485efb384488bcf93840ecc1142d7ad74?context=explore>`__
- -
+ - `stale <https://pkg.go.dev/github.com/opencord/voltha-openonu-adapter-go>`_
+ - ``N/A``
- ``N`` `VOL-5252 <https://jira.opencord.org/browse/VOL-5252>`_
* - `voltha-protos <https://gerrit.opencord.org/plugins/gitiles/voltha-protos>`_
- ``5.4.11``