Skip to content

S
system-charts
Commit 2fffb739 by gitlawr Committed by Craig Jellick
Options

Upate Prometheus operator to v0.32.0 for k8s v1.16 compatibility

- Bump Prometheus operator image version - Sync upstream CRDs. Add PodMonitor and update the rest.(https://github.com/helm/charts/tree/master/stable/prometheus-operator/templates/prometheus-operator) - Update ClusterRole Related Upstream changes: https://github.com/helm/charts/commit/6a94c082c2daf8be72ac241397d652993ad82a0b#diff-b9f481ac97524bfb24d27f62676dc143 https://github.com/helm/charts/commit/d58247103fafd5930792bb1fd3ac240547523200#diff-23b6255dfa711af76ad99181e2fb0464
parent 447b7a37
Showing with 84 additions and 2 deletions
charts/rancher-monitoring/v0.0.4/charts/operator-init/files/crd-prometheusrules.yaml
......@@ -98,6 +98,7 @@ spec:
type: string
required:
- name
type: object
type: array
result:
description: Status is a return value for calls that don't return
......@@ -149,6 +150,7 @@ spec:
cause of the error. If this value is empty there
is no information available.
type: string
type: object
type: array
group:
description: The group attribute of the resource associated
......@@ -176,6 +178,7 @@ spec:
description: 'UID of the resource. (when there is a single
resource which can be described). More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
type: string
type: object
kind:
description: 'Kind is a string value representing the REST resource
this object represents. Servers may infer this from the endpoint
......@@ -216,6 +219,7 @@ spec:
description: selfLink is a URL representing this object.
Populated by the system. Read-only.
type: string
type: object
reason:
description: A machine-readable description of why this operation
is in the "Failure" status. If this value is empty there is
......@@ -226,13 +230,51 @@ spec:
description: 'Status of the operation. One of: "Success" or
"Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
type: string
type: object
required:
- pending
type: object
labels:
description: 'Map of string keys and values that can be used to organize
and categorize (scope and select) objects. May match selectors of
replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels'
type: object
managedFields:
description: |-
ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like "ci-cd". The set of fields is always in the version that the workflow used when modifying the object.
This field is alpha and can be changed or removed without notice.
items:
description: ManagedFieldsEntry is a workflow-id, a FieldSet and the
group version of the resource that the fieldset applies to.
properties:
apiVersion:
description: APIVersion defines the version of this resource that
this field set applies to. The format is "group/version" just
like the top-level APIVersion field. It is necessary to track
the version of a field set because it cannot be automatically
converted.
type: string
fields:
description: 'Fields stores a set of fields in a data structure
like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff'
type: object
manager:
description: Manager is an identifier of the workflow managing
these fields.
type: string
operation:
description: Operation is the type of operation which lead to
this ManagedFieldsEntry being created. The only valid values
for this field are 'Apply' and 'Update'.
type: string
time:
description: Time is a wrapper around time.Time which supports
correct marshaling to YAML and JSON. Wrappers are provided
for many of the factory methods that the time package offers.
format: date-time
type: string
type: object
type: array
name:
description: 'Name must be unique within a namespace. Is required when
creating resources, although some resources may allow a client to
......@@ -284,6 +326,7 @@ spec:
- kind
- name
- uid
type: object
type: array
resourceVersion:
description: |-
......@@ -299,6 +342,7 @@ spec:
UID is the unique in time and space value for this object. It is typically generated by the server on successful creation of a resource and is not allowed to change on PUT operations.
Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids
type: string
type: object
spec:
description: PrometheusRuleSpec contains specification parameters for a
Rule.
......@@ -333,9 +377,13 @@ spec:
type: string
required:
- expr
type: object
type: array
required:
- name
- rules
type: object
type: array
type: object
type: object
version: v1
charts/rancher-monitoring/v0.0.4/charts/operator-init/files/crd-servicemonitor.yaml
......@@ -56,6 +56,7 @@ spec:
type: boolean
required:
- key
type: object
username:
description: SecretKeySelector selects a key of a Secret.
properties:
......@@ -72,6 +73,8 @@ spec:
type: boolean
required:
- key
type: object
type: object
bearerTokenFile:
description: File to read bearer token for scraping targets.
type: string
......@@ -125,6 +128,7 @@ spec:
in a replace action. It is mandatory for replace actions.
Regex capture groups are available.
type: string
type: object
type: array
params:
description: Optional HTTP URL parameters
......@@ -184,6 +188,7 @@ spec:
in a replace action. It is mandatory for replace actions.
Regex capture groups are available.
type: string
type: object
type: array
scheme:
description: HTTP scheme to use for scraping.
......@@ -213,6 +218,8 @@ spec:
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
type: object
type: array
jobLabel:
description: The label to use to retrieve the job name from.
......@@ -230,6 +237,7 @@ spec:
items:
type: string
type: array
type: object
podTargetLabels:
description: PodTargetLabels transfers labels on the Kubernetes Pod
onto the target.
......@@ -275,6 +283,7 @@ spec:
required:
- key
- operator
type: object
type: array
matchLabels:
description: matchLabels is a map of {key,value} pairs. A single
......@@ -283,6 +292,7 @@ spec:
"In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
targetLabels:
description: TargetLabels transfers labels on the Kubernetes Service
onto the target.
......@@ -292,4 +302,6 @@ spec:
required:
- endpoints
- selector
type: object
type: object
version: v1
charts/rancher-monitoring/v0.0.4/charts/operator/templates/rbac.yaml
......@@ -21,6 +21,7 @@ rules:
- prometheusrules
- prometheuses/finalizers
- alertmanagers/finalizers
- podmonitors
verbs:
- "*"
- apiGroups:
......@@ -44,11 +45,13 @@ rules:
- apiGroups: [""]
resources:
- services
- services/finalizers
- endpoints
verbs:
- get
- create
- update
- delete
- apiGroups: [""]
resources:
- nodes
......
charts/rancher-monitoring/v0.0.4/templates/crds.yaml
......@@ -75,5 +75,24 @@ spec:
plural: servicemonitors
scope: Namespaced
version: v1
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: {{ printf "podmonitors.%s" (.Values.operator.apiGroup | default "monitoring.coreos.com") }}
labels:
app: {{ template "app.name" . }}
chart: {{ template "app.version" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
annotations:
"helm.sh/hook": crd-install
spec:
group: {{ .Values.operator.apiGroup | default "monitoring.coreos.com" }}
names:
kind: PodMonitor
plural: podmonitors
scope: Namespaced
version: v1
{{- end }}
{{- end -}}
charts/rancher-monitoring/v0.0.4/values.yaml
......@@ -4,10 +4,10 @@ operator:
apiGroup: "monitoring.coreos.com"
image:
repository: rancher/coreos-prometheus-operator
tag: v0.29.0
tag: v0.32.0
prometheusConfigReloader:
repository: rancher/coreos-prometheus-config-reloader
tag: v0.29.0
tag: v0.32.0
configmapReload:
repository: rancher/coreos-configmap-reload
tag: v0.0.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment