Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(kuma-cp) change the config to kuma-cp.conf.yml #716

Merged
merged 2 commits into from
May 4, 2020
Merged

fix(kuma-cp) change the config to kuma-cp.conf.yml #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06e7c5a
fix(kuma-cp) change the config to kuma-cp.conf.yml
May 1, 2020
ceccac5
fix(kuma-cp) regenerate from templates
May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/kumactl/data/install/k8s/control-plane/kuma-cp/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 18 additions & 18 deletions app/kumactl/pkg/install/k8s/control-plane/templates_vfsdata.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/releases/distros.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/releases/templates/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This folder contains your download of Kuma:
│ ├── kuma-prometheus-sd
│ └── kumactl
└── conf
└── kuma-cp.conf
└── kuma-cp.conf.yml

===============================================================================

Expand Down