diff --git a/src/integrationtest/python/smoke_clear_cache_tests.py b/src/integrationtest/python/smoke_clear_cache_tests.py deleted file mode 100644 index 87c73c1..0000000 --- a/src/integrationtest/python/smoke_clear_cache_tests.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2020 Express Systems USA, Inc -# Copyright 2023 Karellen, Inc. -# -# 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. -# - - -from test_support import IntegrationTestSupport, unittest - - -class VersionSmokeTest(IntegrationTestSupport): - def test_version(self): - self.run_module_test("kubernator", "--clear-cache") - - -if __name__ == "__main__": - unittest.main() diff --git a/src/main/python/kubernator/plugins/minikube.py b/src/main/python/kubernator/plugins/minikube.py index 5b8eed9..88e0ff6 100644 --- a/src/main/python/kubernator/plugins/minikube.py +++ b/src/main/python/kubernator/plugins/minikube.py @@ -81,7 +81,7 @@ def cmd_out(self, *extra_args): def _stanza(self, extra_args): context = self.context minikube = context.minikube - stanza = [context.minikube.minikube_file, "-p", f"minikube-{minikube.profile}"] + extra_args + stanza = [context.minikube.minikube_file, "-p", minikube.profile] + extra_args env = dict(os.environ) env["MINIKUBE_HOME"] = str(self.minikube_home_dir) env["KUBECONFIG"] = str(minikube.kubeconfig) @@ -119,8 +119,8 @@ def register(self, minikube_version=None, profile="default", k8s_version=None, version = version_out[1:] logger.info("Found minikube %s in %s", version, minikube_file) - profile_dir = get_cache_dir("minikube", profile) - self.minikube_home_dir = profile_dir / "home" + profile_dir = get_cache_dir("minikube") + self.minikube_home_dir = profile_dir self.minikube_home_dir.mkdir(parents=True, exist_ok=True) self.kubeconfig_dir = profile_dir / ".kube" self.kubeconfig_dir.mkdir(parents=True, exist_ok=True)