Commit Graph

24 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 c025fa3186
(dev-v2.6-archive) Merge pull request #1506 from jiaqiluo/bump-rancher-alerting-drivers
(partially cherry picked from commit 980b1e982a)
2022-01-06 11:36:59 -08:00
Jiaqi Luo 9c20f21dec
(dev-v2.6-archive) bump sachet tag to 0.2.6
(partially cherry picked from commit 39dbe9c981)
2022-01-06 11:36:56 -08:00
Donnie Adams f70df3c9be
(dev-v2.6-archive) Make charts
(partially cherry picked from commit 4064bd9bcc)
2022-01-06 11:36:56 -08:00
Donnie Adams 78fcd154dd
(dev-v2.6-archive) Bump suc to 0.8.0 and chart to 100.0.1
(partially cherry picked from commit 58c099909a)
2022-01-06 11:36:55 -08:00
Donnie Adams 6f780ab778
(dev-v2.6-archive) Revert "Bump suc to 0.8.0-rc.1 and chart to 100.0.1"
This reverts commit 40cf924eea.

(partially cherry picked from commit 4440ee20b1)
2022-01-06 11:36:42 -08:00
Donnie Adams 029f66cbe7
(dev-v2.6-archive) Revert "Make charts"
This reverts commit f93ca8d163.

(partially cherry picked from commit 3c9523e5fb)
2022-01-06 11:36:41 -08:00
Donnie Adams 9d1318b381
(dev-v2.6-archive) Make charts
(partially cherry picked from commit f93ca8d163)
2022-01-06 11:36:33 -08:00
Ryan Sanna d387b4e4aa
(dev-v2.6-archive) update rancher-webhook to v0.2.1
(partially cherry picked from commit 8470641c54)
2022-01-06 11:36:31 -08:00
Donnie Adams 24fb74e054
(dev-v2.6-archive) Bump suc to 0.8.0-rc.1 and chart to 100.0.1
(partially cherry picked from commit 40cf924eea)
2022-01-06 11:36:31 -08:00
Kinara Shah e69ce5e6d5
(dev-v2.6-archive) update commit + make prepare && make patch
(partially cherry picked from commit 3ce2963396)
2022-01-06 11:35:48 -08:00
Kinara Shah 87ab06fd7e
(dev-v2.6-archive) update commit for system-upgrade-controller
(partially cherry picked from commit c219d87ec5)
2022-01-06 11:35:47 -08:00
Kinara Shah 4cdf2ee047
(dev-v2.6-archive) make patch && make prepare && make clean
(partially cherry picked from commit 5c17cdca57)
2022-01-06 11:35:43 -08:00
Kinara Shah 47a6303d1b
(dev-v2.6-archive) change source from local to system-charts
(partially cherry picked from commit 3b7b8ef2ba)
2022-01-06 11:35:42 -08:00
Colleen Murphy 98f4456e04
(dev-v2.6-archive) Update system-upgrade-controller to 0.7.3
(partially cherry picked from commit 76ebca93ba)
2022-01-06 11:35:22 -08:00
Kinara Shah b68387a57c
(dev-v2.6-archive) update system-upgrade-controller to v0.7.2
(partially cherry picked from commit da47360070)
2022-01-06 11:35:16 -08:00
Kinara Shah ba01a47cdc
(dev-v2.6-archive) Merge pull request #1347 from kinarashah/fleetrc4
update system-upgrade-controller to v0.7.1

(partially cherry picked from commit 30d0277e60)
2022-01-06 11:35:04 -08:00
Steven Crespo 69be8215db
(dev-v2.6-archive) Merge pull request #1325 from PennyScissors/devv26-update-csi
Update vSphere CSI to v2.2.1

(partially cherry picked from commit ccc0524891)
2022-01-06 11:35:03 -08:00
Kinara Shah 75e0e9d280
(dev-v2.6-archive) update system-upgrade-controller to v0.7.1
(partially cherry picked from commit 1b63f99142)
2022-01-06 11:35:02 -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
Darren Shepherd 43394525cf
(dev-v2.6-archive) Fix invalid tag in system-upgrade-controller
(partially cherry picked from commit b1dcdd1a87)
2022-01-06 11:33:50 -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 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