Commit Graph

10 Commits (365f904499514799908780239dee35120735eb63)

Author SHA1 Message Date
Anna Blendermann 3ed8deba88
(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)
2022-01-06 11:37:01 -08:00
Anna Blendermann 0fe1eaf145
(dev-v2.6-archive) Expose Merge_Log fields to make log options configurable
(partially cherry picked from commit 1031e462fd)
2022-01-06 11:37:00 -08:00
Jiaqi Luo bf0b834d08
(dev-v2.6-archive) bump rancher-alerting-drivers chart version to 100.0.1
(partially cherry picked from commit 626db0bfa6)
2022-01-06 11:36:58 -08:00
Brenda Rearden dc7b61faaf
(dev-v2.6-archive) Add cluster-tool annotation
Add cluster-tool Monitoring

Add cluster-tool annotation Alerting Drivers

Add cluster-tool annotation CIS Benchmark

Add cluster-tool annotation Istio

Add cluster-tool annotation Logging

Add cluster-tool annotation Longhorn

Add cluster-tool annotation OPA Gatekeeper

(partially cherry picked from commit 05ec4dbb83)
2022-01-06 11:35:28 -08:00
Jiaqi Luo c6381c9acd
(dev-v2.6-archive) user the image rancher/kubectl to avoid runAsRoot
(partially cherry picked from commit 0a8d93a080)
2022-01-06 11:34:13 -08:00
Jiaqi Luo cc72f9ac45
(dev-v2.6-archive) support installing rancher-alerting-drivers in hardened cluster
(partially cherry picked from commit a9dfdea9b4)
2022-01-06 11:34:08 -08:00
Jiaqi Luo 667240cc68
(dev-v2.6-archive) update all charts' version to 100.0.0
(partially cherry picked from commit 09f8f4b5bf)
2022-01-06 11:34:04 -08:00
Arvind Iyengar 47a4a72422
(dev-v2.6-archive) Fix alerting-drivers Chart.yaml
This is required due to the change released in v0.1.0 of the charts-build-scripts to switch the package used for YAML marshalling / unmarshalling.

Note: This does not need a packageVersion bump since it has already been bumped once for this release.
(cherry picked from commit e5415e48de)

(partially cherry picked from commit ba726cdc6c)
2022-01-06 11:33:35 -08:00
Arvind Iyengar 775e5e62f2
(dev-v2.6-archive) Remove rcVersions
(partially cherry picked from commit b350bb93e0)
2022-01-06 11:33:34 -08:00
Arvind Iyengar 63af4011e1
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source
```bash
git fetch upstream
git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md
```

(partially cherry picked from commit 551327b14e)
2022-01-06 11:33:32 -08:00