Commit Graph

5 Commits (6ca9fb2c056b03daa34dbb0b4c948345431dbb9a)

Author SHA1 Message Date
Nick Gerace 091cda727d
(dev-v2.6-archive) Fix logging 3.10.0 and remove bad chart
(partially cherry picked from commit c320d24d50)
2022-01-06 11:33:59 -08:00
Jiaqi Luo e45348b081
(dev-v2.6-archive) Update rancher-pushprox to support overriding namespace and switching the workload type of the client between Deployment and DaemonSet by adding replicas and affinity in pod.spec
(partially cherry picked from commit 8bf9b82e91)
2022-01-06 11:33:58 -08:00
Jacob Payne 5537e98926
(dev-v2.6-archive) Fix/issue 33092 (#1254)
* removed rke2 containers logging and added some extra settings to the fluentbit configmap

* charts

(partially cherry picked from commit ba4492b7d4)
2022-01-06 11:33:55 -08:00
Arvind Iyengar f859625d86
(dev-v2.6-archive) Checkout current packages from dev-v2.6-source
```bash
git fetch upstream
git checkout upstream/dev-v2.6-source -- packages; git reset HEAD; git checkout -- packages/README.md
```

This overwrites the previous changes based on stuff currently in dev-v2.6-source today.

(partially cherry picked from commit 1107be9199)
2022-01-06 11:33:33 -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