Merge pull request #59 from 3scale-ops/feat/customizable-tolerations-…

…and-affinities

feat: customizable tolerations

Makefile

@@ -2,7 +2,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.8.1
+VERSION ?= 0.8.2-alpha.1
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

bundle/manifests/monitoring.3scale.net_prometheusexporters.yaml

@@ -216,6 +216,47 @@ spec:
                     description: Prometheus scrape interval (example 30s)
                     type: string
                 type: object
+              tolerations:
+                description: Tolerations allow the pods to schedule onto nodes with
+                  matching taints
+                items:
+                  description: The pod this Toleration is attached to tolerates any
+                    taint that matches the triple <key,value,effect> using the matching
+                    operator <operator>.
+                  properties:
+                    effect:
+                      description: Effect indicates the taint effect to match. Empty
+                        means match all taint effects. When specified, allowed values
+                        are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: Key is the taint key that the toleration applies
+                        to. Empty means match all taint keys. If the key is empty,
+                        operator must be Exists; this combination means to match all
+                        values and all keys.
+                      type: string
+                    operator:
+                      description: Operator represents a key's relationship to the
+                        value. Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod
+                        can tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: TolerationSeconds represents the period of time
+                        the toleration (which must be of effect NoExecute, otherwise
+                        this field is ignored) tolerates the taint. By default, it
+                        is not set, which means tolerate the taint forever (do not
+                        evict). Zero and negative values will be treated as 0 (evict
+                        immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: Value is the taint value the toleration matches
+                        to. If the operator is Exists, the value should be empty,
+                        otherwise just a regular string.
+                      type: string
+                  type: object
+                type: array
               type:
                 description: Supported prometheus-exporter types
                 enum:

bundle/manifests/prometheus-exporter-operator.clusterserviceversion.yaml

@@ -34,7 +34,7 @@ metadata:
     operators.operatorframework.io/project_layout: ansible.sdk.operatorframework.io/v1
     repository: https://github.com/3scale-ops/prometheus-exporter-operator
     support: Red Hat, Inc.
-  name: prometheus-exporter-operator.v0.8.1
+  name: prometheus-exporter-operator.v0.8.2-alpha.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -125,7 +125,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/prometheus-exporter-operator:v0.8.1
+                image: quay.io/3scale/prometheus-exporter-operator:v0.8.2-alpha.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -310,4 +310,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.redhat.com
-  version: 0.8.1
+  version: 0.8.2-alpha.1

catalog/prometheus-exporter-operator/alpha-channel.yaml

@@ -17,6 +17,8 @@ entries:
     replaces: prometheus-exporter-operator.v0.7.0
   - name: prometheus-exporter-operator.v0.8.1
     replaces: prometheus-exporter-operator.v0.8.0
+  - name: prometheus-exporter-operator.v0.8.2-alpha.1
+    replaces: prometheus-exporter-operator.v0.8.1
 name: alpha
 package: prometheus-exporter-operator
 schema: olm.channel