Commit Graph

248 Commits (2f61690cc72f4ef82ae1a70fc8262a1e9c0358c3)

Author SHA1 Message Date
Arvind Iyengar 447c6f1125
Move rancherServiceMetrics into main chart 2022-03-08 15:43:32 -08:00
Sebastiaan van Steenis d4e2a0137d
set scrape interval to 30s for monitoring nginx 2022-03-03 22:05:39 +01:00
Sebastiaan van Steenis d3c02d82e4
make charts 2022-03-03 15:41:32 +01:00
Sebastiaan van Steenis 09edfe0c23
add default scrapeinterval for nginx in monitoring 2022-03-03 15:27:23 +01:00
Arvind Iyengar e5ce500071
Provide seLinuxOptions on rkeEtcd 2022-03-02 16:37:14 -08:00
Arvind Iyengar 145196cf66
Add support for pushprox seLinux 2022-03-02 16:37:14 -08:00
Arvind Iyengar ff5544e979
Modify defaults to 1.22+ & use kubeVersionOverrides
This commit modifies the default values for the pushprox exporters deployed by Monitoring for RKE1 and RKE2 to support k8s 1.22+ by default.

In order to retain support for k8s <1.22, we use the newly implemented kubeVersionOverrides in the rancher-pushprox chart to supply them.
2022-03-02 16:37:14 -08:00
Arvind Iyengar 8ff7d753f8
Use applyKubeVersionOverrides in rancher-pushprox
Defines a Helm template called applyKubeVersionOverrides that can be added to each template file that wants to respect values.yaml overrides for specific kubernetes versions.

If defined, this will automatically ignore the value set in the default values.yaml in favor of the one supplied in the values.yaml.
2022-03-02 16:37:13 -08:00
Luther Monson be5a59aeac add permits-os to all charts that needed it 2022-03-02 17:11:40 -07:00
Ricardo Weir b6fb48aa94 Gate dashboard with enabled 2022-03-01 18:59:00 -07:00
Ricardo Weir 8911beba1f Add performance dashboards 2022-03-01 18:58:56 -07:00
Ricardo Weir 4f04899cee Check that lookup result is not empty
If monitoring was enabled on a setup without a rancher service,
such as a docker install, monitoring would fail to install due
to a dereference issue.
2022-02-28 18:50:28 -07:00
Ricardo Weir 0f10aff0fe Add dependency on rancher-service-metrics 2022-02-22 21:13:27 -07:00
Ricardo Weir 6f27156286 Add rancher-service-metrics package 2022-02-22 21:10:36 -07:00
Arvind Iyengar 80cb056ce3
Disable pushprox client metrics by default 2022-01-12 20:04:43 -08:00
Arvind Iyengar 362eb78855
Restructure packages into logical groups 2022-01-06 12:22:40 -08:00
Arvind Iyengar 69516e7541
Redo Chart.yaml patches 2022-01-06 12:07:46 -08:00
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 9c6f4caa01
(dev-v2.6-archive) [rancher-monitoring] Add new annotations
(partially cherry picked from commit 0716f64e3c)
2022-01-06 11:37:38 -08:00
Jiaqi Luo e523133c3a
(dev-v2.6-archive) [rancher-monitoring] Update the Prometheus default memory limit to 3000Mi. issue: https://github.com/rancher/rancher/issues/35529
(partially cherry picked from commit ec7d19c434)
2022-01-06 11:37:37 -08:00
Jiaqi Luo f965b41942
(dev-v2.6-archive) [rancher-monitoring-crd] add the support for seting nodeSelector and tolerations https://github.com/rancher/rancher/issues/34439
(partially cherry picked from commit 531520da9c)
2022-01-06 11:37:36 -08:00
Jiaqi Luo 5d26f4e0b8
(dev-v2.6-archive) [rancher-monitoring] update chart information
(partially cherry picked from commit 8a7dbb7a7b)
2022-01-06 11:37:36 -08:00
Jiaqi Luo 7e381a6c44
(dev-v2.6-archive) [rancher-monitoring] some more fixes
(partially cherry picked from commit 2126dfed6b)
2022-01-06 11:37:34 -08:00
Jiaqi Luo 0b0bdc3c5d
(dev-v2.6-archive) [rancher-monitoring] bump version
(partially cherry picked from commit d121e5f797)
2022-01-06 11:37:34 -08:00
Jiaqi Luo 9901cba4df
(dev-v2.6-archive) [rancher-monitoring] set useTarArchive true
(partially cherry picked from commit 05089d2052)
2022-01-06 11:37:33 -08:00
Jiaqi Luo 866376e483
(dev-v2.6-archive) [rancher-monitoring] update the template of rancher-crd chart to handle CRD tgz file
(partially cherry picked from commit 1225dc843a)
2022-01-06 11:37:33 -08:00
Jiaqi Luo 9ac903397d
(dev-v2.6-archive) [rancher-monitoring] remove the duplicated line from the clusterrole.yaml
issue: https://github.com/rancher/rancher/issues/35264

(partially cherry picked from commit 45ccbe6d05)
2022-01-06 11:37:32 -08:00
Jiaqi Luo ac13d0fd26
(dev-v2.6-archive) Update rancher-monitoring to new base c6208979d494156a3869d2e5faab669ce4301c68, upstream chart kube-prometheus-stack 19.0.3
(partially cherry picked from commit d6f6f208df)
2022-01-06 11:37:25 -08:00
Jiaqi Luo 980d7e2009
(dev-v2.6-archive) Rebase to c6208979d494156a3869d2e5faab669ce4301c68
(partially cherry picked from commit 3d2233d49e)
2022-01-06 11:37:25 -08:00
Jiaqi Luo 33733f4819
(dev-v2.6-archive) Update rancher-monitoring to new base 12699d2f, upstream chart kube-prometheus-stack 19.0.0
(partially cherry picked from commit f299cdb7fb)
2022-01-06 11:37:24 -08:00
Jiaqi Luo 142e5bcaa6
(dev-v2.6-archive) Rebase to 12699d2f
(partially cherry picked from commit 8cdd6851ed)
2022-01-06 11:37:24 -08:00
Jiaqi Luo 1564e79cc7
(dev-v2.6-archive) Update rancher-monitoring to new base cc8b7c, upstream chart kube-prometheus-stack 18.0.0
(partially cherry picked from commit 31aee42627)
2022-01-06 11:37:23 -08:00
Jiaqi Luo 7fe67cff90
(dev-v2.6-archive) Rebase to cc8b7c
(partially cherry picked from commit 5fba1eec93)
2022-01-06 11:37:22 -08:00
Jiaqi Luo beaa8cc39b
(dev-v2.6-archive) Update rancher-monitoring to new base ea0e187, upstream chart kube-prometheus-stack 17.0.0
(partially cherry picked from commit e1fecd7314)
2022-01-06 11:37:21 -08:00
Jiaqi Luo c314e527b4
(dev-v2.6-archive) Rebase to ea0e187
(partially cherry picked from commit 0b9eff2180)
2022-01-06 11:37:20 -08:00
Jiaqi Luo 2d3f6561ba
(dev-v2.6-archive) Revert "Merge pull request #1621 from luthermonson/monitoring-win2022"
This reverts commit 01232b1780, reversing
changes made to 0f3c2b7900.

(partially cherry picked from commit 60aa84153e)
2022-01-06 11:37:20 -08:00
Luther Monson 0bdcf9e7f6
(dev-v2.6-archive) bumping windows exporter for ltsc2022 support
(partially cherry picked from commit 3c190192ca)
2022-01-06 11:37:18 -08:00
Arvind Iyengar 267efa9708
(dev-v2.6-archive) Merge pull request #1443 from aiyengar2/revert_rke2_windows
Revert "Merge pull request #1438 from aiyengar2/add_rke2_windows"

(partially cherry picked from commit 2543895e47)
2022-01-06 11:36:00 -08:00
Caleb Bron 098745d39b
(dev-v2.6-archive) Merge pull request #1440 from manuelbuil/dev-v2.6-sriov
Move sriov chart to version to 100.x.x

(partially cherry picked from commit f94608f5ff)
2022-01-06 11:35:59 -08:00
Arvind Iyengar 3829485a10
(dev-v2.6-archive) Revert "Merge pull request #1438 from aiyengar2/add_rke2_windows"
This reverts commit 0cc42d3464, reversing
changes made to 2e4ae4f5a8.

(partially cherry picked from commit f5ee817c09)
2022-01-06 11:35:58 -08:00
Arvind Iyengar 8bcc4b0e07
(dev-v2.6-archive) Trigger windows components in logging if either windows field is true
(partially cherry picked from commit 19ab551eef)
2022-01-06 11:35:55 -08:00
Colleen Murphy 44b0ec3904
(dev-v2.6-archive) Bump eks and gke operators to final releases
(partially cherry picked from commit 24f33ba4ae)
2022-01-06 11:35:54 -08:00
Arvind Iyengar ea74cd7933
(dev-v2.6-archive) Redo patches due to dependency modifications
(partially cherry picked from commit 30a749a867)
2022-01-06 11:35:53 -08:00
Arvind Iyengar ff4ef3dcd6
(dev-v2.6-archive) Add rke2Windows dependency
(partially cherry picked from commit c93b7a3d68)
2022-01-06 11:35:52 -08:00
Arvind Iyengar 892a561d6f
(dev-v2.6-archive) Rename windowsExporter to rkeWindows
(partially cherry picked from commit 483a17cf25)
2022-01-06 11:35:52 -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
Arvind Iyengar c332870010
(dev-v2.6-archive) Bump nginx image
(partially cherry picked from commit e3398074ea)
2022-01-06 11:35:25 -08:00
Arvind Iyengar 1cace26711
(dev-v2.6-archive) Add rewrite rule to Prometheus and Grafana for /k8s/clusters
(partially cherry picked from commit b93fe34e57)
2022-01-06 11:34:57 -08:00
Arvind Iyengar 0300243b26
(dev-v2.6-archive) Merge pull request #1319 from aiyengar2/remove_alertmanager_secret_job
Remove alertmanager pre-install job in favor of Helm annotations

(partially cherry picked from commit 40cc26ecc0)
2022-01-06 11:34:56 -08:00
Steven Crespo a78bbef484
(dev-v2.6-archive) Fix vsphere cpi
- Add toggle to enable/disable rbac through chart values
- Add question to apply node selector label based on cluster type
- Update cloud controller manager labels/names to avoid conflict

(partially cherry picked from commit 557d26eb9c)
2022-01-06 11:34:49 -08:00
Arvind Iyengar 751ca462f6
(dev-v2.6-archive) Remove alertmanager pre-install job in favor of Helm annotations
(partially cherry picked from commit d69ab2578e)
2022-01-06 11:34:49 -08:00
Arvind Iyengar 434efe02f0
(dev-v2.6-archive) Merge pull request #1314 from aiyengar2/change_rancher_agent
Change CRD install image to rancher/shell and bump nginx

(partially cherry picked from commit 87f5494093)
2022-01-06 11:34:47 -08:00
Michal Jura a4b9d26485
(dev-v2.6-archive) Merge pull request #1308 from mjura/dev-v2.6
Bump aks-operator chart to 1.0.1-rc14

(partially cherry picked from commit 95dd4d82b5)
2022-01-06 11:34:45 -08:00
Arvind Iyengar 0402151bdd
(dev-v2.6-archive) Bump nginx image
(partially cherry picked from commit 4b88995876)
2022-01-06 11:34:44 -08:00
Donnie Adams 10891a4a16
(dev-v2.6-archive) Bump gke-operator chart to 1.1.1-rc6
(partially cherry picked from commit 6bef09778f)
2022-01-06 11:34:42 -08:00
Arvind Iyengar 60fe375cf8
(dev-v2.6-archive) Use rancher/shell
(partially cherry picked from commit 75481c6cec)
2022-01-06 11:34:41 -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 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
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
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
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
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
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
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
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
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
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
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
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 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
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
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
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 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