Commit Graph

536 Commits (7bf3553bd9fb3125cf3886c7d64ed43fdbb697b7)

Author SHA1 Message Date
Colleen Murphy 12436f6487
(dev-v2.6-archive) Merge pull request #1306 from cmurphy/gke-private-cluster-fix
Bump gke-operator to v1.1.1-rc5

(partially cherry picked from commit 2e0aa1c582)
2022-01-06 11:34:40 -08:00
Nick Gerace feccfecc9a
(dev-v2.6-archive) Ensure Logging v2 nodeAgent fluentbit images are Windows-only
(partially cherry picked from commit 772114660e)
2022-01-06 11:34:39 -08:00
Brenda Rearden d7e99621c9
(dev-v2.6-archive) Include istio 1.10.2 and patch changes for kiali 1.35.0
Correct the kiali helpers patch to only include system default registry

(partially cherry picked from commit 868a1e7011)
2022-01-06 11:34:39 -08:00
Colleen Murphy e040cceee4
(dev-v2.6-archive) Bump gke-operator to v1.1.1-rc5
(partially cherry picked from commit c8fd88d2d6)
2022-01-06 11:34:38 -08:00
Michal Jura b314f746a4
(dev-v2.6-archive) Bump aks-operator chart to 1.0.1-rc14
(partially cherry picked from commit 0763f60c98)
2022-01-06 11:34:37 -08:00
Arvind Iyengar 67ae616417
(dev-v2.6-archive) Manually bump certain images
(partially cherry picked from commit 391d444a9c)
2022-01-06 11:34:36 -08:00
Arvind Iyengar 0dd0e55ec4
(dev-v2.6-archive) Update rancher-grafana to new base bf7e1110a5ee9258190d0377fea319bb8e764e62
(partially cherry picked from commit 77baac0cca)
2022-01-06 11:34:36 -08:00
Arvind Iyengar 32fe32f032
(dev-v2.6-archive) Rebase to bf7e1110a5ee9258190d0377fea319bb8e764e62
(partially cherry picked from commit b4787cfe7c)
2022-01-06 11:34:35 -08:00
Jiaqi Luo 1828589a59
(dev-v2.6-archive) delete rio, rancher-operator, rancher-operator-crd and rancher-external-ip-webhook
(partially cherry picked from commit 143c0fecb4)
2022-01-06 11:34:34 -08:00
Nick Gerace 051259e1a7
(dev-v2.6-archive) Update Fleet charts to v0.3.6-rc3
(partially cherry picked from commit 564d336c35)
2022-01-06 11:34:34 -08:00
Brenda Rearden a1a3a386bf
(dev-v2.6-archive) Support kiali 1.35 and istio 1.10.1
(partially cherry picked from commit 20ae86582a)
2022-01-06 11:34:33 -08:00
Brenda Rearden e87b6f9cdc
(dev-v2.6-archive) Remove unused packages
Remove unused istio 1.8 package

Remove unused istio 1.9 packages

(partially cherry picked from commit 941bb97f73)
2022-01-06 11:34:32 -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 bf3e6fbf0a
(dev-v2.6-archive) Manual changes to Monitoring for rebase
(partially cherry picked from commit a93a040b70)
2022-01-06 11:34:30 -08:00
Arvind Iyengar 4738bc0d53
(dev-v2.6-archive) Update rancher-monitoring to new base ba91bdb2d79ca4419cf72078f5f4bfcc426d4599
(partially cherry picked from commit d49f60d38e)
2022-01-06 11:34:29 -08:00
Arvind Iyengar a473d32ba4
(dev-v2.6-archive) Rebase to ba91bdb2d79ca4419cf72078f5f4bfcc426d4599
(partially cherry picked from commit ef23466ebc)
2022-01-06 11:34:28 -08:00
Arvind Iyengar e5a760879f
(dev-v2.6-archive) Modify Windows dashboards for breaking changes
(cherry picked from commit d7708cc963)

(partially cherry picked from commit 00db29b544)
2022-01-06 11:34:28 -08:00
Arvind Iyengar 9f6d3389fe
(dev-v2.6-archive) Bump windows_exporter-package and account for breaking changes
(cherry picked from commit c96ff52542)

(partially cherry picked from commit d8be38f8a1)
2022-01-06 11:34:27 -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 86fb1ad0a5
(dev-v2.6-archive) Change kube-state-metrics commit and url
(cherry picked from commit 3c5014784e)

(partially cherry picked from commit c58aa6d7f4)
2022-01-06 11:34:24 -08:00
Arvind Iyengar 10fd5f03fe
(dev-v2.6-archive) Update rancher-prometheus-adapter to new base 50b719af447594abbae7beeb4d6458a19f8e9689
(cherry picked from commit 93b8c72bcf)

(partially cherry picked from commit 19a218b8af)
2022-01-06 11:34:24 -08:00
Arvind Iyengar 23d22a40f3
(dev-v2.6-archive) Rebase to 50b719af447594abbae7beeb4d6458a19f8e9689
(cherry picked from commit 215afb6707)

(partially cherry picked from commit baea983d2f)
2022-01-06 11:34:23 -08:00
Arvind Iyengar d5196531dc
(dev-v2.6-archive) Update rancher-node-exporter to new base a05f7b8888d6174827b815aa097d64b94f00af3e
(cherry picked from commit dbc71f3dfc)

(partially cherry picked from commit 1916fb1654)
2022-01-06 11:34:22 -08:00
Arvind Iyengar 288f3a8a63
(dev-v2.6-archive) Rebase to a05f7b8888d6174827b815aa097d64b94f00af3e
(cherry picked from commit 6e32565f54)

(partially cherry picked from commit f8cdd3a3ef)
2022-01-06 11:34:21 -08:00
Arvind Iyengar cdf102f638
(dev-v2.6-archive) Merge pull request #1278 from aiyengar2/check_monitoring
Add dummy openAPIV3Schema on pre-install step

(partially cherry picked from commit b24e4ee460)
2022-01-06 11:34:20 -08:00
Donnie Adams 9350ad1384
(dev-v2.6-archive) Bump aks-operator chart to 1.0.1-rc12
(partially cherry picked from commit 7b20ac89ce)
2022-01-06 11:34:20 -08:00
Donnie Adams 68c408a7c1
(dev-v2.6-archive) Merge pull request #1287 from thedadams/bump-eks-v1.1.1-rc4
Bump eks-operator chart to 1.1.1-rc4

(partially cherry picked from commit c5552eb0de)
2022-01-06 11:34:18 -08:00
Donnie Adams c27468963b
(dev-v2.6-archive) Merge pull request #1288 from thedadams/bump-gke-v1.1.1-rc4
Bump gke-operator chart to 1.1.1-rc4

(partially cherry picked from commit 2e23e41254)
2022-01-06 11:34:18 -08:00
Donnie Adams ed5ec609d3
(dev-v2.6-archive) Bump gke-operator chart to 1.1.1-rc4
(partially cherry picked from commit 9d2ab0d8f9)
2022-01-06 11:34:16 -08:00
Donnie Adams f4fb1d0c70
(dev-v2.6-archive) Bump eks-operator chart to 1.1.1-rc4
(partially cherry picked from commit bafe6cded9)
2022-01-06 11:34:16 -08:00
Michal Jura a42c3cc1e3
(dev-v2.6-archive) Bump aks-operator chart to 1.0.1-rc11
(partially cherry picked from commit d86330f7c5)
2022-01-06 11:34:15 -08:00
Jiaqi Luo db423ccabe
(dev-v2.6-archive) Merge pull request #1277 from jiaqiluo/fix-alerting-driver
(partially cherry picked from commit 022b4453a3)
2022-01-06 11:34:14 -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 2f0a596193
(dev-v2.6-archive) bump rancher-backup to 2.2.0-rc2
(partially cherry picked from commit 66506a37a9)
2022-01-06 11:34:13 -08:00
Jiaqi Luo cf70932465
(dev-v2.6-archive) update versions on multiple charts
(partially cherry picked from commit 26d9c3d28c)
2022-01-06 11:34:12 -08:00
Jiaqi Luo 944b14aaab
(dev-v2.6-archive) bump rancher-backup to 2.2.0-rc1
(partially cherry picked from commit 494564d483)
2022-01-06 11:34:11 -08:00
Arvind Iyengar 1110c8c82e
(dev-v2.6-archive) Add dummy openAPIV3Schema to initContainer and log patch
(partially cherry picked from commit 3202417f2d)
2022-01-06 11:34:10 -08:00
Darren Shepherd 77225d476b
(dev-v2.6-archive) Bump rancher-webhook to 0.2.0-alpha02
(partially cherry picked from commit 2a023fdc38)
2022-01-06 11:34:10 -08:00
Jacob Payne 7821fd2296
(dev-v2.6-archive) Fix/issue 32301 (#1247)
* cis 1.0.6 1.22 fixes

* make charts

(partially cherry picked from commit 0e089425ab)
2022-01-06 11:34:09 -08:00
Daishan Peng f32ff6597f
(dev-v2.6-archive) Merge pull request #1262 from StrongMonkey/fleet-v0.3.6-rc2
Fleet v0.3.6 rc2

(partially cherry picked from commit ed3d4f771f)
2022-01-06 11:34:08 -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 bd7135beb9
(dev-v2.6-archive) add missing permission in the podSecurityPolicy for rancher-prom2teams
(partially cherry picked from commit d9f7aa887b)
2022-01-06 11:34:07 -08:00
Jiaqi Luo 3bd972ffb2
(dev-v2.6-archive) add missing permission in the podSecurityPolicy for rancher-sachet
(partially cherry picked from commit de95419e0c)
2022-01-06 11:34:06 -08:00
Daishan 6fcba17b8f
(dev-v2.6-archive) Update fleet to v0.3.6-rc2
(partially cherry picked from commit ea50d27198)
2022-01-06 11:34:06 -08:00
Jiaqi Luo 260458573b
(dev-v2.6-archive) Merge pull request #1256 from jiaqiluo/update-charts-build-scrpts
(partially cherry picked from commit aab21e8493)
2022-01-06 11:34:05 -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
Manuel Buil a4ac0510ee
(dev-v2.6-archive) Add sriov chart
Signed-off-by: Manuel Buil <mbuil@suse.com>

(partially cherry picked from commit e56e520221)
2022-01-06 11:34:04 -08:00
Jiaqi Luo 2fe40e5d5c
(dev-v2.6-archive) run make template to update templates
(partially cherry picked from commit a6980385e1)
2022-01-06 11:34:03 -08:00
Nick Gerace 178bcc5d60
(dev-v2.6-archive) Merge pull request #1261 from nickgerace/dev-v2.6-sprig-and-helm-are-not-fun
Force convert non-string buffer values for Logging 3.10.0

(partially cherry picked from commit 1c33d37907)
2022-01-06 11:34:02 -08:00
Daishan Peng 6ca9fb2c05
(dev-v2.6-archive) Merge pull request #1257 from StrongMonkey/fleet-v0.3.6-rc1-2.6
Fleet v0.3.6-rc1

(partially cherry picked from commit 6da36d301f)
2022-01-06 11:34:01 -08:00
Daishan f4cb5b7eba
(dev-v2.6-archive) Make charts
(partially cherry picked from commit a9e2003ebb)
2022-01-06 11:34:01 -08:00
Nick Gerace 9d6ca1d72c
(dev-v2.6-archive) Force convert non-string buffer values for Logging 3.10.0
Force convert non-string buffer values for Logging 3.10.0. Remove
packageVersion 0 version of the chart.

(partially cherry picked from commit d9295e7c00)
2022-01-06 11:34:00 -08:00
Jiaqi Luo 5dcbb0283b
(dev-v2.6-archive) Merge pull request #1227 from jiaqiluo/pushprox-for-ingress-nginx-dev-v2.6
(partially cherry picked from commit 4f1aa0319f)
2022-01-06 11:33:59 -08:00
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 ed9fa241d7
(dev-v2.6-archive) add sub-charts for scraping ingress-nginx in rke and rke2 clusters
(partially cherry picked from commit 1157b4a153)
2022-01-06 11:33:58 -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
Daishan 63682d8921
(dev-v2.6-archive) Update fleet to v0.3.6-rc1
(partially cherry picked from commit a8e8fb5957)
2022-01-06 11:33:57 -08:00
Nick Gerace beeeff4cee
(dev-v2.6-archive) Update logging to 3.10.0 and convert fluent-bit buffer fields to string
(partially cherry picked from commit d8d38e6082)
2022-01-06 11:33:56 -08:00
Jacob Payne 41f86f41d1
(dev-v2.6-archive) fix/issue 32993 (#1248)
* use journald to consume k3s logs

* make charts

(partially cherry picked from commit f91fac2cf7)
2022-01-06 11:33:55 -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 d7b9e7e2ba
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245)
* Bump PushProx chart version

* Expose serviceMonitor endpoints and client SA RBAC

* Bump PushProx image to v0.1.0-rancher2

* Support hardened kubelet+nodeExporter & update k3s

* Generate charts

* Disable kubelet serviceMonitor if k3sServer enabled

* make charts

(partially cherry picked from commit a064b37d4e)
2022-01-06 11:33:54 -08:00
Donnie Adams 28c320bdb8
(dev-v2.6-archive) Merge pull request #1244 from thedadams/bump-gke-v1.1.1-rc2
(partially cherry picked from commit e2e04c8f8e)
2022-01-06 11:33:54 -08:00
Donnie Adams 8cd004c998
(dev-v2.6-archive) Bump gke-operator chart to 1.1.1-rc2
(partially cherry picked from commit c3219d0cbd)
2022-01-06 11:33:53 -08:00
Donnie Adams 7d48f885ae
(dev-v2.6-archive) Bump aks-operator chart to 1.0.1-rc7
(partially cherry picked from commit c44dfebdde)
2022-01-06 11:33:52 -08:00
Donnie Adams 2bdbd65274
(dev-v2.6-archive) Bump eks-operator chart to 1.1.1-rc2
(partially cherry picked from commit 06802f45b5)
2022-01-06 11:33:52 -08:00
Arvind Iyengar 2e2ec8ec2c
(dev-v2.6-archive) Move establishing CRD logic to a helper template
(partially cherry picked from commit 02ff0c9df8)
2022-01-06 11:33:51 -08:00
Arvind Iyengar 00ab624721
(dev-v2.6-archive) Mimic Helm CRD install process by introducing wait
As part of the Helm CRD installation process shown [here](43853ea772/pkg/action/install.go (L160-L162)), charts that both attempt to install CRDs and then install resources (e.g. `len(totalItems) > 0`) invalidate the cache and attempt to get the CRDs again to `Give time for the CRD to be recognized.` before continuing the Helm installation.

Because Monitoring V2 currently does not observe this invalidation and wait, flakey race conditions documented in issues like https://github.com/rancher/rancher/issues/32025 and https://github.com/rancher/rancher/issues/29171 can be caused. This commit introduces that invalidation process.

(partially cherry picked from commit 5f3bbe4a36)
2022-01-06 11:33:50 -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
Colleen Murphy dfc77a99a9
(dev-v2.6-archive) Merge pull request #1213 from cmurphy/dev-v2.6-aks-operator
Add aks-operator charts

(partially cherry picked from commit 556c9b1afa)
2022-01-06 11:33:49 -08:00
Colleen Murphy 57998bd35d
(dev-v2.6-archive) Add aks-operator package
(partially cherry picked from commit 2abda43f33)
2022-01-06 11:33:48 -08:00
Jiaqi Luo cb516236eb
(dev-v2.6-archive) Merge pull request #1214 from jiaqiluo/rancher-backup-105-rc1-dev-v2.6
[dev-v2.6] cut rancher-backup and rancher-backup-crd 1.1.100+up1.1.1

(partially cherry picked from commit dac8de7d7e)
2022-01-06 11:33:48 -08:00
Donnie Adams 91cf674a50
(dev-v2.6-archive) Merge pull request #1195 from thedadams/add-gke-operator
(partially cherry picked from commit 9f439d72ae)
2022-01-06 11:33:47 -08:00
Donnie Adams ed7f77d9af
(dev-v2.6-archive) Add gke-operator
(partially cherry picked from commit b608a65c41)
2022-01-06 11:33:46 -08:00
dbason 7d753513f7
(dev-v2.6-archive) Add support for the kube audit log to v2 logging (#1223)
* Add logging for kube-audit

* Generate charts for d274040a

(partially cherry picked from commit 4e6c09f559)
2022-01-06 11:33:46 -08:00
Jiaqi Luo cf569513fa
(dev-v2.6-archive) Merge pull request #1230 from jiaqiluo/update-monitoring-image-dev-v2.6
[dev-v2.6]update the image rancher/mirrored-library-nginx

(partially cherry picked from commit ef298fe102)
2022-01-06 11:33:45 -08:00
Prachi Damle d729c71088
(dev-v2.6-archive) Merge pull request #1229 from prachidamle/cis_k8s_version_tag_26
Updating cis-operator image tag to deliver fix for k8s upgrade issue

(partially cherry picked from commit d016ae3c10)
2022-01-06 11:33:44 -08:00
Jiaqi Luo 0729838224
(dev-v2.6-archive) update the image rancher/mirrored-library-nginx
(partially cherry picked from commit 5480033c84)
2022-01-06 11:33:43 -08:00
Prachi Damle 19183ca1c2
(dev-v2.6-archive) Update CIS tag to include k8s version upgrade fix
No need to update packageVersion

Generated assets

(partially cherry picked from commit 7302e66ece)
2022-01-06 11:33:43 -08:00
Jiaqi Luo b9024c1fd2
(dev-v2.6-archive) cut rancher-backup and rancher-backup-crd v1.1.1
(partially cherry picked from commit 84b66d8013)
2022-01-06 11:33:42 -08:00
Arvind Iyengar 470ce9ee46
(dev-v2.6-archive) Add validation on trying to deploy Grafana PVC
(partially cherry picked from commit 75a96a7e94)
2022-01-06 11:33:41 -08:00
Arvind Iyengar b78b04ad05
(dev-v2.6-archive) Bump packageVersion
(partially cherry picked from commit 0bdbaf798d)
2022-01-06 11:33:41 -08:00
Arvind Iyengar 4dc8ac280d
(dev-v2.6-archive) Merge pull request #1224 from aiyengar2/fix_rke_2_etcd_default_2_6
[2.6] Add NoExecute toleration to rke2Etcd and remove key

(partially cherry picked from commit 9c5c1c5ef3)
2022-01-06 11:33:40 -08:00
Donnie Adams 6b385a97b9
(dev-v2.6-archive) Change eks-operator version to v1.1.1
(partially cherry picked from commit 8d7f56d799)
2022-01-06 11:33:39 -08:00
Arvind Iyengar 05c3912de8
(dev-v2.6-archive) Add NoExecute toleration to rke2Etcd and remove key
(cherry picked from commit a181ea3011)

(partially cherry picked from commit 6239716e10)
2022-01-06 11:33:38 -08:00
Nick Gerace bc7d68d557
(dev-v2.6-archive) Fix windows prefix path for logging
(partially cherry picked from commit c9bf5990b0)
2022-01-06 11:33:37 -08:00
Arvind Iyengar 5c0f816c65
(dev-v2.6-archive) Fix monitoring 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 7ec1716f66)

(partially cherry picked from commit e2c9a0746b)
2022-01-06 11:33:37 -08:00
Arvind Iyengar 4db1d5822e
(dev-v2.6-archive) Fix istio requirement.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.

(cherry picked from commit 5392d84cf6)

(partially cherry picked from commit 8845d9ae9f)
2022-01-06 11:33:36 -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 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
Arvind Iyengar ff586304c1
(dev-v2.6-archive) Regenerate template based on v0.2.0 release
```bash
make template
```

(partially cherry picked from commit e0424d8ac0)
2022-01-06 11:33:31 -08:00
actions decb1db44b
(dev-v2.6-archive) Generated changes
(partially cherry picked from commit 88defdad62)
2022-01-06 11:33:31 -08:00
aiyengar2 2304c5e0fb
(dev-v2.6-archive) Merge pull request #677 from aiyengar2/fix_magic_links
Fix broken magic links for Grafana and Prometheus

(partially cherry picked from commit f7cee8c5c7)
2022-01-06 11:33:31 -08:00
Darren Shepherd b2b0a96592
(dev-v2.6-archive) fleet v0.3.0-beta3
(partially cherry picked from commit 161b04a5e6)
2022-01-06 11:33:30 -08:00
Arvind Iyengar d652d4db01
(dev-v2.6-archive) Add nginx proxy to Prometheus for magic links
This commit adds an nginx proxy in front of Prometheus that intercepts the requests that are sent to the Prometheus pod. This change was necessary since the Prometheus pod encounters issues with Rancher proxy URLs that are formatted like:

```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy
```

Specifically, if using the root_url option, it doubles up this URL when making requests for resources, e.g.
```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/<my-path>
=>
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/<my-path>
```

However, this does not resolve the issue in https://github.com/rancher/rancher/issues/29068.

(partially cherry picked from commit 92f0eca770)
2022-01-06 11:33:30 -08:00
Arvind Iyengar b9758f95c4
(dev-v2.6-archive) Add nginx proxy to Grafana for magic links
This commit adds an nginx proxy in front of Grafana that intercepts the requests that are sent to the Grafana pod. This change was necessary since the Grafana pod encounters issues with Rancher proxy URLs that are formatted like:

```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy
```

Specifically, if using the root_url option, it doubles up this URL when making requests for resources, e.g.
```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/<my-path>
=>
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/<my-path>
```

(partially cherry picked from commit d6c774aa42)
2022-01-06 11:33:29 -08:00
rajashree 42d7b9382d
(dev-v2.6-archive) Change encryption config field name in restore crd
(partially cherry picked from commit 37a8648cf8)
2022-01-06 11:33:29 -08:00
maggieliu 2e262303da
(dev-v2.6-archive) Merge pull request #674 from aiyengar2/fix_monitoring_chart_hardened
Support monitoring in hardened RKE clusters

(partially cherry picked from commit 34fdd14bca)
2022-01-06 11:33:28 -08:00
maggieliu 826d5dc2df
(dev-v2.6-archive) Merge pull request #675 from aiyengar2/fix_pushprox_chart_hardened
Support pushprox in hardened RKE clusters

(partially cherry picked from commit 6edb750ce9)
2022-01-06 11:33:28 -08:00
Prachi Damle a63a0d586a
(dev-v2.6-archive) Merge pull request #676 from prachidamle/airgap_fix
Use global registry for security-scan and sonobuoy tool images to support airgapped setups

(partially cherry picked from commit 0f786657a2)
2022-01-06 11:33:27 -08:00
Jacob Payne fba428baa7
(dev-v2.6-archive) allow tolerations to be passed to fluentbit containers (#673)
(partially cherry picked from commit 91d1dedca1)
2022-01-06 11:33:27 -08:00
Prachi Damle 2d82003905
(dev-v2.6-archive) Use the system_default_registry for security-scan and sonobuoy images
Deleting tgz assets

(partially cherry picked from commit 42f30bfad1)
2022-01-06 11:33:26 -08:00
Steven Crespo ed4687076b
(dev-v2.6-archive) Merge pull request #670 from PennyScissors/update-gk-v3.1.1
Update gatekeeper to version 3.1.1

(partially cherry picked from commit 32f1b41934)
2022-01-06 11:33:26 -08:00
Steven Crespo b21fe035b5
(dev-v2.6-archive) Update gatekeeper to v3.1.1
(partially cherry picked from commit 5757f8cc15)
2022-01-06 11:33:25 -08:00
Arvind Iyengar ae60d235cb
(dev-v2.6-archive) Support monitoring in hardened RKE clusters
This commit adds support for deploying rancher-monitoring into hardened clusters.

It modifies some of the default securityContexts and does some misc. fixes such as:
- Removing default AppArmor PSP annotations from Grafana (related to https://github.com/helm/charts/issues/9090)
- Modifying rkeScheduler and rkeControllerManager to use localhost to scrape components since the endpoints aren't exposed in a hardened cluster

These changes have been verified on a hardened RKE cluster.

(partially cherry picked from commit e3d6033572)
2022-01-06 11:33:25 -08:00
Arvind Iyengar 0eded521bd
(dev-v2.6-archive) Support pushprox in hardened RKE clusters
This commit adds support for deploying rancher-pushprox into hardened clusters.

It introduces securityContexts and rearranges the RBAC in order to support a PodSecurityPolicy for the PushProx clients.

These changes have been verified on a hardened RKE cluster.

(partially cherry picked from commit 7d1332356c)
2022-01-06 11:33:24 -08:00
Arvind Iyengar 0ec38633eb
(dev-v2.6-archive) Move pushprox RBAC into separate file
(partially cherry picked from commit 4da2300a26)
2022-01-06 11:33:24 -08:00
Jacob Payne 53db0ed5b4
(dev-v2.6-archive) fixed eks and k3s logging in airgap (#671)
(partially cherry picked from commit 60c84b3c3b)
2022-01-06 11:33:23 -08:00
Arvind Iyengar 5b49312554
(dev-v2.6-archive) Use separate namespace only for dashboards
This commit renames `grafana-dashboards` to `cattle-dashboards` and deprecates the `grafana-datasources` namespace in favor of the normal release namespace.

Related Issue: rancher/rancher#28887

(partially cherry picked from commit b80fb3a8ff)
2022-01-06 11:33:23 -08:00
Arvind Iyengar a4d132cf54
(dev-v2.6-archive) Split RBAC for ConfigMaps and Secrets
Related Issue: https://github.com/rancher/rancher/issues/29013

(partially cherry picked from commit 0fa3a06de0)
2022-01-06 11:33:22 -08:00
Arvind Iyengar a05cd088c8
(dev-v2.6-archive) Relocate Rancher roles to overlay/
(partially cherry picked from commit 2e1ed1b130)
2022-01-06 11:33:22 -08:00
Daishan 536bdd588e
(dev-v2.6-archive) Bump fleet, rancher-operator, webhook
(partially cherry picked from commit 89cb2793e9)
2022-01-06 11:33:21 -08:00
Arvind Iyengar 6e9ba81e6d
(dev-v2.6-archive) Add annotations that were left out on rebase
Dropped on accident in rebase https://github.com/rancher/charts/pull/641/files#diff-ed5b5b87cf149adc6a6408bf81993efdR681-R682

(partially cherry picked from commit 95cf887f5f)
2022-01-06 11:33:21 -08:00
Brenda Rearden 237e44a8f1
(dev-v2.6-archive) Merge pull request #667 from brendarearden/image-updates
Set installer repo,tag in values.yaml

(partially cherry picked from commit 34676b359a)
2022-01-06 11:33:21 -08:00
aiyengar2 d6e2d6fe20
(dev-v2.6-archive) Merge pull request #666 from aiyengar2/fix_kube_dns_namespace
Create kube-dns service monitor in kube-system

(partially cherry picked from commit 034952747f)
2022-01-06 11:33:20 -08:00
Brenda Rearden cea35722ed
(dev-v2.6-archive) Set installer repo,tag in values.yaml
(partially cherry picked from commit 9932422f51)
2022-01-06 11:33:20 -08:00
Rajashree Mandaogane d9d9732036
(dev-v2.6-archive) Merge pull request #663 from mrajashree/upd
Update resourceset to include configmaps for clusterrepos

(partially cherry picked from commit 820f105aa2)
2022-01-06 11:33:19 -08:00
Arvind Iyengar 6d6bc2110a
(dev-v2.6-archive) Create kube-dns service monitor in kube-system
This is required since, by default, we ignoreNamespaceSelectors.

(partially cherry picked from commit 700975ee95)
2022-01-06 11:33:19 -08:00
aiyengar2 f04ef106ae
(dev-v2.6-archive) Merge pull request #662 from aiyengar2/use_new_busybox
Replace rancher/busybox w/ rancher/library-busybox

(partially cherry picked from commit afb3af8690)
2022-01-06 11:33:18 -08:00
rajashree 748bfc929f
(dev-v2.6-archive) Update resourceset to include configmaps for clusterrepos
(partially cherry picked from commit b3cc3a717c)
2022-01-06 11:33:18 -08:00
Brenda Rearden 450547552b
(dev-v2.6-archive) Merge pull request #659 from brendarearden/image-updates
Image updates for Istio 1.7.1 and Kiali 1.23.0

(partially cherry picked from commit 14f0a39a4a)
2022-01-06 11:33:17 -08:00
Prachi Damle 3215b5c901
(dev-v2.6-archive) Merge pull request #664 from prachidamle/new_cis_fixes
CIS chart fixes to update image tag, fixes for hardened cluster

(partially cherry picked from commit 89746f9fe1)
2022-01-06 11:33:17 -08:00
Prachi Damle 866397beaa
(dev-v2.6-archive) Delete tgz files from assets, parameter in the post-install hook for namespace should use the
helm templating

(partially cherry picked from commit 2dd35d89bb)
2022-01-06 11:33:16 -08:00
Brenda Rearden 8e6e45ad6d
(dev-v2.6-archive) Update kiali to 1.23.0
(partially cherry picked from commit d397bb512c)
2022-01-06 11:33:16 -08:00
Darren Shepherd 824e9a5211
(dev-v2.6-archive) fleet-0.3.0-beta1
(partially cherry picked from commit ecd90e66af)
2022-01-06 11:33:15 -08:00
Prachi Damle 3b038e7b76
(dev-v2.6-archive) Fixes to clear error state on scan retry, fixes for CIS hardened cluster
(partially cherry picked from commit af609af172)
2022-01-06 11:33:15 -08:00
Daishan Peng e7c5d7a499
(dev-v2.6-archive) Merge pull request #660 from StrongMonkey/add-rio-annotations
Add istio dependency to rio chart

(partially cherry picked from commit 4cd7a24bd8)
2022-01-06 11:33:14 -08:00
Arvind Iyengar 5e6cfe0671
(dev-v2.6-archive) Replace rancher/busybox w/ rancher/library-busybox
Related Issue: https://github.com/rancher/rancher/issues/28978

(partially cherry picked from commit c263e58157)
2022-01-06 11:33:14 -08:00
Arvind Iyengar b8cec21d48
(dev-v2.6-archive) Rebase to new upstream at kube-prometheus-stack
The old upstream at https://github.com/helm/charts/tree/master/stable/prometheus-operator has been deprecated in favor of the chart at https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack.

This commit modifies the rancher-monitoring patch in order to rebase to this new upstream, so it contains a ton of different changes to the patch file.

Related Issue: rancher/rancher#28822

(partially cherry picked from commit 178528b12c)
2022-01-06 11:33:13 -08:00
Daishan 187233ac3f
(dev-v2.6-archive) Add istio dependency to rio chart
(partially cherry picked from commit f29ed480a8)
2022-01-06 11:33:13 -08:00
Brenda Rearden 6e7b67e0b9
(dev-v2.6-archive) Update istio to 1.7.1
(partially cherry picked from commit 5c46fa62ec)
2022-01-06 11:33:12 -08:00
Darren Shepherd 5f817e15c7
(dev-v2.6-archive) Update rancher-operator and fleet
(partially cherry picked from commit 915894a74a)
2022-01-06 11:33:12 -08:00
rajashree 4789e1bf5e
(dev-v2.6-archive) Expand default resourceset to include 2.5 CRDs
(partially cherry picked from commit 00d42a178c)
2022-01-06 11:33:11 -08:00
Jacob Payne 5093067190
(dev-v2.6-archive) rke1 to rke (#638)
(partially cherry picked from commit 74ea61d262)
2022-01-06 11:33:11 -08:00
Darren Shepherd ff6ccebd8a
(dev-v2.6-archive) Update rancher-operator
(partially cherry picked from commit 4fc422c4b3)
2022-01-06 11:33:10 -08:00
Darren Shepherd 76e34ad2bb
(dev-v2.6-archive) Update rancher-operator crd
(partially cherry picked from commit a0de135517)
2022-01-06 11:33:10 -08:00
Darren Shepherd b2cd7ca9c8
(dev-v2.6-archive) New rancher-operator and fleet
(partially cherry picked from commit 0239984da2)
2022-01-06 11:33:09 -08:00
Darren Shepherd 83d98eead2
(dev-v2.6-archive) rancher-operator v0.1.0-alpha4
(partially cherry picked from commit 16dfb1154b)
2022-01-06 11:33:09 -08:00
Arvind Iyengar 970d5e7246
(dev-v2.6-archive) Create Alertmanager secret in pre-install hook
(partially cherry picked from commit d03ffe81df)
2022-01-06 11:33:08 -08:00
Prachi Damle 145544197f
(dev-v2.6-archive) Merge pull request #644 from prachidamle/new_cis_fixes
New cis-operator state transition fixes

(partially cherry picked from commit 433d3a5ffa)
2022-01-06 11:33:08 -08:00
Jacob Payne 77baa20d90
(dev-v2.6-archive) bumped image versions (#639)
(partially cherry picked from commit 2d2f818ad5)
2022-01-06 11:33:07 -08:00
Prachi Damle 6eb9626f52
(dev-v2.6-archive) Updating cis-operator image tag, correcting readme, updating CRD defn
(partially cherry picked from commit e0a5f24a68)
2022-01-06 11:33:07 -08:00
Darren Shepherd 84fb2b6f98
(dev-v2.6-archive) Update fleet and rancher-operator
(partially cherry picked from commit 2d2bcdde50)
2022-01-06 11:33:06 -08:00
Jacob Payne cc82bdd326
(dev-v2.6-archive) upgraded upstream chart version (#608)
* upgraded upstream chart version

(partially cherry picked from commit 1908520a34)
2022-01-06 11:33:06 -08:00
Arvind Iyengar ef6896d23d
(dev-v2.6-archive) Update docs, descriptions, and other minor fixes
- [rancher-pushprox] add hidden annotation + update description
- [rancher-monitoring] update description + add monitoring app-README.md
- [rancher-monitoring|rancher-pushprox] Move systemDefaultRegistry to global.cattle
- [rancher-monitoring] Move exporter enabled logic to _helpers.tpl

(partially cherry picked from commit 4d5653b2ec)
2022-01-06 11:33:06 -08:00
Darren Shepherd c559ac3867
(dev-v2.6-archive) rancher-webhook v0.1.0-alpha7
(partially cherry picked from commit ec627b5fd2)
2022-01-06 11:33:05 -08:00
Darren Shepherd 0c83354892
(dev-v2.6-archive) rancher-webhook v0.1.0-alpha6
(partially cherry picked from commit a1684f1d11)
2022-01-06 11:33:05 -08:00