From 06e7c5a488f56b1a829f7a5d7a38ad1f855f33ad Mon Sep 17 00:00:00 2001
From: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
Date: Fri, 1 May 2020 20:18:29 +0300
Subject: [PATCH] fix(kuma-cp) change the config to kuma-cp.conf.yml

Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
---
 .../testdata/install-control-plane.cni-enabled.golden.yaml      | 2 +-
 .../install/testdata/install-control-plane.defaults.golden.yaml | 2 +-
 .../testdata/install-control-plane.overrides.golden.yaml        | 2 +-
 app/kumactl/data/install/k8s/control-plane/kuma-cp/app.yaml     | 2 +-
 tools/releases/distros.sh                                       | 2 +-
 tools/releases/templates/README                                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
index c4f2f68855bb..391ab04e81ab 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
@@ -33,7 +33,7 @@ data:
   config.yaml: |
     # use this file to override default configuration of `kuma-cp`
     #
-    # see conf/kuma-cp.conf for available settings
+    # see conf/kuma-cp.conf.yml for available settings
 ---
 kind: ConfigMap
 apiVersion: v1
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
index 7f0d9969f300..02510b69262b 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -33,7 +33,7 @@ data:
   config.yaml: |
     # use this file to override default configuration of `kuma-cp`
     #
-    # see conf/kuma-cp.conf for available settings
+    # see conf/kuma-cp.conf.yml for available settings
 ---
 apiVersion: v1
 kind: ServiceAccount
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
index 4847357ca008..0eb41d6a4e0a 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
@@ -34,7 +34,7 @@ data:
   config.yaml: |
     # use this file to override default configuration of `kuma-cp`
     #
-    # see conf/kuma-cp.conf for available settings
+    # see conf/kuma-cp.conf.yml for available settings
 ---
 apiVersion: v1
 kind: ServiceAccount
diff --git a/app/kumactl/data/install/k8s/control-plane/kuma-cp/app.yaml b/app/kumactl/data/install/k8s/control-plane/kuma-cp/app.yaml
index 4b683bee0a28..d26e8c672578 100644
--- a/app/kumactl/data/install/k8s/control-plane/kuma-cp/app.yaml
+++ b/app/kumactl/data/install/k8s/control-plane/kuma-cp/app.yaml
@@ -61,7 +61,7 @@ data:
   config.yaml: |
     # use this file to override default configuration of `kuma-cp`
     #
-    # see conf/kuma-cp.conf for available settings
+    # see conf/kuma-cp.conf.yml for available settings
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/tools/releases/distros.sh b/tools/releases/distros.sh
index 9ffa7702b4c5..5e93f49e18fd 100755
--- a/tools/releases/distros.sh
+++ b/tools/releases/distros.sh
@@ -81,7 +81,7 @@ function create_tarball {
   cp -p build/artifacts-$system-$arch/kuma-dp/kuma-dp $kuma_dir/bin
   cp -p build/artifacts-$system-$arch/kumactl/kumactl $kuma_dir/bin
   cp -p build/artifacts-$system-$arch/kuma-prometheus-sd/kuma-prometheus-sd $kuma_dir/bin
-  cp -p pkg/config/app/kuma-cp/kuma-cp.defaults.yaml $kuma_dir/conf/kuma-cp.conf
+  cp -p pkg/config/app/kuma-cp/kuma-cp.defaults.yaml $kuma_dir/conf/kuma-cp.conf.yml
 
   cp tools/releases/templates/* $kuma_dir
 
diff --git a/tools/releases/templates/README b/tools/releases/templates/README
index 09249b9b19bb..96cbd6bbbf56 100644
--- a/tools/releases/templates/README
+++ b/tools/releases/templates/README
@@ -13,7 +13,7 @@ This folder contains your download of Kuma:
 │   ├── kuma-prometheus-sd
 │   └── kumactl
 └── conf
-    └── kuma-cp.conf
+    └── kuma-cp.conf.yml
 
 ===============================================================================