Generated changes

assets/index.yaml

@@ -1066,6 +1066,134 @@ entries:
     - assets/rancher-logging/rancher-logging-crd-3.6.000.tgz
     version: 3.6.000
   rancher-monitoring:
+  - annotations:
+      artifacthub.io/links: |
+        - name: Chart Source
+          url: https://github.com/prometheus-community/helm-charts
+        - name: Upstream Project
+          url: https://github.com/prometheus-operator/kube-prometheus
+      artifacthub.io/operator: "true"
+      catalog.cattle.io/auto-install: rancher-monitoring-crd=match
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/display-name: Monitoring
+      catalog.cattle.io/namespace: cattle-monitoring-system
+      catalog.cattle.io/provides-gvr: monitoring.coreos.com.prometheus/v1
+      catalog.cattle.io/release-name: rancher-monitoring
+      catalog.cattle.io/ui-component: monitoring
+    apiVersion: v1
+    appVersion: 0.38.1
+    created: "2020-11-17T17:43:36.447225833Z"
+    dependencies:
+    - condition: kubeStateMetrics.enabled
+      name: kube-state-metrics
+      repository: https://charts.helm.sh/stable/
+      version: 2.8.14
+    - condition: nodeExporter.enabled
+      name: prometheus-node-exporter
+      repository: https://prometheus-community.github.io/helm-charts
+      version: 1.11.2
+    - condition: grafana.enabled
+      name: grafana
+      repository: https://grafana.github.io/helm-charts
+      version: 5.6.4
+    - condition: prometheus-adapter.enabled
+      name: prometheus-adapter
+      repository: https://prometheus-community.github.io/helm-charts
+      version: 2.7.1
+    - alias: rkeControllerManager
+      condition: rkeControllerManager.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rkeScheduler
+      condition: rkeScheduler.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rkeProxy
+      condition: rkeProxy.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rkeEtcd
+      condition: rkeEtcd.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: k3sServer
+      condition: k3sServer.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmControllerManager
+      condition: kubeAdmControllerManager.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmScheduler
+      condition: kubeAdmScheduler.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmProxy
+      condition: kubeAdmProxy.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmEtcd
+      condition: kubeAdmEtcd.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2ControllerManager
+      condition: rke2ControllerManager.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2Scheduler
+      condition: rke2Scheduler.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2Proxy
+      condition: rke2Proxy.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2Etcd
+      condition: rke2Etcd.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    description: Collects several related Helm charts, Grafana dashboards, and Prometheus
+      rules combined with documentation and scripts to provide easy to operate end-to-end
+      Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
+    digest: 4b76dac4b1ef39456a25d3d40d0ac4b3d8a146ec7ea3359a209436f7890397e3
+    home: https://github.com/prometheus-operator/kube-prometheus
+    icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
+    keywords:
+    - operator
+    - prometheus
+    - kube-prometheus
+    - monitoring
+    maintainers:
+    - name: vsliouniaev
+    - name: bismarck
+    - email: gianrubio@gmail.com
+      name: gianrubio
+    - email: github.gkarthiks@gmail.com
+      name: gkarthiks
+    - email: scott@r6by.com
+      name: scottrigby
+    - email: miroslav.hadzhiev@gmail.com
+      name: Xtigyro
+    name: rancher-monitoring
+    sources:
+    - https://github.com/prometheus-community/helm-charts
+    - https://github.com/prometheus-operator/kube-prometheus
+    urls:
+    - assets/rancher-monitoring/rancher-monitoring-9.4.202.tgz
+    version: 9.4.202
   - annotations:
       artifacthub.io/links: |
         - name: Chart Source
@@ -1332,6 +1460,20 @@ entries:
     - assets/rancher-monitoring/rancher-monitoring-9.4.200.tgz
     version: 9.4.200
   rancher-monitoring-crd:
+  - annotations:
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/hidden: "true"
+      catalog.cattle.io/namespace: cattle-monitoring-system
+      catalog.cattle.io/release-name: rancher-monitoring-crd
+    apiVersion: v1
+    created: "2020-11-17T17:43:36.452387226Z"
+    description: Installs the CRDs for rancher-monitoring.
+    digest: 68f21cce4cd3441f8580fe8844144f8b453886cad97726146e66fd5649aff93e
+    name: rancher-monitoring-crd
+    type: application
+    urls:
+    - assets/rancher-monitoring/rancher-monitoring-crd-9.4.202.tgz
+    version: 9.4.202
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
@@ -1456,6 +1598,22 @@ entries:
     - assets/rancher-operator-crd/rancher-operator-crd-0.1.0-alpha800.tgz
     version: 0.1.0-alpha800
   rancher-pushprox:
+  - annotations:
+      catalog.cattle.io/hidden: "true"
+      catalog.rancher.io/certified: rancher
+      catalog.rancher.io/namespace: cattle-monitoring-system
+      catalog.rancher.io/release-name: rancher-pushprox
+    apiVersion: v1
+    appVersion: 0.1.0
+    created: "2020-11-17T17:43:36.453025025Z"
+    description: Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx
+      clients.
+    digest: 744b8871e6e175c20c97bf9e15fef8dc7d2e35976f99bcfb4d3019f818b76118
+    name: rancher-pushprox
+    type: application
+    urls:
+    - assets/rancher-pushprox/rancher-pushprox-0.1.2.tgz
+    version: 0.1.2
   - annotations:
       catalog.cattle.io/hidden: "true"
       catalog.rancher.io/certified: rancher
@@ -1565,4 +1723,4 @@ entries:
     urls:
     - assets/rio/rio-0.8.000.tgz
     version: 0.8.000
-generated: "2020-11-16T22:02:04.70543251Z"
+generated: "2020-11-17T17:43:36.427832658Z"

charts/rancher-monitoring/Chart.yaml

@@ -39,4 +39,4 @@ name: rancher-monitoring
 sources:
 - https://github.com/prometheus-community/helm-charts
 - https://github.com/prometheus-operator/kube-prometheus
-version: 9.4.201
+version: 9.4.202

charts/rancher-monitoring/README.md

@@ -15,7 +15,7 @@ _Note: This chart was formerly named `prometheus-operator` chart, now renamed to
 
 ```console
 helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
-helm repo add stable https://kubernetes-charts.storage.googleapis.com/
+helm repo add stable https://charts.helm.sh/stable/
 helm repo update
 ```
 

charts/rancher-monitoring/charts-crd/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 9.4.201
+version: 9.4.202
 description: Installs the CRDs for rancher-monitoring.
 name: rancher-monitoring-crd
 type: application

charts/rancher-monitoring/charts-crd/templates/rbac.yaml

@@ -10,6 +10,11 @@ rules:
   resources:
   - customresourcedefinitions
   verbs: ['create', 'get', 'patch', 'delete']
+- apiGroups: ['policy']
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ .Chart.Name }}-manager
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -33,3 +38,35 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name }}-manager
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ .Chart.Name }}-manager
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Chart.Name }}-manager
+spec:
+  privileged: false
+  allowPrivilegeEscalation: false
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'MustRunAsNonRoot'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false
+  volumes:
+    - 'configMap'
+    - 'secret'

charts/rancher-monitoring/charts/kube-state-metrics/values.yaml.orig

@@ -0,0 +1,155 @@
+# Default values for kube-state-metrics.
+prometheusScrape: true
+image:
+  repository: quay.io/coreos/kube-state-metrics
+  tag: v1.9.7
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+# - name: "image-pull-secret"
+
+# If set to true, this will deploy kube-state-metrics as a StatefulSet and the data
+# will be automatically sharded across <.Values.replicas> pods using the built-in
+# autodiscovery feature: https://github.com/kubernetes/kube-state-metrics#automated-sharding
+# This is an experimental feature and there are no stability guarantees.
+autosharding:
+  enabled: false
+
+replicas: 1
+
+service:
+  port: 8080
+  # Default to clusterIP for backward compatibility
+  type: ClusterIP
+  nodePort: 0
+  loadBalancerIP: ""
+  annotations: {}
+
+customLabels: {}
+
+hostNetwork: false
+
+rbac:
+  # If true, create & use RBAC resources
+  create: true
+
+serviceAccount:
+  # Specifies whether a ServiceAccount should be created, require rbac true
+  create: true
+  # The name of the ServiceAccount to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+  # Reference to one or more secrets to be used when pulling images
+  # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  imagePullSecrets: []
+  # ServiceAccount annotations.
+  # Use case: AWS EKS IAM roles for service accounts
+  # ref: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
+  annotations: {}
+
+prometheus:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    honorLabels: false
+
+## Specify if a Pod Security Policy for kube-state-metrics must be created
+## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
+##
+podSecurityPolicy:
+  enabled: false
+  annotations: {}
+    ## Specify pod annotations
+    ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor
+    ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp
+    ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#sysctl
+    ##
+    # seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*'
+    # seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default'
+    # apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default'
+
+  additionalVolumes: []
+
+securityContext:
+  enabled: true
+  runAsGroup: 65534
+  runAsUser: 65534
+  fsGroup: 65534
+
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+nodeSelector: {}
+
+## Affinity settings for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+affinity: {}
+
+## Tolerations for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+
+# Annotations to be added to the pod
+podAnnotations: {}
+
+## Assign a PriorityClassName to pods if set
+# priorityClassName: ""
+
+# Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+podDisruptionBudget: {}
+
+# Available collectors for kube-state-metrics. By default all available
+# collectors are enabled.
+collectors:
+  certificatesigningrequests: true
+  configmaps: true
+  cronjobs: true
+  daemonsets: true
+  deployments: true
+  endpoints: true
+  horizontalpodautoscalers: true
+  ingresses: true
+  jobs: true
+  limitranges: true
+  mutatingwebhookconfigurations: true
+  namespaces: true
+  networkpolicies: true
+  nodes: true
+  persistentvolumeclaims: true
+  persistentvolumes: true
+  poddisruptionbudgets: true
+  pods: true
+  replicasets: true
+  replicationcontrollers: true
+  resourcequotas: true
+  secrets: true
+  services: true
+  statefulsets: true
+  storageclasses: true
+  validatingwebhookconfigurations: true
+  verticalpodautoscalers: false
+  volumeattachments: true
+
+# Namespace to be enabled for collecting resources. By default all namespaces are collected.
+# namespace: ""
+
+## Override the deployment namespace
+##
+namespaceOverride: ""
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #  cpu: 100m
+  #  memory: 64Mi
+  # requests:
+  #  cpu: 10m
+  #  memory: 32Mi
+
+## Provide a k8s version to define apiGroups for podSecurityPolicy Cluster Role.
+## For example: kubeTargetVersionOverride: 1.14.9
+##
+kubeTargetVersionOverride: ""

charts/rancher-monitoring/charts/prometheus-adapter/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.6.0
+appVersion: v0.7.0
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/DirectXMan12/k8s-prometheus-adapter
 keywords:
@@ -17,4 +17,4 @@ name: prometheus-adapter
 sources:
 - https://github.com/kubernetes/charts
 - https://github.com/DirectXMan12/k8s-prometheus-adapter
-version: 2.4.0
+version: 2.7.1

charts/rancher-monitoring/charts/prometheus-adapter/README.md

@@ -6,22 +6,74 @@ Installs the [Prometheus Adapter](https://github.com/DirectXMan12/k8s-prometheus
 
 Kubernetes 1.14+
 
-## Installing the Chart
+## Get Repo Info
-
-To install the chart with the release name `my-release`:
 
 ```console
-$ helm install --name my-release stable/prometheus-adapter
+helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+helm repo update
 ```
 
-This command deploys the prometheus adapter with the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
 
-## Using the Chart
+## Install Chart
+
+```console
+# Helm 3
+$ helm install [RELEASE_NAME] prometheus-community/prometheus-adapter
+
+# Helm 2
+$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-adapter
+```
+
+_See [configuration](#configuration) below._
+
+_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._
+
+## Uninstall Chart
+
+```console
+# Helm 3
+$ helm uninstall [RELEASE_NAME]
+
+# Helm 2
+# helm delete --purge [RELEASE_NAME]
+```
+
+This removes all the Kubernetes components associated with the chart and deletes the release.
+
+_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._
+
+## Upgrading Chart
+
+```console
+# Helm 3 or 2
+$ helm upgrade [RELEASE_NAME] [CHART] --install
+```
+
+_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
+
+## Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:
+
+```console
+# Helm 2
+$ helm inspect values prometheus-community/prometheus-adapter
+
+# Helm 3
+$ helm show values prometheus-community/prometheus-adapter
+```
+
+### Prometheus Service Endpoint
 
 To use the chart, ensure the `prometheus.url` and `prometheus.port` are configured with the correct Prometheus service endpoint. If Prometheus is exposed under HTTPS the host's CA Bundle must be exposed to the container using `extraVolumes` and `extraVolumeMounts`.
 
+### Adapter Rules
+
 Additionally, the chart comes with a set of default rules out of the box but they may pull in too many metrics or not map them correctly for your needs. Therefore, it is recommended to populate `rules.custom` with a list of rules (see the [config document](https://github.com/DirectXMan12/k8s-prometheus-adapter/blob/master/docs/config.md) for the proper format).
 
+### Horizontal Pod Autoscaler Metrics
+
 Finally, to configure your Horizontal Pod Autoscaler to use the custom metric, see the custom metrics section of the [HPA walkthrough](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#autoscaling-on-multiple-metrics-and-custom-metrics).
 
 The Prometheus Adapter can serve three different [metrics APIs](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/#support-for-metrics-apis):
@@ -30,7 +82,7 @@ The Prometheus Adapter can serve three different [metrics APIs](https://kubernet
 
 Enabling this option will cause custom metrics to be served at `/apis/custom.metrics.k8s.io/v1beta1`. Enabled by default when `rules.default` is true, but can be customized by populating `rules.custom`:
 
-```
+```yaml
 rules:
   custom:
   - seriesQuery: '{__name__=~"^some_metric_count$"}'
@@ -46,7 +98,7 @@ rules:
 
 Enabling this option will cause external metrics to be served at `/apis/external.metrics.k8s.io/v1beta1`. Can be enabled by populating `rules.external`:
 
-```
+```yaml
 rules:
   external:
   - seriesQuery: '{__name__=~"^some_metric_count$"}'
@@ -62,7 +114,7 @@ rules:
 
 Enabling this option will cause resource metrics to be served at `/apis/metrics.k8s.io/v1beta1`. Resource metrics will allow pod CPU and Memory metrics to be used in [Horizontal Pod Autoscalers](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) as well as the `kubectl top` command. Can be enabled by populating `rules.resource`:
 
-```
+```yaml
 rules:
   resource:
     cpu:
@@ -93,68 +145,3 @@ rules:
 ```
 
 **NOTE:** Setting a value for `rules.resource` will also deploy the resource metrics API service, providing the same functionality as [metrics-server](https://github.com/helm/charts/tree/master/stable/metrics-server). As such it is not possible to deploy them both in the same cluster.
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Configuration
-
-The following table lists the configurable parameters of the Prometheus Adapter chart and their default values.
-
-| Parameter                       | Description                                                                     | Default                                     |
-| ------------------------------- | ------------------------------------------------------------------------------- | --------------------------------------------|
-| `affinity`                      | Node affinity                                                                   | `{}`                                        |
-| `image.repository`              | Image repository                                                                | `rancher/directxman12-k8s-prometheus-adapter-amd64` |
-| `image.tag`                     | Image tag                                                                       | `v0.6.0`                                    |
-| `image.pullPolicy`              | Image pull policy                                                               | `IfNotPresent`                              |
-| `image.pullSecrets`             | Image pull secrets                                                              | `{}`                                        |
-| `logLevel`                      | Log level                                                                       | `4`                                         |
-| `listenPort`                    | Port that application would listen on in the container                          | `6443`                                      |
-| `metricsRelistInterval`         | Interval at which to re-list the set of all available metrics from Prometheus   | `1m`                                        |
-| `nodeSelector`                  | Node labels for pod assignment                                                  | `{}`                                        |
-| `podLabels`                     | Labels to add to the pod                                                        | `{}`                                        |
-| `podAnnotations`                | Annotations to add to the pod                                                   | `{}`                                        |
-| `priorityClassName`             | Pod priority                                                                    | ``                                          |
-| `prometheus.url`                | Url of where we can find the Prometheus service                                 | `http://prometheus.default.svc`             |
-| `prometheus.port`               | Port of where we can find the Prometheus service, zero to omit this option      | `9090`                                      |
-| `prometheus.path`               | Custom path to append to the prometheus URL                                     | ``                                          |
-| `rbac.create`                   | If true, create & use RBAC resources                                            | `true`                                      |
-| `resources`                     | CPU/Memory resource requests/limits                                             | `{}`                                        |
-| `rules.default`                 | If `true`, enable a set of default rules in the configmap                       | `true`                                      |
-| `rules.custom`                  | A list of custom configmap rules                                                | `[]`                                        |
-| `rules.existing`                | The name of an existing configMap with rules. Overrides default, custom and external. | ``                                    |
-| `rules.external`                | A list of custom rules for external metrics API                                 | `[]`                                        |
-| `rules.resource`                | `resourceRules` to set in configmap rules                                       | `{}`                                        |
-| `service.annotations`           | Annotations to add to the service                                               | `{}`                                        |
-| `service.port`                  | Service port to expose                                                          | `443`                                       |
-| `service.type`                  | Type of service to create                                                       | `ClusterIP`                                 |
-| `serviceAccount.create`         | If true, create & use Serviceaccount                                            | `true`                                      |
-| `serviceAccount.name`           | If not set and create is true, a name is generated using the fullname template  | ``                                          |
-| `tls.enable`                    | If true, use the provided certificates. If false, generate self-signed certs    | `false`                                     |
-| `tls.ca`                        | Public CA file that signed the APIService (ignored if tls.enable=false)         | ``                                          |
-| `tls.key`                       | Private key of the APIService (ignored if tls.enable=false)                     | ``                                          |
-| `tls.certificate`               | Public key of the APIService (ignored if tls.enable=false)                      | ``                                          |
-| `extraVolumeMounts`             | Any extra volumes mounts                                                        | `[]`                                        |
-| `extraVolumes`                  | Any extra volumes                                                               | `[]`                                        |
-| `tolerations`                   | List of node taints to tolerate                                                 | `[]`                                        |
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install --name my-release \
-  --set logLevel=1 \
- stable/prometheus-adapter
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```console
-$ helm install --name my-release -f values.yaml stable/prometheus-adapter
-```

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-apiserver-auth-delegator-cluster-role-binding.yaml

@@ -7,7 +7,7 @@ metadata:
     chart: {{ template "k8s-prometheus-adapter.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  name: {{ template "k8s-prometheus-adapter.name" . }}:system:auth-delegator
+  name: {{ template "k8s-prometheus-adapter.name" . }}-system-auth-delegator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-apiserver-auth-reader-role-binding.yaml

@@ -8,6 +8,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   name: {{ template "k8s-prometheus-adapter.name" . }}-auth-reader
+  namespace: kube-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml

@@ -7,6 +7,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   name: {{ template "k8s-prometheus-adapter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-apiserver-pdb.yaml

@@ -0,0 +1,22 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "k8s-prometheus-adapter.fullname" . }}
+  labels:
+    app: {{ template "k8s-prometheus-adapter.name" . }}
+    chart: {{ template "k8s-prometheus-adapter.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end  }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end  }}
+  selector:
+    matchLabels:
+      app: {{ template "k8s-prometheus-adapter.name" . }}
+      release: {{ .Release.Name }}
+{{- end }}

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-apiserver-psp.yaml

@@ -0,0 +1,68 @@
+{{- if .Values.psp.create -}}
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "k8s-prometheus-adapter.fullname" . }}
+  labels:
+    app: {{ template "k8s-prometheus-adapter.name" . }}
+    chart: {{ template "k8s-prometheus-adapter.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  {{- if .Values.hostNetwork.enabled }}
+  hostNetwork: true
+  {{- end }}
+  fsGroup:
+    rule: RunAsAny
+  runAsGroup:
+    rule: RunAsAny
+  runAsUser:
+    rule: MustRunAs
+    ranges:
+    - min: 1024
+      max: 65535
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+  - secret
+  - emptyDir
+  - configMap
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app: {{ template "k8s-prometheus-adapter.name" . }}
+    chart: {{ template "k8s-prometheus-adapter.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  name: {{ template "k8s-prometheus-adapter.name" . }}-psp
+rules:
+- apiGroups: 
+  - 'policy'
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ template "k8s-prometheus-adapter.fullname" . }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app: {{ template "k8s-prometheus-adapter.name" . }}
+    chart: {{ template "k8s-prometheus-adapter.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  name: {{ template "k8s-prometheus-adapter.name" . }}-psp
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "k8s-prometheus-adapter.name" . }}-psp
+subjects:
+- kind: ServiceAccount
+  name: {{ template "k8s-prometheus-adapter.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
+{{- end -}}

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-apiserver-service-account.yaml

@@ -8,4 +8,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   name: {{ template "k8s-prometheus-adapter.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
 {{- end -}}

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-apiserver-service.yaml

@@ -9,6 +9,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   name: {{ template "k8s-prometheus-adapter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - port: {{ .Values.service.port }}

charts/rancher-monitoring/charts/prometheus-adapter/templates/custom-metrics-configmap.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "k8s-prometheus-adapter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "k8s-prometheus-adapter.name" . }}
     chart: {{ template "k8s-prometheus-adapter.chart" . }}

charts/rancher-monitoring/charts/prometheus-adapter/templates/hpa-custom-metrics-cluster-role-binding.yaml

@@ -1,4 +1,8 @@
-{{- if .Values.rbac.create -}}
+{{- /*
+This if must be aligned with custom-metrics-cluster-role.yaml
+as otherwise this binding will point to not existing role.
+*/ -}}
+{{- if and .Values.rbac.create (or .Values.rules.default .Values.rules.custom) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

charts/rancher-monitoring/charts/prometheus-adapter/values.yaml

@@ -3,7 +3,7 @@ affinity: {}
 
 image:
   repository: rancher/directxman12-k8s-prometheus-adapter-amd64
-  tag: v0.6.0
+  tag: v0.7.0
   pullPolicy: IfNotPresent
 
 logLevel: 4
@@ -28,6 +28,10 @@ rbac:
   # Specifies whether RBAC resources should be created
   create: true
 
+psp:
+  # Specifies whether PSP resources should be created
+  create: false
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -140,6 +144,9 @@ hostNetwork:
   # if you use Weave network on EKS
   enabled: false
 
-securityContext:
+podDisruptionBudget:
-  runAsNonRoot: true
+  # Specifies if PodDisruptionBudget should be enabled
-  runAsUser: 1000
+  # When enabled, minAvailable or maxUnavailable should also be defined.
+  enabled: false
+  minAvailable:
+  maxUnavailable: 1

charts/rancher-monitoring/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: kube-state-metrics
-  repository: https://kubernetes-charts.storage.googleapis.com/
+  repository: https://charts.helm.sh/stable/
   version: 2.8.14
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
@@ -9,46 +9,46 @@ dependencies:
   repository: https://grafana.github.io/helm-charts
   version: 5.6.4
 - name: prometheus-adapter
-  repository: https://kubernetes-charts.storage.googleapis.com/
+  repository: https://prometheus-community.github.io/helm-charts
-  version: 2.4.0
+  version: 2.7.1
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
 - name: rancher-pushprox
   repository: file://../../rancher-pushprox/charts
-  version: 0.1.1
+  version: 0.1.2
-digest: sha256:90a85a9a509395cba1abe15aec8f6f15157edd7ad61efef42e37112ec39e79a3
+digest: sha256:e9fe12d245bde664b9f3e332cd3a4c94e691e8a81120afa4631eb0041149e252
-generated: "2020-11-04T22:21:55.839800778Z"
+generated: "2020-11-17T17:43:30.848202475Z"

charts/rancher-monitoring/requirements.yaml

@@ -1,7 +1,7 @@
 dependencies:
   - name: kube-state-metrics
     version: 2.8.14
-    repository: https://kubernetes-charts.storage.googleapis.com/
+    repository: https://charts.helm.sh/stable/
     condition: kubeStateMetrics.enabled
   - name: prometheus-node-exporter
     version: 1.11.2
@@ -13,84 +13,84 @@ dependencies:
     condition: grafana.enabled
 
   - name: prometheus-adapter
-    version: 2.4.0
+    version: 2.7.1
-    repository: https://kubernetes-charts.storage.googleapis.com/
+    repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-adapter.enabled
 
   - name: rancher-pushprox
     alias: rkeControllerManager
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rkeControllerManager.enabled
 
   - name: rancher-pushprox
     alias: rkeScheduler
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rkeScheduler.enabled
 
   - name: rancher-pushprox
     alias: rkeProxy
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rkeProxy.enabled
 
   - name: rancher-pushprox
     alias: rkeEtcd
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rkeEtcd.enabled
 
   - name: rancher-pushprox
     alias: k3sServer
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: k3sServer.enabled
 
   - name: rancher-pushprox
     alias: kubeAdmControllerManager
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: kubeAdmControllerManager.enabled
 
   - name: rancher-pushprox
     alias: kubeAdmScheduler
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: kubeAdmScheduler.enabled
 
   - name: rancher-pushprox
     alias: kubeAdmProxy
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: kubeAdmProxy.enabled
 
   - name: rancher-pushprox
     alias: kubeAdmEtcd
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: kubeAdmEtcd.enabled
 
   - name: rancher-pushprox
     alias: rke2ControllerManager
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rke2ControllerManager.enabled
 
   - name: rancher-pushprox
     alias: rke2Scheduler
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rke2Scheduler.enabled
 
   - name: rancher-pushprox
     alias: rke2Proxy
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rke2Proxy.enabled
 
   - name: rancher-pushprox
     alias: rke2Etcd
-    version: 0.1.1
+    version: 0.1.2
     repository: file://../../rancher-pushprox/charts
     condition: rke2Etcd.enabled

charts/rancher-monitoring/templates/alertmanager/secret.yaml

@@ -90,6 +90,11 @@ rules:
   resources:
   - secrets
   verbs: ['create', 'get', 'patch']
+- apiGroups: ['policy']
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -121,4 +126,39 @@ metadata:
     "helm.sh/hook": pre-install
     "helm.sh/hook-delete-policy": hook-succeeded, hook-failed
     "helm.sh/hook-weight": "3"
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-pre-install
+  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  labels:
+    app: {{ template "kube-prometheus-stack.name" . }}-alertmanager
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-delete-policy": hook-succeeded, hook-failed
+    "helm.sh/hook-weight": "3"
+spec:
+  privileged: false
+  allowPrivilegeEscalation: false
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'MustRunAsNonRoot'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false
+  volumes:
+    - 'secret'
 {{- end }}

charts/rancher-monitoring/templates/rancher-monitoring/hardened.yaml

@@ -45,6 +45,11 @@ rules:
   resources:
   - serviceaccounts
   verbs: ['get', 'patch']
+- apiGroups: ['policy']
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ .Chart.Name }}-patch-sa
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -68,6 +73,36 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name }}-patch-sa
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ .Chart.Name }}-patch-sa
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Chart.Name }}-patch-sa
+spec:
+  privileged: false
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'MustRunAsNonRoot'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false
+  volumes:
+    - 'secret'
 {{- range $_, $ns := $namespaces }}
 ---
 apiVersion: networking.k8s.io/v1

charts/rancher-monitoring/values.yaml

@@ -5,7 +5,7 @@
 # Rancher Monitoring Configuration
 
 ## Configuration for prometheus-adapter
-## ref: https://github.com/helm/charts/tree/master/stable/prometheus-adapter
+## ref: https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-adapter
 ##
 prometheus-adapter:
   enabled: true
@@ -15,9 +15,11 @@ prometheus-adapter:
     port: 9090
   image:
     repository: rancher/directxman12-k8s-prometheus-adapter-amd64
-    tag: v0.6.0
+    tag: v0.7.0
     pullPolicy: IfNotPresent
     pullSecrets: {}
+  psp:
+    create: true
 
 ## RKE PushProx Monitoring
 ## ref: https://github.com/rancher/charts/tree/master/packages/rancher-pushprox

charts/rancher-pushprox/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 0.1.1
+version: 0.1.2
 appVersion: 0.1.0
 annotations:
   catalog.rancher.io/certified: rancher

charts/rancher-pushprox/templates/pushprox-proxy-rbac.yaml

@@ -0,0 +1,63 @@
+{{- if and .Values.proxy }}{{ if .Values.proxy.enabled }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ template "pushProxy.proxy.name" . }}
+  labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }}
+rules:
+- apiGroups: ['policy']
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ template "pushProxy.proxy.name" . }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ template "pushProxy.proxy.name" . }}
+  labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "pushProxy.proxy.name" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "pushProxy.proxy.name" . }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "pushProxy.proxy.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }}
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "pushProxy.proxy.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }}
+spec:
+  privileged: false
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'MustRunAsNonRoot'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false
+  volumes:
+    - 'secret'
+{{- end }}{{- end }}

charts/rancher-pushprox/templates/pushprox-proxy.yaml

@@ -22,6 +22,7 @@ spec:
 {{- if .Values.proxy.tolerations }}
       tolerations: {{ toYaml .Values.proxy.tolerations | nindent 6 }}
 {{- end }}
+      serviceAccountName: {{ template "pushProxy.proxy.name" . }}
       containers:
       - name: pushprox-proxy
         image: {{ template "system_default_registry" . }}{{ .Values.proxy.image.repository }}:{{ .Values.proxy.image.tag }}

index.yaml

@@ -1066,6 +1066,134 @@ entries:
     - assets/rancher-logging/rancher-logging-crd-3.6.000.tgz
     version: 3.6.000
   rancher-monitoring:
+  - annotations:
+      artifacthub.io/links: |
+        - name: Chart Source
+          url: https://github.com/prometheus-community/helm-charts
+        - name: Upstream Project
+          url: https://github.com/prometheus-operator/kube-prometheus
+      artifacthub.io/operator: "true"
+      catalog.cattle.io/auto-install: rancher-monitoring-crd=match
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/display-name: Monitoring
+      catalog.cattle.io/namespace: cattle-monitoring-system
+      catalog.cattle.io/provides-gvr: monitoring.coreos.com.prometheus/v1
+      catalog.cattle.io/release-name: rancher-monitoring
+      catalog.cattle.io/ui-component: monitoring
+    apiVersion: v1
+    appVersion: 0.38.1
+    created: "2020-11-17T17:43:36.447225833Z"
+    dependencies:
+    - condition: kubeStateMetrics.enabled
+      name: kube-state-metrics
+      repository: https://charts.helm.sh/stable/
+      version: 2.8.14
+    - condition: nodeExporter.enabled
+      name: prometheus-node-exporter
+      repository: https://prometheus-community.github.io/helm-charts
+      version: 1.11.2
+    - condition: grafana.enabled
+      name: grafana
+      repository: https://grafana.github.io/helm-charts
+      version: 5.6.4
+    - condition: prometheus-adapter.enabled
+      name: prometheus-adapter
+      repository: https://prometheus-community.github.io/helm-charts
+      version: 2.7.1
+    - alias: rkeControllerManager
+      condition: rkeControllerManager.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rkeScheduler
+      condition: rkeScheduler.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rkeProxy
+      condition: rkeProxy.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rkeEtcd
+      condition: rkeEtcd.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: k3sServer
+      condition: k3sServer.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmControllerManager
+      condition: kubeAdmControllerManager.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmScheduler
+      condition: kubeAdmScheduler.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmProxy
+      condition: kubeAdmProxy.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: kubeAdmEtcd
+      condition: kubeAdmEtcd.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2ControllerManager
+      condition: rke2ControllerManager.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2Scheduler
+      condition: rke2Scheduler.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2Proxy
+      condition: rke2Proxy.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    - alias: rke2Etcd
+      condition: rke2Etcd.enabled
+      name: rancher-pushprox
+      repository: file://../../rancher-pushprox/charts
+      version: 0.1.2
+    description: Collects several related Helm charts, Grafana dashboards, and Prometheus
+      rules combined with documentation and scripts to provide easy to operate end-to-end
+      Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
+    digest: 4b76dac4b1ef39456a25d3d40d0ac4b3d8a146ec7ea3359a209436f7890397e3
+    home: https://github.com/prometheus-operator/kube-prometheus
+    icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
+    keywords:
+    - operator
+    - prometheus
+    - kube-prometheus
+    - monitoring
+    maintainers:
+    - name: vsliouniaev
+    - name: bismarck
+    - email: gianrubio@gmail.com
+      name: gianrubio
+    - email: github.gkarthiks@gmail.com
+      name: gkarthiks
+    - email: scott@r6by.com
+      name: scottrigby
+    - email: miroslav.hadzhiev@gmail.com
+      name: Xtigyro
+    name: rancher-monitoring
+    sources:
+    - https://github.com/prometheus-community/helm-charts
+    - https://github.com/prometheus-operator/kube-prometheus
+    urls:
+    - assets/rancher-monitoring/rancher-monitoring-9.4.202.tgz
+    version: 9.4.202
   - annotations:
       artifacthub.io/links: |
         - name: Chart Source
@@ -1332,6 +1460,20 @@ entries:
     - assets/rancher-monitoring/rancher-monitoring-9.4.200.tgz
     version: 9.4.200
   rancher-monitoring-crd:
+  - annotations:
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/hidden: "true"
+      catalog.cattle.io/namespace: cattle-monitoring-system
+      catalog.cattle.io/release-name: rancher-monitoring-crd
+    apiVersion: v1
+    created: "2020-11-17T17:43:36.452387226Z"
+    description: Installs the CRDs for rancher-monitoring.
+    digest: 68f21cce4cd3441f8580fe8844144f8b453886cad97726146e66fd5649aff93e
+    name: rancher-monitoring-crd
+    type: application
+    urls:
+    - assets/rancher-monitoring/rancher-monitoring-crd-9.4.202.tgz
+    version: 9.4.202
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
@@ -1456,6 +1598,22 @@ entries:
     - assets/rancher-operator-crd/rancher-operator-crd-0.1.0-alpha800.tgz
     version: 0.1.0-alpha800
   rancher-pushprox:
+  - annotations:
+      catalog.cattle.io/hidden: "true"
+      catalog.rancher.io/certified: rancher
+      catalog.rancher.io/namespace: cattle-monitoring-system
+      catalog.rancher.io/release-name: rancher-pushprox
+    apiVersion: v1
+    appVersion: 0.1.0
+    created: "2020-11-17T17:43:36.453025025Z"
+    description: Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx
+      clients.
+    digest: 744b8871e6e175c20c97bf9e15fef8dc7d2e35976f99bcfb4d3019f818b76118
+    name: rancher-pushprox
+    type: application
+    urls:
+    - assets/rancher-pushprox/rancher-pushprox-0.1.2.tgz
+    version: 0.1.2
   - annotations:
       catalog.cattle.io/hidden: "true"
       catalog.rancher.io/certified: rancher
@@ -1565,4 +1723,4 @@ entries:
     urls:
     - assets/rio/rio-0.8.000.tgz
     version: 0.8.000
-generated: "2020-11-16T22:02:04.70543251Z"
+generated: "2020-11-17T17:43:36.427832658Z"

sha256sum/rancher-monitoring/rancher-monitoring.sum

@@ -6,6 +6,6 @@ af335d5859f759a451fb6590d1865b3fb49459c50ba002b6791fb3ddb5a36865  packages/ranch
 bb4f6fc55612f35e086c1b5657fc1ca356f8c3add72145a39e1d6202a4d40ebe  packages/rancher-monitoring/overlay/templates/rancher-monitoring/config-role.yaml
 5ad9876026208a86d66a2ae78ed5d0789ac5aa490cf126b47f73a9919bd37b47  packages/rancher-monitoring/overlay/templates/rancher-monitoring/dashboard-role.yaml
 33fee4fdab967c396d8dd12f058136c3414357cb65bd162c1e26dae561d5ac1d  packages/rancher-monitoring/overlay/templates/rancher-monitoring/default-dashboard.yaml
-9ab6bb402a9c1d5ad652cbd01a14c9fede7d14f9131a3e375ba2933adf1ae98d  packages/rancher-monitoring/overlay/templates/rancher-monitoring/hardened.yaml
+e7874ca7f06388b99a7ca1d65f8d2ff3edd836e0358b12fecd04c2263e6b501a  packages/rancher-monitoring/overlay/templates/rancher-monitoring/hardened.yaml
-2c4a6db06fe0721e164b346875d05acd28bf6da3c8981d59b6616543442bd001  packages/rancher-monitoring/package.yaml
+408cfcf08cdfdb14a75e044b9f211b93dc56e1c6b968cb5118cb041f7e38105e  packages/rancher-monitoring/package.yaml
-b5a07df7764ef8b6efdb9e767ab3d9f7a4d6c5775d144b35a3ffde07df74fa8a  packages/rancher-monitoring/rancher-monitoring.patch
+507707eadda38c7d42466aa6ddfc8b6b0a2f8fe327f8e18dad764603a3eb46e5  packages/rancher-monitoring/rancher-monitoring.patch

sha256sum/rancher-pushprox/rancher-pushprox.sum

@@ -1,9 +1,10 @@
 bb987e6a8ef45a99255d1d632812482d5f0f3255ea841520b4d90342df5fe2b3  packages/rancher-pushprox/charts/.helmignore
-5ce5c9061d2835fae54d4747d2aee2e72f733035318d953fdc380ed35febf2bd  packages/rancher-pushprox/charts/Chart.yaml
+77851ba8ce036c58ec24469a0b05d6e6e9f0157b35b6fed6297d29f02a73dd1c  packages/rancher-pushprox/charts/Chart.yaml
 db454913533343515453a16d577cbf86db664737ba2bf9927fdd670699ac56ae  packages/rancher-pushprox/charts/README.md
 4fa425d6977b6a82c185b522de853eba192ea293b9178d236e32af94d9bfe336  packages/rancher-pushprox/charts/templates/_helpers.tpl
 575a3d4ac1c389ca20a16298554cfb437b15aeea63cfacac50e577e42a174115  packages/rancher-pushprox/charts/templates/pushprox-clients-rbac.yaml
 bb8788358d201ba28be5d4ab869ad4459aff75a38b7bc1b7038d5dc5df6536e9  packages/rancher-pushprox/charts/templates/pushprox-clients.yaml
-25c0321e93924a9d2023c1462930ba1ecef790df278906d47dcae692b3d0705a  packages/rancher-pushprox/charts/templates/pushprox-proxy.yaml
+f3a01960ff9472840b81f2c15f62f270122da3e99abc3793011424c3781924f2  packages/rancher-pushprox/charts/templates/pushprox-proxy-rbac.yaml
+47b94f63b0e356aa01dc30e8f38f2b037a4ddbb0450fcef099ad9f3999008bf6  packages/rancher-pushprox/charts/templates/pushprox-proxy.yaml
 77efd99f555b1f2e8c3e6559830a4231a1d0f580972a679cb47b57b4791cd787  packages/rancher-pushprox/charts/templates/pushprox-servicemonitor.yaml
 d7a70a64799a2377778ec759881a4f34be9c39ce241097224ae167e340b36ac1  packages/rancher-pushprox/charts/values.yaml