Merge remote-tracking branch 'upstream/master' into backup-restore-readme

.github/workflows/terraform.yaml

-name: Terraform
+name: Repository Configuration with Terraform
 
 on:
   push:
@@ -17,7 +17,7 @@ jobs:
       - name: "Terraform Format"
         uses: hashicorp/terraform-github-actions@master
         with:
-          tf_actions_version: 0.12.13
+          tf_actions_version: 0.12.20
           tf_actions_subcommand: "fmt"
           tf_actions_working_dir: "terraform"
         env:
@@ -26,7 +26,7 @@ jobs:
       - name: "Terraform Init"
         uses: hashicorp/terraform-github-actions@master
         with:
-          tf_actions_version: 0.12.13
+          tf_actions_version: 0.12.20
           tf_actions_subcommand: "init"
           tf_actions_working_dir: "terraform"
         env:
@@ -36,7 +36,7 @@ jobs:
       - name: "Terraform Validate"
         uses: hashicorp/terraform-github-actions@master
         with:
-          tf_actions_version: 0.12.13
+          tf_actions_version: 0.12.20
           tf_actions_subcommand: "validate"
           tf_actions_working_dir: "terraform"
         env:
@@ -45,7 +45,7 @@ jobs:
       - name: "Terraform Plan"
         uses: hashicorp/terraform-github-actions@master
         with:
-          tf_actions_version: 0.12.13
+          tf_actions_version: 0.12.20
           tf_actions_subcommand: "plan"
           tf_actions_working_dir: "terraform"
         env:

charts/chronograf/Chart.yaml

 apiVersion: v1
 name: chronograf
-version: 1.1.3
+version: 1.1.4
 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

charts/chronograf/templates/deployment.yaml

-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "chronograf.fullname" . }}
@@ -9,6 +9,9 @@ metadata:
     heritage: "{{ .Release.Service }}"
 spec:
   replicas: {{ .Values.service.replicas }}
+  selector:
+    matchLabels:
+      app: {{ template "chronograf.fullname" . }}
   template:
     metadata:
       labels:

charts/kapacitor/Chart.yaml

 apiVersion: v1
 name: kapacitor
-version: 1.2.3
+version: 1.2.4
 appVersion: 1.5.3
 description: InfluxDB's native data processing engine. It can process both stream
   and batch data from InfluxDB.

charts/telegraf/Chart.yaml

 apiVersion: v1
 name: telegraf
-version: 1.7.2
+version: 1.7.3
 appVersion: 1.13
 deprecated: false
 description: Telegraf is an agent written in Go for collecting, processing, aggregating, and writing metrics.

terraform/CODEOWNERS

-*   @rawkode
+*   @rawkode @gitirabassi

terraform/main.tf

@@ -8,8 +8,8 @@ provider "google" {
 }
 
 provider "github" {
-  token        = var.github_token
   organization = "influxdata"
+  anonymous    = false
 }
 
 terraform {
@@ -18,7 +18,3 @@ terraform {
     prefix = "github.com/helm-charts"
   }
 }
-
-variable "github_token" {
-  type = string
-}

terraform/repository.tf

@@ -3,7 +3,8 @@ resource "github_repository" "helm_charts" {
   description = "Official Helm Chart Repository for InfluxData Applications"
 
   allow_merge_commit = false
-  allow_rebase_merge = false
+  allow_squash_merge = false
+  allow_rebase_merge = true
 
   has_downloads = true
   has_issues    = true
@@ -34,4 +35,3 @@ resource "github_issue_label" "types" {
   repository  = github_repository.helm_charts.name
   color       = var.colour_dark_blue
 }
-