From 68c7f2d68af5cfe8f07a4c90ec1a1523a35ac8b3 Mon Sep 17 00:00:00 2001
From: Pamme Crandall <pammecrandall@yahoo.com>
Date: Thu, 3 Mar 2022 08:48:28 -0700
Subject: [PATCH] Add NSM package for v1.4.0

---
 .../generated-changes/overlay/app-readme.md      | 16 ++++++++++++++++
 .../generated-changes/overlay/questions.yaml     | 15 ++++++++++-----
 .../generated-changes/patch/Chart.yaml.patch     |  8 ++++----
 packages/nginx-service-mesh/package.yaml         |  2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/packages/nginx-service-mesh/generated-changes/overlay/app-readme.md b/packages/nginx-service-mesh/generated-changes/overlay/app-readme.md
index 45640cd17..309cb53d5 100644
--- a/packages/nginx-service-mesh/generated-changes/overlay/app-readme.md
+++ b/packages/nginx-service-mesh/generated-changes/overlay/app-readme.md
@@ -3,3 +3,19 @@
 [NGINX Service Mesh](https://docs.nginx.com/nginx-service-mesh/) is a fully integrated lightweight service mesh that leverages a data plane powered by NGINX Plus to manage container traffic in Kubernetes environments.
 
 NGINX Service Mesh is supported in Rancher 2.5+ when deploying from the Apps and Marketplace. NGINX Service Mesh is not currently supported on k3s.
+
+## Enabling telemetry
+
+Telemetry can only be enabled by editing the configuration YAML directly in the Rancher UI. When installing NGINX Service Mesh, select the `Edit YAML` option. To enable telemetry, set the `tracing` object to `{}` and fill out the `telemetry` object.
+The telemetry object expects a `samplerRatio`, and the `host` and `port` of your OTLP gRPC collector.
+For example:
+
+```yaml
+tracing: {}
+telemetry:
+  samplerRatio: 0.01
+  exporters:
+    otlp:
+      host: "my-otlp-collector-host"
+      port: 4317
+```
diff --git a/packages/nginx-service-mesh/generated-changes/overlay/questions.yaml b/packages/nginx-service-mesh/generated-changes/overlay/questions.yaml
index 67a1e402a..6c52783cb 100644
--- a/packages/nginx-service-mesh/generated-changes/overlay/questions.yaml
+++ b/packages/nginx-service-mesh/generated-changes/overlay/questions.yaml
@@ -13,7 +13,7 @@ questions:
     label: Image registry server
     type: string
   - variable: registry.imageTag
-    default: "1.3.1"
+    default: "1.4.0"
     description: "Tag used for pulling images from registry."
     label: Image tag
     type: string
@@ -102,7 +102,7 @@ questions:
     - "rsa-4096"
 - variable: useTracingDefaults
   default: true
-  description: "Use default tracing settings."
+  description: "Use default tracing settings. If you would like to enable telemetry instead, please see the README for instructions."
   label: Use default tracing settings
   type: boolean
   show_subquestion_if: false
@@ -110,7 +110,7 @@ questions:
   subquestions:
   - variable: tracing.disable
     default: false
-    description: "Disable tracing for all services."
+    description: "Disable tracing for all services. This option will be removed in version 1.5."
     label: Disable tracing
     type: boolean
   - variable: tracing.address
@@ -149,7 +149,7 @@ questions:
   group: "General Settings"
 - variable: deployGrafana
   default: true
-  description: "Deploy Grafana as a part of NGINX Service Mesh."
+  description: "Deploy Grafana as a part of NGINX Service Mesh. This option will be removed in version 1.5."
   label: Deploy Grafana
   type: boolean
   group: "General Settings"
@@ -199,10 +199,15 @@ questions:
   label: Prometheus address.
   type: string
   group: "General Settings"
+- variable: enableUDP
+  description: "Enable UDP traffic proxying (beta). Linux kernel 4.18 or greater is required."
+  label: Enable UDP
+  type: boolean
+  default: false
+  group: "General Settings"
 - variable: rancher
   default: true
   description: "Enables Rancher for NGINX Service Mesh (do not disable)."
   label: Rancher
   type: boolean
   group: "General Settings"
-  
diff --git a/packages/nginx-service-mesh/generated-changes/patch/Chart.yaml.patch b/packages/nginx-service-mesh/generated-changes/patch/Chart.yaml.patch
index e47bd36b1..ee2bd4bf2 100644
--- a/packages/nginx-service-mesh/generated-changes/patch/Chart.yaml.patch
+++ b/packages/nginx-service-mesh/generated-changes/patch/Chart.yaml.patch
@@ -1,10 +1,10 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -1,3 +1,7 @@
+@@ -5,3 +5,7 @@
+ kubeVersion: '>= 1.18-0'
+ name: nginx-service-mesh
+ version: 0.4.0
 +annotations:
 +  catalog.cattle.io/certified: partner
 +  catalog.cattle.io/display-name: NGINX Service Mesh
 +  catalog.cattle.io/release-name: nginx-service-mesh
- apiVersion: v2
- appVersion: 1.3.1
- description: NGINX Service Mesh
diff --git a/packages/nginx-service-mesh/package.yaml b/packages/nginx-service-mesh/package.yaml
index 54f4a4f91..37085eb68 100644
--- a/packages/nginx-service-mesh/package.yaml
+++ b/packages/nginx-service-mesh/package.yaml
@@ -1,2 +1,2 @@
-url: https://raw.githubusercontent.com/nginxinc/helm-charts/master/stable/nginx-service-mesh-0.3.1.tgz
+url: https://raw.githubusercontent.com/nginxinc/helm-charts/master/stable/nginx-service-mesh-0.4.0.tgz
 packageVersion: 00