(dev-v2.6-archive) Merge pull request #1505 from annablender/fix-merge-logging

[2.6.3] Expose Merge_Log field to disable JSON parsing in logs

(partially cherry picked from commit 0902f7c03f)

packages/rancher-alerting-drivers/package.yaml

@@ -1,2 +1,2 @@
 url: local
-version: 100.0.0
+version: 100.0.1

packages/rancher-istio/charts/values.yaml

@@ -5,7 +5,7 @@ forceInstall: false
 
 installer:
   repository: rancher/istio-installer
-  tag: 1.10.4-rancher4
+  tag: 1.10.4-rancher5
   ##releaseMirror are configurations for istio upgrades. 
   ##Setting releaseMirror.enabled: true will cause istio to use bundled in images from rancher/istio-installer to perfom an upgrade - this is ideal
   ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets.

packages/rancher-istio/package.yaml

@@ -1,2 +1,2 @@
 url: local
-version: 100.0.1+up1.10.4
+version: 100.0.2+up1.10.4

packages/rancher-prom2teams/generated-changes/patch/Chart.yaml.patch

@@ -7,7 +7,7 @@
 +  catalog.cattle.io/release-name: rancher-prom2teams
 +  catalog.cattle.io/os: linux
  apiVersion: v1
- appVersion: "3.2.2"
+ appVersion: "3.2.3"
 -description: A Helm chart for Prom2Teams
 -name: prom2teams
 +description: A Helm chart for Prom2Teams based on the upstream https://github.com/idealista/prom2teams

packages/rancher-prom2teams/generated-changes/patch/values.yaml.patch

@@ -18,7 +18,7 @@
 -  repository: idealista/prom2teams
 -  tag:
 +  repository: rancher/mirrored-idealista-prom2teams
-+  tag: 3.2.2
++  tag: 3.2.3
    pullPolicy: IfNotPresent
  
  resources:

packages/rancher-prom2teams/package.yaml

@@ -1,4 +1,4 @@
 url: https://github.com/idealista/prom2teams.git
 subdirectory: helm
-commit: 5fb10e9ad1bfb6a99071a30afdfb0ecfb830a830 # the commit points to the tag 3.2.2
-version: 100.0.0
+commit: a1691cce91855536be93311fe6b2a4b95b9ce97c # the commit points to the tag 3.2.3
+version: 100.0.1

packages/rancher-sachet/charts/Chart.yaml

@@ -8,4 +8,4 @@ name: rancher-sachet
 description: A Helm chart for Sachet based on the upstream https://github.com/messagebird/sachet
 type: application
 version: 1.0.1
-appVersion: 0.2.3
+appVersion: 0.2.6

packages/rancher-sachet/charts/values.yaml

@@ -26,7 +26,7 @@ replicaCount: 1
 image:
   repository: rancher/mirrored-messagebird-sachet
   pullPolicy: IfNotPresent
-  tag: 0.2.3
+  tag: 0.2.6
 
 imagePullSecrets: []
 

packages/rancher-sachet/package.yaml

@@ -1,2 +1,2 @@
 url: local
-version: 100.0.0
+version: 100.0.1

packages/system-upgrade-controller/generated-changes/exclude/questions.yml

@@ -1 +1 @@
-rancher_min_version: 2.4.0-rc1
+rancher_min_version: 2.6.0-alpha1

packages/system-upgrade-controller/generated-changes/patch/Chart.yaml.patch

@@ -5,15 +5,13 @@
 -name: rancher-k3s-upgrader
 -description: Enables a k3s or rke2 cluster to update itself by reacting to Plan CRs.
 -  Users do not need to manually upgrade this app. It will be automatically upgraded to the latest version when upgrading a cluster.
--home: https://github.com/rancher/system-charts/blob/dev-v2.6/charts/rancher-k3s-upgrader
 +name: system-upgrade-controller
 +description: General purpose controller to make system level updates to nodes
-+home: https://github.com/rancher/system-charts/charts/system-upgrade-controller
+ home: https://github.com/rancher/system-charts/blob/dev-v2.6/charts/rancher-k3s-upgrader
  sources:
--  - "https://github.com/rancher/system-charts/blob/dev-v2.6/charts/rancher-k3s-upgrader"
-+  - "https://github.com/rancher/system-charts/charts/system-upgrade-controller"
- version: 0.3.0
- appVersion: v0.7.5
+   - "https://github.com/rancher/system-charts/blob/dev-v2.6/charts/rancher-k3s-upgrader"
+ version: 0.3.1
+ appVersion: v0.8.0
 +annotations:
 +  catalog.cattle.io/certified: rancher
 +  catalog.cattle.io/hidden: "true"

packages/system-upgrade-controller/package.yaml

@@ -1,4 +1,4 @@
 url: https://github.com/rancher/system-charts.git
-subdirectory: charts/rancher-k3s-upgrader/0.3.0
-commit: 26475fa43f67f77c148ddece41ecb1e8d1584508
-version: 100.0.0
+subdirectory: charts/rancher-k3s-upgrader/0.3.1
+commit: 43ca7c9954d03c6334cdf307d4097e4c3ac5fd02
+version: 100.0.1