openshift · neal-timpe · Nov 4, 2020 · Nov 4, 2020
diff --git a/_topic_map.yml b/_topic_map.yml
@@ -2156,64 +2156,64 @@ Name: Service Mesh
 Dir: service_mesh
 Distros: openshift-enterprise,openshift-webscale
 Topics:
-# - Name: Service Mesh 2.x
-#   Dir: v2x
-#   Topics:
-#   - Name: Service Mesh 2.x release notes
-#     File: servicemesh-release-notes
-#   - Name: Service Mesh architecture
-#     File: ossm-architecture
-#   - Name: Service Mesh and Istio differences
-#     File: ossm-vs-community
-#   - Name: Preparing to install Service Mesh
-#     File: preparing-ossm-installation
-#   - Name: Installing Service Mesh
-#     File: installing-ossm
-#   - Name: Upgrading from 1.1 to 2.0
-#     File: upgrading-ossm
-#   - Name: Customizing the installation
-#     File: customizing-installation-ossm
-#   - Name: Deploying applications on Service Mesh
-#     File: prepare-to-deploy-applications-ossm
-#   - Name: Data visualization and observability
-#     File: ossm-observability
-#   - Name: Security
-#     File: ossm-security
-#   - Name: Traffic management
-#     File: ossm-traffic-manage
-#   - Name: Custom resources
-#     File: ossm-custom-resources
-#   - Name: Extensions
-#     File: ossm-extensions
-#   - Name: Using the 3scale Istio adapter
-#     File: threescale-adapter
-- Name: Service Mesh 1.x
-  Dir: v1x
-  Topics:
-  - Name: Service Mesh 1.x release notes
-    File: servicemesh-release-notes
-  - Name: Service Mesh architecture
-    File: ossm-architecture
-  - Name: Service Mesh and Istio differences
-    File: ossm-vs-community
-  - Name: Preparing to install Service Mesh
-    File: preparing-ossm-installation
-  - Name: Installing Service Mesh
-    File: installing-ossm
-  - Name: Customizing the installation
-    File: customizing-installation-ossm
-  - Name: Deploying applications on Service Mesh
-    File: prepare-to-deploy-applications-ossm
-  - Name: Data visualization and observability
-    File: ossm-observability
-  - Name: Security
-    File: ossm-security
-  - Name: Traffic management
-    File: ossm-traffic-manage
-  - Name: Custom resources
-    File: ossm-custom-resources
-  - Name: Using the 3scale Istio adapter
-    File: threescale-adapter
+ - Name: Service Mesh 2.x
+   Dir: v2x
+   Topics:
+   - Name: Service Mesh 2.x release notes
+     File: servicemesh-release-notes
+   - Name: Service Mesh architecture
+     File: ossm-architecture
+   - Name: Service Mesh and Istio differences
+     File: ossm-vs-community
+   - Name: Preparing to install Service Mesh
+     File: preparing-ossm-installation
+   - Name: Installing Service Mesh
+     File: installing-ossm
+   - Name: Upgrading from 1.1 to 2.0
+     File: upgrading-ossm
+   - Name: Customizing the installation
+     File: customizing-installation-ossm
+   - Name: Deploying applications on Service Mesh
+     File: prepare-to-deploy-applications-ossm
+   - Name: Data visualization and observability
+     File: ossm-observability
+   - Name: Security
+     File: ossm-security
+   - Name: Traffic management
+     File: ossm-traffic-manage
+   - Name: Custom resources
+     File: ossm-custom-resources
+   - Name: Extensions
+     File: ossm-extensions
+   - Name: Using the 3scale Istio adapter
+     File: threescale-adapter
+ - Name: Service Mesh 1.x
+   Dir: v1x
+   Topics:
+   - Name: Service Mesh 1.x release notes
+     File: servicemesh-release-notes
+   - Name: Service Mesh architecture
+     File: ossm-architecture
+   - Name: Service Mesh and Istio differences
+     File: ossm-vs-community
+   - Name: Preparing to install Service Mesh
+     File: preparing-ossm-installation
+   - Name: Installing Service Mesh
+     File: installing-ossm
+   - Name: Customizing the installation
+     File: customizing-installation-ossm
+   - Name: Deploying applications on Service Mesh
+     File: prepare-to-deploy-applications-ossm
+   - Name: Data visualization and observability
+     File: ossm-observability
+   - Name: Security
+     File: ossm-security
+   - Name: Traffic management
+     File: ossm-traffic-manage
+   - Name: Custom resources
+     File: ossm-custom-resources
+   - Name: Using the 3scale Istio adapter
+     File: threescale-adapter
 ---
 Name: Jaeger
 Dir: jaeger

diff --git a/jaeger/rhbjaeger-release-notes.adoc b/jaeger/rhbjaeger-release-notes.adoc
@@ -13,4 +13,6 @@ include::modules/support.adoc[leveloffset=+1]
 
 include::modules/jaeger-rn-new-features.adoc[leveloffset=+1]
 
+include::modules/jaeger-rn-technology-preview.adoc[leveloffset=+1]
+
 include::modules/jaeger-rn-known-issues.adoc[leveloffset=+1]
diff --git a/modules/jaeger-document-attributes.adoc b/modules/jaeger-document-attributes.adoc
@@ -12,7 +12,7 @@
 :ProductName: OpenShift Jaeger
 :ProductShortName: Jaeger
 :ProductRelease:
-:ProductVersion: 1.17.4
+:ProductVersion: 1.20.0
 :product-build:
 :DownloadURL: registry.redhat.io
 :kebab: image:kebab.png[title="Options menu"]
@@ -24,7 +24,7 @@
 
 :DocInfoProductName: Red Hat OpenShift Jaeger
 :DocInfoProductName: OpenShift Jaeger
-:DocInfoProductNumber: 1.17.4
+:DocInfoProductNumber: 1.20.0
 //
 // Book Names:
 // Defining the book names in document attributes instead of hard-coding them in

diff --git a/modules/jaeger-rn-known-issues.adoc b/modules/jaeger-rn-known-issues.adoc
@@ -17,9 +17,7 @@ Result - If the workaround does not completely address the problem.
 
 These limitations exist in Jaeger:
 
-* While Kafka publisher is included as part of Jaeger, it is not supported.
 * Apache Spark is not supported.
-* Only self-provisioned Elasticsearch instances are supported.  External Elasticsearch instances are not supported in this release.
 
 These are the known issues in Jaeger:
 

diff --git a/modules/jaeger-rn-new-features.adoc b/modules/jaeger-rn-new-features.adoc
@@ -2,27 +2,19 @@
 Module included in the following assemblies:
 - rhbjaeger-release-notes.adoc
 ////
+////
+Feature – Describe the new functionality available to the customer.  For enhancements, try to describe as specifically as possible where the customer will see changes.
+Reason – If known, include why has the enhancement been implemented (use case, performance, technology, etc.).   For example, showcases integration of X with Y, demonstrates Z API feature, includes latest framework bug fixes.
+Result – If changed, describe the current user experience.
+////
 
 [id="jaeger-rn-new-features_{context}"]
+== New features {ProductName} 1.20.0
 
+* This release of {ProductName} adds support for using an "external" Elasticsearch cluster to store tracing data, that is, an Elasticsearch instance not installed and created by the Elasticsearch Operator.
 
-== New features {ProductName} 1.17.4
-
-This release of {ProductName} addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes.
-
-== New features {ProductName} 1.17.3
-
-This release of {ProductName} addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes.
-
-== New features {ProductName} 1.17.2
-
-This release of {ProductName} addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes.
-
-== New features {ProductName} 1.17.1
+* This release adds autoscaling support for the Jaeger Collector and Ingester.
 ////
-Feature – Describe the new functionality available to the customer.  For enhancements, try to describe as specifically as possible where the customer will see changes.
-Reason – If known, include why has the enhancement been implemented (use case, performance, technology, etc.).   For example, showcases integration of X with Y, demonstrates Z API feature, includes latest framework bug fixes.  There may not have been a 'problem' previously, but system behaviour may have changed.
-Result – If changed, describe the current user experience
+Restore this bullet point when OSSMDOC-145 is complete
+* This release enabled support for services or applications running outside of an OpenShift cluster to be able to report tracing data to Jaeger running within the OpenShift cluster.
 ////
-
-This release of {ProductName} adds support for installing Jaeger as a standalone solution, rather than as a component of Red Hat OpenShift Service Mesh.
diff --git a/modules/jaeger-rn-technology-preview.adoc b/modules/jaeger-rn-technology-preview.adoc
@@ -0,0 +1,23 @@
+////
+Module included in the following assemblies:
+- rhbjaeger-release-notes.adoc
+////
+
+[id="jaeger-rn-tech-preview_{context}"]
+= Technology Preview
+////
+Provide the following info for each issue if possible:
+Description -  Describe the new functionality available to the customer.  For enhancements, try to describe as specifically as possible where the customer will see changes.  Avoid the word “supports” as in [product] now supports [feature] to avoid customer confusion with full support.  Say, for example, “available as a Technology Preview.”
+Package - A brief description of what the customer has to install or enable in order to use the Technology Preview feature.    (e.g., available in quickstart.zip on customer portal, JDF website, container on registry, enable option, etc.)
+////
+
+[IMPORTANT]
+====
+Technology Preview features are not supported with Red Hat production service level agreements (SLAs) and might not be functionally complete. Red Hat does not recommend using them in production.
+These features provide early access to upcoming product features, enabling customers to test functionality and provide feedback during the development process. For more information about the support scope of Red Hat Technology Preview features, see https://access.redhat.com/support/offerings/techpreview/.
+====
+
+== {ProductName} 2.0.0 Technology Preview 1
+When you install the Jaeger Operator you can select a Technology Preview version of Jaeger.  This gives you access to clients and infrastructure for exporting tracing data to Jaeger based on the link:https://opentelemetry.io/[OpenTelemetry framework].  Note that this version is not supported for production environments.
+
+The OpenTelemetry collector allows developers to instrument their code with vendor agnostic APIs, avoiding vendor lock-in and opening the door to a growing ecosystem of observability tooling.
diff --git a/modules/ossm-document-attributes.adoc b/modules/ossm-document-attributes.adoc
@@ -12,7 +12,7 @@
 :ProductName: Red Hat OpenShift Service Mesh
 :ProductShortName: Service Mesh
 :ProductRelease:
-:ProductVersion: 2.0
+:ProductVersion: 2.0.0
 :MaistraVersion: 2.0
 :product-build:
 :DownloadURL: registry.redhat.io

diff --git a/modules/ossm-rn-deprecated-features.adoc b/modules/ossm-rn-deprecated-features.adoc
@@ -13,16 +13,21 @@ Some features available in previous releases have been deprecated or removed.
 
 Deprecated functionality is still included in {product-title} and continues to be supported; however, it will be removed in a future release of this product and is not recommended for new deployments.
 
-== Deprecated features {ProductName} 1.1.5
+== Deprecated features {ProductName} 2.0
 
-The following custom resources are deprecated in this release and will be removed in a future release.
+The Mixer component is deprecated and will be removed in a future release.  While using Mixer for implementing extensions is still supported in release 2.0, you should be migrating your extensions to the new link:https://istio.io/latest/blog/2020/wasm-announce/[WebAssembly] mechanism.
 
-* `Policy` - The `Policy` resource is deprecated and will be replaced by the `PeerAuthentication` resource in a future release.
-* `MeshPolicy` - The `MeshPolicy` resource is deprecated and will be replaced by the `PeerAuthentication` resource in a future release.
-* `v1alpha1` RBAC API -The v1alpha1 RBAC policy is deprecated by the v1beta1 `AuthorizationPolicy`. RBAC (Role Based Access Control) defines `ServiceRole` and `ServiceRoleBinding` objects.
-** `ServiceRole`
-** `ServiceRoleBinding`
-* `RbacConfig` - `RbacConfig` implements the Custom Resource Definition for controlling Istio RBAC behavior.
-** `ClusterRbacConfig`(versions prior to {ProductName} 1.0)
-** `ServiceMeshRbacConfig` ({ProductName} version 1.0 and later)
+The following resource types are no longer supported in {ProductName} 2.0:
+
+* `Policy` (authentication.istio.io/v1alpha1) is no longer supported.  Depending on the specific configuration in your Policy resource, you may have to configure multiple resources to achieve the same effect.
+** Use `RequestAuthentication` (security.istio.io/v1beta1)
+** Use `PeerAuthentication` (security.istio.io/v1beta1)
+* `ServiceMeshPolicy` (maistra.io/v1) is no longer supported.
+** Use `RequestAuthentication` or `PeerAuthentication`, as mentioned above, but place in the control plane namespace.
+* `RbacConfig` (rbac.istio.io/v1alpha1) is no longer supported.
+** Replaced by `AuthorizationPolicy` (security.istio.io/v1beta1), which encompasses behavior of `RbacConfig`, `ServiceRole`, and `ServiceRoleBinding`.
+* `ServiceMeshRbacConfig` (maistra.io/v1) is no longer supported.
+** Use `AuthorizationPolicy` as above, but place in control plane namespace.
+* `ServiceRole` (rbac.istio.io/v1alpha1) is no longer supported.
+* `ServiceRoleBinding` (rbac.istio.io/v1alpha1) is no longer supported.
 * In Kiali, the `login` and `LDAP` strategies are deprecated. A future version will introduce authentication using OpenID providers.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,6 @@ include::modules/support.adoc[leveloffset=+1]

		include::modules/jaeger-rn-new-features.adoc[leveloffset=+1]

		include::modules/jaeger-rn-technology-preview.adoc[leveloffset=+1]

		include::modules/jaeger-rn-known-issues.adoc[leveloffset=+1]