diff --git a/stable/chronograf/Chart.yaml b/stable/chronograf/Chart.yaml index c06ab282ad..fa3372f707 100755 --- a/stable/chronograf/Chart.yaml +++ b/stable/chronograf/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: chronograf -version: 1.0.3 -appVersion: 1.7.11 +version: 1.1.0 +appVersion: 1.7.12 description: Open-source web application written in Go and React.js that provides the tools to visualize your monitoring data and easily create alerting and automation rules. diff --git a/stable/chronograf/README.md b/stable/chronograf/README.md index 2b45d069cd..fc295aed97 100644 --- a/stable/chronograf/README.md +++ b/stable/chronograf/README.md @@ -46,6 +46,43 @@ The command removes all the Kubernetes components associated with the chart and The configurable parameters of the Chronograf chart and their descriptions can be seen in `values.yaml`. The [full image documentation](https://quay.io/influxdb/chronograf) contains more information about running Chronograf in docker. +The following table lists the configurable parameters of the chronograf chart and their default values. + +| Parameter | Description | Default | +|:-----------------------------|:----------------------------------------------------------------------------------------------------------|:--------------------------------------------| +| `image.repository` | controller container image repository | quay.io/influxdb/chronograf | +| `image.tag` | controller container image tag | 1.7.12 | +| `image.pullPolicy` | controller container image pull policy | IfNotPresent | +| `service.type` | ClusterIP, NodePort, or LoadBalancer | ClusterIP | +| `persistence.enabled` | Use a PVC to persist data | `true` | +| `persistence.storageClass` | Storage class of backing PVC | `nil` (uses alpha storage class annotation) | +| `persistence.accessModes` | Use volume as ReadOnly or ReadWrite | `[ReadWriteOnce]` | +| `persistence.size` | Size of data volume | `8Gi` | +| `ingress.enabled` | Enable ingress controller resource | false | +| `ingress.hostname` | Ingress resource hostnames | chronograf.foobar.com | +| `ingress.tls` | Ingress TLS configuration | false | +| `ingress.annotations` | Ingress annotations configuration | null | +| `oauth.enabled` | Need to set to true to use any of the oauth options | false | +| `oauth.token_secret` | Used for JWT to support running multiple copies of Chronograf | CHANGE_ME | +| `oauth.github.enabled` | Enable oauth github | false | +| `oauth.github.client_id` | oauth github client_id | CHANGE_ME | +| `oauth.github.client_secret` | This is a comma separated list of GH organizations | CHANGE_ME | +| `oauth.github.gh_orgs` | oauth github | "" | +| `oauth.google.enabled` | Enable oauth google | false | +| `oauth.google.client_id` | oauth google | CHANGE_ME | +| `oauth.google.client_secret` | This is a comma separated list of GH organizations | CHANGE_ME | +| `oauth.google.public_url` | oauth google | "" | +| `oauth.google.domains` | This is a comma separated list of Google Apps domains | "" | +| `oauth.heroku.enabled` | Enable oauth heroku | false | +| `oauth.heroku.client_id` | oauth heroku client_id | CHANGE_ME | +| `oauth.heroku.client_secret` | This is a comma separated list of Heroku organizations | CHANGE_ME | +| `oauth.heroku.gh_orgs` | oauth github | "" | +| `env` | Extra environment variables that will be passed onto deployment pods | {} | +| `envFromSecret` | The name of a secret in the same kubernetes namespace which contain values to be added to the environment | {} | +| `nodeSelector` | Node labels for pod assignment | {} | +| `tolerations` | Toleration labels for pod assignment | [] | +| `affinity` | Affinity settings for pod assignment | {} | + Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```bash diff --git a/stable/chronograf/templates/deployment.yaml b/stable/chronograf/templates/deployment.yaml index dfe2007e47..3175c098f8 100644 --- a/stable/chronograf/templates/deployment.yaml +++ b/stable/chronograf/templates/deployment.yaml @@ -107,6 +107,18 @@ spec: mountPath: /var/lib/chronograf resources: {{ toYaml .Values.resources | indent 10 }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} volumes: - name: data {{- if .Values.persistence.enabled }} diff --git a/stable/chronograf/values.yaml b/stable/chronograf/values.yaml index 0429f3238f..2be47e3e30 100644 --- a/stable/chronograf/values.yaml +++ b/stable/chronograf/values.yaml @@ -1,8 +1,8 @@ ## Image Settings ## image: - repository: "docker.io/chronograf" - tag: "1.7.11-alpine" + repository: quay.io/influxdb/chronograf + tag: 1.7.12 pullPolicy: IfNotPresent ## Specify a service type @@ -39,6 +39,21 @@ resources: memory: 2Gi cpu: 2 +## Node labels for pod assignment +## ref: https://kubernetes.io/docs/user-guide/node-selection/ +# +nodeSelector: {} + + ## Tolerations for pod assignment +## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ +## +tolerations: [] + + ## Affinity for pod assignment +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity +## +affinity: {} + ## Configure the ingress object to hook into existing infastructure ## ref : http://kubernetes.io/docs/user-guide/ingress/ ## OPTIONALLY you can set .Values.ingress.secretName to set which secret to use