From 42f8f006ab01692d7de9cecc06521eaf58743c0d Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Thu, 18 Apr 2019 16:38:20 -0700 Subject: Move configuration into config files Move k8splugin configuration into config files instead of using environment variables. Issue-ID: MULTICLOUD-579 Change-Id: I7b76d5a14d24f002a8db484097a31fb5e908b6f8 Signed-off-by: Kiran Kamineni --- src/k8splugin/mock_files/mock_configs/mock_config | 29 ---------------------- .../mock_files/mock_configs/mock_config.json | 5 ++++ .../mock_files/mock_configs/mock_kube_config | 29 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 src/k8splugin/mock_files/mock_configs/mock_config create mode 100644 src/k8splugin/mock_files/mock_configs/mock_config.json create mode 100644 src/k8splugin/mock_files/mock_configs/mock_kube_config (limited to 'src/k8splugin/mock_files') diff --git a/src/k8splugin/mock_files/mock_configs/mock_config b/src/k8splugin/mock_files/mock_configs/mock_config deleted file mode 100644 index 9b86ff15..00000000 --- a/src/k8splugin/mock_files/mock_configs/mock_config +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2018 Intel Corporation. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Config -clusters: -- name: local - cluster: - insecure-skip-tls-verify: true - server: https://192.168.43.66:6443 -contexts: -- context: - cluster: local - user: admin - name: kubelet-context -current-context: kubelet-context -users: -- name: admin - user: - password: admin - username: admin diff --git a/src/k8splugin/mock_files/mock_configs/mock_config.json b/src/k8splugin/mock_files/mock_configs/mock_config.json new file mode 100644 index 00000000..93f2b6b7 --- /dev/null +++ b/src/k8splugin/mock_files/mock_configs/mock_config.json @@ -0,0 +1,5 @@ +{ + "database-type": "mock_db_test", + "database-address": "127.0.0.1", + "plugin-dir": "." +} \ No newline at end of file diff --git a/src/k8splugin/mock_files/mock_configs/mock_kube_config b/src/k8splugin/mock_files/mock_configs/mock_kube_config new file mode 100644 index 00000000..9b86ff15 --- /dev/null +++ b/src/k8splugin/mock_files/mock_configs/mock_kube_config @@ -0,0 +1,29 @@ +# Copyright 2018 Intel Corporation. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: v1 +kind: Config +clusters: +- name: local + cluster: + insecure-skip-tls-verify: true + server: https://192.168.43.66:6443 +contexts: +- context: + cluster: local + user: admin + name: kubelet-context +current-context: kubelet-context +users: +- name: admin + user: + password: admin + username: admin -- cgit 1.2.3-korg