update prometheus-operator to v0.38.0

jsonnet/kube-prometheus/jsonnetfile.json

@@ -38,7 +38,7 @@
                     "subdir": "jsonnet/prometheus-operator"
                 }
             },
-            "version": "release-0.37"
+            "version": "release-0.38"
         },
         {
             "name": "etcd-mixin",

jsonnetfile.lock.json

@@ -127,8 +127,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "59bdf55453ba08b4ed7c271cb3c6627058945ed5",
+      "version": "378d36df448366414de53a66a64020cd053002b7",
-      "sum": "qwMbUQkdPhAn9Sl4OVLgzmNOuOTnRLUmvv14I0unsa8="
+      "sum": "vegTm8VSDazwYflBQGLkjs3ystWahwUv0fUyuMbpNRg="
     },
     {
       "name": "promgrafonnet",

manifests/prometheus-operator-serviceMonitor.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.38.0
   name: prometheus-operator
   namespace: monitoring
 spec:
@@ -15,4 +15,4 @@ spec:
     matchLabels:
       app.kubernetes.io/component: controller
       app.kubernetes.io/name: prometheus-operator
-      app.kubernetes.io/version: v0.37.0
+      app.kubernetes.io/version: v0.38.0

manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml

@@ -123,7 +123,7 @@ spec:
                     description: HTTP path to scrape for metrics.
                     type: string
                   port:
-                    description: Name of the port this endpoint refers to. Mutually
+                    description: Name of the pod port this endpoint refers to. Mutually
                       exclusive with targetPort.
                     type: string
                   proxyUrl:
@@ -186,8 +186,7 @@ spec:
                     anyOf:
                     - type: integer
                     - type: string
-                    description: Name or number of the target port of the endpoint.
+                    description: 'Deprecated: Use ''port'' instead.'
-                      Mutually exclusive with port.
                     x-kubernetes-int-or-string: true
                 type: object
               type: array

manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml

@@ -4483,6 +4483,128 @@ spec:
                 baseImage:
                   description: Thanos base image if other than default.
                   type: string
+                grpcServerTlsConfig:
+                  description: 'GRPCServerTLSConfig configures the gRPC server from
+                    which Thanos Querier reads recorded rule data. Note: Currently
+                    only the CAFile, CertFile, and KeyFile fields are supported. Maps
+                    to the ''--grpc-server-tls-*'' CLI args.'
+                  properties:
+                    ca:
+                      description: Stuct containing the CA cert to use for the targets.
+                      properties:
+                        configMap:
+                          description: ConfigMap containing data to use for the targets.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                        secret:
+                          description: Secret containing data to use for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                      type: object
+                    caFile:
+                      description: Path to the CA cert in the Prometheus container
+                        to use for the targets.
+                      type: string
+                    cert:
+                      description: Struct containing the client cert file for the
+                        targets.
+                      properties:
+                        configMap:
+                          description: ConfigMap containing data to use for the targets.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                        secret:
+                          description: Secret containing data to use for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                      type: object
+                    certFile:
+                      description: Path to the client cert file in the Prometheus
+                        container for the targets.
+                      type: string
+                    insecureSkipVerify:
+                      description: Disable target certificate validation.
+                      type: boolean
+                    keyFile:
+                      description: Path to the client key file in the Prometheus container
+                        for the targets.
+                      type: string
+                    keySecret:
+                      description: Secret containing the client key file for the targets.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                    serverName:
+                      description: Used to verify the hostname for the targets.
+                      type: string
+                  type: object
                 image:
                   description: Image if specified has precedence over baseImage, tag
                     and sha combinations. Specifying the version is still necessary
@@ -4606,6 +4728,47 @@ spec:
             version:
               description: Version of Prometheus to be deployed.
               type: string
+            volumeMounts:
+              description: VolumeMounts allows configuration of additional VolumeMounts
+                on the output StatefulSet definition. VolumeMounts specified will
+                be appended to other VolumeMounts in the prometheus container, that
+                are generated as a result of StorageSpec objects.
+              items:
+                description: VolumeMount describes a mounting of a Volume within a
+                  container.
+                properties:
+                  mountPath:
+                    description: Path within the container at which the volume should
+                      be mounted.  Must not contain ':'.
+                    type: string
+                  mountPropagation:
+                    description: mountPropagation determines how mounts are propagated
+                      from the host to container and the other way around. When not
+                      set, MountPropagationNone is used. This field is beta in 1.10.
+                    type: string
+                  name:
+                    description: This must match the Name of a Volume.
+                    type: string
+                  readOnly:
+                    description: Mounted read-only if true, read-write otherwise (false
+                      or unspecified). Defaults to false.
+                    type: boolean
+                  subPath:
+                    description: Path within the volume from which the container's
+                      volume should be mounted. Defaults to "" (volume's root).
+                    type: string
+                  subPathExpr:
+                    description: Expanded path within the volume from which the container's
+                      volume should be mounted. Behaves similarly to SubPath but environment
+                      variable references $(VAR_NAME) are expanded using the container's
+                      environment. Defaults to "" (volume's root). SubPathExpr and
+                      SubPath are mutually exclusive.
+                    type: string
+                required:
+                - mountPath
+                - name
+                type: object
+              type: array
             volumes:
               description: Volumes allows configuration of additional volumes on the
                 output StatefulSet definition. Volumes specified will be appended

manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml

@@ -235,8 +235,8 @@ spec:
                     anyOf:
                     - type: integer
                     - type: string
-                    description: Name or number of the target port of the endpoint.
+                    description: Name or number of the pod port this endpoint refers
-                      Mutually exclusive with port.
+                      to. Mutually exclusive with port.
                     x-kubernetes-int-or-string: true
                   tlsConfig:
                     description: TLS configuration to use when scraping the endpoint

manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml

@@ -632,10 +632,13 @@ spec:
               - key
               type: object
             alertmanagersUrl:
-              description: Define URL to send alerts to alertmanager.  For Thanos
+              description: 'Define URLs to send alerts to Alertmanager.  For Thanos
-                v0.10.0 and higher, AlertManagersConfig should be used instead. Maps
+                v0.10.0 and higher, AlertManagersConfig should be used instead.  Note:
-                to the `alertmanagers.url` arg.
+                this field will be ignored if AlertManagersConfig is specified. Maps
-              type: string
+                to the `alertmanagers.url` arg.'
+              items:
+                type: string
+              type: array
             containers:
               description: 'Containers allows injecting additional containers or modifying
                 operator generated containers. This can be used to allow adding an
@@ -1692,6 +1695,126 @@ spec:
                 under. This is necessary to generate correct URLs. This is necessary
                 if Thanos Ruler is not served from root of a DNS name.
               type: string
+            grpcServerTlsConfig:
+              description: 'GRPCServerTLSConfig configures the gRPC server from which
+                Thanos Querier reads recorded rule data. Note: Currently only the
+                CAFile, CertFile, and KeyFile fields are supported. Maps to the ''--grpc-server-tls-*''
+                CLI args.'
+              properties:
+                ca:
+                  description: Stuct containing the CA cert to use for the targets.
+                  properties:
+                    configMap:
+                      description: ConfigMap containing data to use for the targets.
+                      properties:
+                        key:
+                          description: The key to select.
+                          type: string
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                        optional:
+                          description: Specify whether the ConfigMap or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                    secret:
+                      description: Secret containing data to use for the targets.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                  type: object
+                caFile:
+                  description: Path to the CA cert in the Prometheus container to
+                    use for the targets.
+                  type: string
+                cert:
+                  description: Struct containing the client cert file for the targets.
+                  properties:
+                    configMap:
+                      description: ConfigMap containing data to use for the targets.
+                      properties:
+                        key:
+                          description: The key to select.
+                          type: string
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                        optional:
+                          description: Specify whether the ConfigMap or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                    secret:
+                      description: Secret containing data to use for the targets.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                  type: object
+                certFile:
+                  description: Path to the client cert file in the Prometheus container
+                    for the targets.
+                  type: string
+                insecureSkipVerify:
+                  description: Disable target certificate validation.
+                  type: boolean
+                keyFile:
+                  description: Path to the client key file in the Prometheus container
+                    for the targets.
+                  type: string
+                keySecret:
+                  description: Secret containing the client key file for the targets.
+                  properties:
+                    key:
+                      description: The key of the secret to select from.  Must be
+                        a valid secret key.
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        TODO: Add other useful fields. apiVersion, kind, uid?'
+                      type: string
+                    optional:
+                      description: Specify whether the Secret or its key must be defined
+                      type: boolean
+                  required:
+                  - key
+                  type: object
+                serverName:
+                  description: Used to verify the hostname for the targets.
+                  type: string
+              type: object
             image:
               description: Thanos container image URL.
               type: string
@@ -2821,6 +2944,26 @@ spec:
             priorityClassName:
               description: Priority class assigned to the Pods
               type: string
+            queryConfig:
+              description: Define configuration for connecting to thanos query instances.
+                If this is defined, the QueryEndpoints field will be ignored. Maps
+                to the `query.config` CLI argument. Only available with thanos v0.11.0
+                and higher.
+              properties:
+                key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
+                  type: string
+                name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    TODO: Add other useful fields. apiVersion, kind, uid?'
+                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
+              required:
+              - key
+              type: object
             queryEndpoints:
               description: QueryEndpoints defines Thanos querier endpoints from which
                 to query metrics. Maps to the --query flag of thanos ruler.
@@ -4528,8 +4671,6 @@ spec:
                 - name
                 type: object
               type: array
-          required:
-          - queryEndpoints
           type: object
         status:
           description: 'Most recent observed status of the ThanosRuler cluster. Read-only.

manifests/setup/prometheus-operator-clusterRole.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.38.0
   name: prometheus-operator
 rules:
 - apiGroups:

manifests/setup/prometheus-operator-clusterRoleBinding.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.38.0
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

manifests/setup/prometheus-operator-deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.38.0
   name: prometheus-operator
   namespace: monitoring
 spec:
@@ -18,15 +18,15 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: v0.37.0
+        app.kubernetes.io/version: v0.38.0
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.37.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.38.0
-        image: quay.io/coreos/prometheus-operator:v0.37.0
+        image: quay.io/coreos/prometheus-operator:v0.38.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

manifests/setup/prometheus-operator-service.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.38.0
   name: prometheus-operator
   namespace: monitoring
 spec:

manifests/setup/prometheus-operator-serviceAccount.yaml

@@ -4,6 +4,6 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.38.0
   name: prometheus-operator
   namespace: monitoring