Commit Graph

11 Commits (9fab3d3ce4dc8d4abb2138eb5573c93a148fc7d6)

Author SHA1 Message Date
Jiaqi Luo 85de78a0bb
(dev-v2.6-archive) Merge pull request #1567 from jiaqiluo/rebase-monitoring
(partially cherry picked from commit d6b619d203)
2022-01-06 11:37:47 -08:00
Colleen Murphy 68ad619fa3
(dev-v2.6-archive) Merge pull request #1625 from cmurphy/bump-kev2
Bump KEv2 operators

(partially cherry picked from commit 64f6c291de)
2022-01-06 11:37:43 -08:00
Jiaqi Luo 5f1dde5a21
(dev-v2.6-archive) [rancher-monitoring-crd] code refactor
(partially cherry picked from commit cfc2433953)
2022-01-06 11:37:42 -08:00
Jiaqi Luo 05dbee9b38
(dev-v2.6-archive) [rancher-backup] bump version to 2.1.0-rc1
(partially cherry picked from commit 4bee7541a6)
2022-01-06 11:37:39 -08:00
Jiaqi Luo 87b42cc9cd
(dev-v2.6-archive) Update rancher-kube-state-metrics to new base 3f371027, upstream chart kube-state-metrics 3.5.2
(partially cherry picked from commit dd44b31ad8)
2022-01-06 11:37:28 -08:00
Jiaqi Luo f1deb7d051
(dev-v2.6-archive) Rebase to 3f371027
(partially cherry picked from commit d612aa67f3)
2022-01-06 11:37:27 -08:00
Arvind Iyengar 50131e19bc
(dev-v2.6-archive) Merge pull request #1274 from aiyengar2/rebase_monitoring
Rebase Monitoring to 16.x.x

(partially cherry picked from commit 89d8ad2713)
2022-01-06 11:34:31 -08:00
Donnie Adams 83d80f13dd
(dev-v2.6-archive) Merge pull request #1289 from thedadams/bump-aks-v1.0.1-rc12
Bump aks-operator chart to 1.0.1-rc12

(partially cherry picked from commit 8400ee4596)
2022-01-06 11:34:31 -08:00
Arvind Iyengar 618b2c4223
(dev-v2.6-archive) Update rancher-kube-state-metrics to new base 086f1f7f0870e110abf30aa6bfe7c141e83cc950
(cherry picked from commit 95cd88b735)

(partially cherry picked from commit 2acb1d6fcf)
2022-01-06 11:34:26 -08:00
Arvind Iyengar 00927521f0
(dev-v2.6-archive) Rebase to 086f1f7f0870e110abf30aa6bfe7c141e83cc950
(cherry picked from commit 383fb984af)

(partially cherry picked from commit 28f95b059f)
2022-01-06 11:34:25 -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