Remove obsolete canary values (grafana#26)

Signed-off-by: Reinhard Nägele <[email protected]>
unguiculus · Dec 10, 2020 · 252ad51 · 252ad51
1 parent 3ef21bc
commit 252ad51
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 46 deletions.
diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
@@ -3,7 +3,7 @@ name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
 appVersion: 1.6.1
-version: 0.11.0
+version: 0.11.1
 home: https://github.com/unguiculus/loki-helm-chart
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -24,19 +24,6 @@ helm repo add loki https://unguiculus.github.io/loki-helm-chart
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| canary.enabled | bool | `false` | Specifies whether the canary should be enabled |
-| canary.extraArgs | list | `["-labelname=pod","-labelvalue=$(POD_NAME)"]` | Additional CLI args for the canary |
-| canary.extraEnv | list | `[]` | Environment variables to add to the canary pods |
-| canary.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the canary pods |
-| canary.image.pullPolicy | string | `"IfNotPresent"` | canary image pull policy |
-| canary.image.repository | string | `"docker.io/grafana/loki-canary"` | canary image repository |
-| canary.image.tag | string | `""` | Overrides the canary image tag whose default is the chart's appVersion |
-| canary.kind | string | `"Deployment"` | canary can be run as a Deployment or DaemonSet |
-| canary.nodeSelector | object | `{}` | Node selector for canary pods |
-| canary.podAnnotations | object | `{}` | Annotations for canary pods |
-| canary.resources | object | `{}` | Resource requests and limits for the canary |
-| canary.terminationGracePeriodSeconds | int | `30` | Grace period to allow the canary to shutdown before it is killed |
-| canary.tolerations | list | `[]` | Tolerations for canary pods |
 | distributor.affinity | string | Hard node and soft zone anti-affinity | Affinity for distributor pods. Passed through `tpl` and, thus, to be configured as string |
 | distributor.extraArgs | list | `[]` | Additional CLI args for the distributor |
 | distributor.extraEnv | list | `[]` | Environment variables to add to the distributor pods |

diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
@@ -488,38 +488,6 @@ gateway:
       }
     }
 
-# Configuration for the canary
-canary:
-  # canary.enabled -- Specifies whether the canary should be enabled
-  enabled: false
-  # canary.kind -- canary can be run as a Deployment or DaemonSet
-  kind: Deployment
-  image:
-    # canary.image.repository -- canary image repository
-    repository: docker.io/grafana/loki-canary
-    # canary.image.tag -- Overrides the canary image tag whose default is the chart's appVersion
-    tag: ""
-    # canary.image.pullPolicy -- canary image pull policy
-    pullPolicy: IfNotPresent
-  # canary.podAnnotations -- Annotations for canary pods
-  podAnnotations: {}
-  # canary.extraArgs -- Additional CLI args for the canary
-  extraArgs:
-    - -labelname=pod
-    - -labelvalue=$(POD_NAME)
-  # canary.extraEnv -- Environment variables to add to the canary pods
-  extraEnv: []
-  # canary.extraEnvFrom -- Environment variables from secrets or configmaps to add to the canary pods
-  extraEnvFrom: []
-  # canary.resources -- Resource requests and limits for the canary
-  resources: {}
-  # canary.terminationGracePeriodSeconds -- Grace period to allow the canary to shutdown before it is killed
-  terminationGracePeriodSeconds: 30
-  # canary.nodeSelector -- Node selector for canary pods
-  nodeSelector: {}
-  # canary.tolerations -- Tolerations for canary pods
-  tolerations: []
-
 memcached:
   image:
     # memcached.image.repository -- Memcached Docker image repository