kubernator 1.0.21.dev20250528230808__py3-none-any.whl → 1.0.22__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of kubernator might be problematic. Click here for more details.
- kubernator/__init__.py +1 -1
- kubernator/api.py +97 -57
- kubernator/app.py +7 -3
- kubernator/plugins/helm.py +17 -4
- kubernator/plugins/istio.py +5 -4
- kubernator/plugins/k8s.py +8 -3
- kubernator/plugins/kops.py +5 -4
- kubernator/plugins/minikube.py +10 -0
- kubernator/proc.py +24 -2
- {kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/METADATA +4 -4
- kubernator-1.0.22.dist-info/RECORD +30 -0
- kubernator-1.0.21.dev20250528230808.dist-info/RECORD +0 -30
- {kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/WHEEL +0 -0
- {kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/entry_points.txt +0 -0
- {kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/namespace_packages.txt +0 -0
- {kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/top_level.txt +0 -0
- {kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/zip-safe +0 -0
kubernator/__init__.py
CHANGED
kubernator/api.py
CHANGED
|
@@ -20,6 +20,7 @@ import fnmatch
|
|
|
20
20
|
import json
|
|
21
21
|
import logging
|
|
22
22
|
import os
|
|
23
|
+
import io
|
|
23
24
|
import platform
|
|
24
25
|
import re
|
|
25
26
|
import sys
|
|
@@ -58,6 +59,53 @@ _CACHE_HEADER_TRANSLATION = {"etag": "if-none-match",
|
|
|
58
59
|
_CACHE_HEADERS = ("etag", "last-modified")
|
|
59
60
|
|
|
60
61
|
|
|
62
|
+
class TemplateEngine:
|
|
63
|
+
VARIABLE_START_STRING = "{${"
|
|
64
|
+
VARIABLE_END_STRING = "}$}"
|
|
65
|
+
|
|
66
|
+
def __init__(self, logger):
|
|
67
|
+
self.template_failures = 0
|
|
68
|
+
self.templates = {}
|
|
69
|
+
|
|
70
|
+
class CollectingUndefined(ChainableUndefined):
|
|
71
|
+
__slots__ = ()
|
|
72
|
+
|
|
73
|
+
def __str__(self):
|
|
74
|
+
self.template_failures += 1
|
|
75
|
+
return super().__str__()
|
|
76
|
+
|
|
77
|
+
logging_undefined = make_logging_undefined(
|
|
78
|
+
logger=logger,
|
|
79
|
+
base=CollectingUndefined
|
|
80
|
+
)
|
|
81
|
+
|
|
82
|
+
@pass_context
|
|
83
|
+
def variable_finalizer(ctx, value):
|
|
84
|
+
normalized_value = str(value)
|
|
85
|
+
if self.VARIABLE_START_STRING in normalized_value and self.VARIABLE_END_STRING in normalized_value:
|
|
86
|
+
value_template_content = sys.intern(normalized_value)
|
|
87
|
+
env: Environment = ctx.environment
|
|
88
|
+
value_template = self.templates.get(value_template_content)
|
|
89
|
+
if not value_template:
|
|
90
|
+
value_template = env.from_string(value_template_content, env.globals)
|
|
91
|
+
self.templates[value_template_content] = value_template
|
|
92
|
+
return value_template.render(ctx.parent)
|
|
93
|
+
|
|
94
|
+
return normalized_value
|
|
95
|
+
|
|
96
|
+
self.env = Environment(variable_start_string=self.VARIABLE_START_STRING,
|
|
97
|
+
variable_end_string=self.VARIABLE_END_STRING,
|
|
98
|
+
autoescape=False,
|
|
99
|
+
finalize=variable_finalizer,
|
|
100
|
+
undefined=logging_undefined)
|
|
101
|
+
|
|
102
|
+
def from_string(self, template):
|
|
103
|
+
return self.env.from_string(template)
|
|
104
|
+
|
|
105
|
+
def failures(self):
|
|
106
|
+
return self.template_failures
|
|
107
|
+
|
|
108
|
+
|
|
61
109
|
def calling_frame_source(depth=2):
|
|
62
110
|
f = traceback.extract_stack(limit=depth + 1)[0]
|
|
63
111
|
return f"file {f.filename}, line {f.lineno} in {f.name}"
|
|
@@ -96,9 +144,15 @@ class FileType(Enum):
|
|
|
96
144
|
self.func = func
|
|
97
145
|
|
|
98
146
|
|
|
99
|
-
def _load_file(logger, path: Path, file_type: FileType, source=None
|
|
100
|
-
|
|
147
|
+
def _load_file(logger, path: Path, file_type: FileType, source=None,
|
|
148
|
+
template_engine: Optional[TemplateEngine] = None,
|
|
149
|
+
template_context: Optional[dict] = None) -> Iterable[dict]:
|
|
150
|
+
with open(path, "rb" if not template_engine else "rt") as f:
|
|
101
151
|
try:
|
|
152
|
+
if template_engine:
|
|
153
|
+
raw_data = template_engine.from_string(f.read()).render(template_context)
|
|
154
|
+
f.close()
|
|
155
|
+
f = io.StringIO(raw_data)
|
|
102
156
|
data = file_type.func(f)
|
|
103
157
|
if isinstance(data, GeneratorType):
|
|
104
158
|
data = list(data)
|
|
@@ -191,9 +245,12 @@ def load_remote_file(logger, url, file_type: FileType, category: str = "k8s", su
|
|
|
191
245
|
return _load_file(logger, file_name, file_type, url)
|
|
192
246
|
|
|
193
247
|
|
|
194
|
-
def load_file(logger, path: Path, file_type: FileType, source=None
|
|
248
|
+
def load_file(logger, path: Path, file_type: FileType, source=None,
|
|
249
|
+
template_engine: Optional[TemplateEngine] = None,
|
|
250
|
+
template_context: Optional[dict] = None) -> Iterable[dict]:
|
|
195
251
|
logger.debug("Loading %s using %s", source or path, file_type.name)
|
|
196
|
-
return _load_file(logger, path, file_type
|
|
252
|
+
return _load_file(logger, path, file_type,
|
|
253
|
+
source, template_engine, template_context)
|
|
197
254
|
|
|
198
255
|
|
|
199
256
|
def validator_with_defaults(validator_class):
|
|
@@ -513,53 +570,6 @@ class Globs(MutableSet[Union[str, re.Pattern]]):
|
|
|
513
570
|
return f"Globs[{self._list}]"
|
|
514
571
|
|
|
515
572
|
|
|
516
|
-
class TemplateEngine:
|
|
517
|
-
VARIABLE_START_STRING = "{${"
|
|
518
|
-
VARIABLE_END_STRING = "}$}"
|
|
519
|
-
|
|
520
|
-
def __init__(self, logger):
|
|
521
|
-
self.template_failures = 0
|
|
522
|
-
self.templates = {}
|
|
523
|
-
|
|
524
|
-
class CollectingUndefined(ChainableUndefined):
|
|
525
|
-
__slots__ = ()
|
|
526
|
-
|
|
527
|
-
def __str__(self):
|
|
528
|
-
self.template_failures += 1
|
|
529
|
-
return super().__str__()
|
|
530
|
-
|
|
531
|
-
logging_undefined = make_logging_undefined(
|
|
532
|
-
logger=logger,
|
|
533
|
-
base=CollectingUndefined
|
|
534
|
-
)
|
|
535
|
-
|
|
536
|
-
@pass_context
|
|
537
|
-
def variable_finalizer(ctx, value):
|
|
538
|
-
normalized_value = str(value)
|
|
539
|
-
if self.VARIABLE_START_STRING in normalized_value and self.VARIABLE_END_STRING in normalized_value:
|
|
540
|
-
value_template_content = sys.intern(normalized_value)
|
|
541
|
-
env: Environment = ctx.environment
|
|
542
|
-
value_template = self.templates.get(value_template_content)
|
|
543
|
-
if not value_template:
|
|
544
|
-
value_template = env.from_string(value_template_content, env.globals)
|
|
545
|
-
self.templates[value_template_content] = value_template
|
|
546
|
-
return value_template.render(ctx.parent)
|
|
547
|
-
|
|
548
|
-
return normalized_value
|
|
549
|
-
|
|
550
|
-
self.env = Environment(variable_start_string=self.VARIABLE_START_STRING,
|
|
551
|
-
variable_end_string=self.VARIABLE_END_STRING,
|
|
552
|
-
autoescape=False,
|
|
553
|
-
finalize=variable_finalizer,
|
|
554
|
-
undefined=logging_undefined)
|
|
555
|
-
|
|
556
|
-
def from_string(self, template):
|
|
557
|
-
return self.env.from_string(template)
|
|
558
|
-
|
|
559
|
-
def failures(self):
|
|
560
|
-
return self.template_failures
|
|
561
|
-
|
|
562
|
-
|
|
563
573
|
class Template:
|
|
564
574
|
def __init__(self, name: str, template: JinjaTemplate, defaults: dict = None, path=None, source=None):
|
|
565
575
|
self.name = name
|
|
@@ -768,7 +778,8 @@ class KubernatorPlugin:
|
|
|
768
778
|
pass
|
|
769
779
|
|
|
770
780
|
|
|
771
|
-
def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_stderr, disable_patching
|
|
781
|
+
def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_stderr, disable_patching,
|
|
782
|
+
fallback=False):
|
|
772
783
|
cache_dir = get_cache_dir("python")
|
|
773
784
|
package_major_dir = cache_dir / str(package_major)
|
|
774
785
|
package_major_dir_str = str(package_major_dir)
|
|
@@ -780,14 +791,43 @@ def install_python_k8s_client(run, package_major, logger, logger_stdout, logger_
|
|
|
780
791
|
str(package_major), package_major_dir)
|
|
781
792
|
rmtree(package_major_dir)
|
|
782
793
|
|
|
783
|
-
if not package_major_dir.exists():
|
|
794
|
+
if not package_major_dir.exists() or not len(os.listdir(package_major_dir)):
|
|
784
795
|
package_major_dir.mkdir(parents=True, exist_ok=True)
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
796
|
+
try:
|
|
797
|
+
run([sys.executable, "-m", "pip", "install", "--no-deps", "--no-input",
|
|
798
|
+
"--root-user-action=ignore", "--break-system-packages", "--disable-pip-version-check",
|
|
799
|
+
"--target", package_major_dir_str, f"kubernetes>={package_major!s}dev0,<{int(package_major) + 1!s}"],
|
|
800
|
+
logger_stdout, logger_stderr)
|
|
801
|
+
except CalledProcessError as e:
|
|
802
|
+
if not fallback and "No matching distribution found for" in e.stderr:
|
|
803
|
+
logger.warning("Kubernetes Client %s (%s) failed to install because the version wasn't found. "
|
|
804
|
+
"Falling back to a client of the previous version - %s",
|
|
805
|
+
str(package_major), package_major_dir, int(package_major) - 1)
|
|
806
|
+
return install_python_k8s_client(run,
|
|
807
|
+
int(package_major) - 1,
|
|
808
|
+
logger,
|
|
809
|
+
logger_stdout,
|
|
810
|
+
logger_stderr,
|
|
811
|
+
disable_patching,
|
|
812
|
+
fallback=True)
|
|
813
|
+
else:
|
|
814
|
+
raise
|
|
789
815
|
|
|
790
816
|
if not patch_indicator.exists() and not disable_patching:
|
|
817
|
+
if not fallback and not len(os.listdir(package_major_dir)):
|
|
818
|
+
# Directory is empty
|
|
819
|
+
logger.warning("Kubernetes Client %s (%s) directory is empty - the client was not installed. "
|
|
820
|
+
"Falling back to a client of the previous version - %s",
|
|
821
|
+
str(package_major), package_major_dir, int(package_major) - 1)
|
|
822
|
+
|
|
823
|
+
return install_python_k8s_client(run,
|
|
824
|
+
int(package_major) - 1,
|
|
825
|
+
logger,
|
|
826
|
+
logger_stdout,
|
|
827
|
+
logger_stderr,
|
|
828
|
+
disable_patching,
|
|
829
|
+
fallback=True)
|
|
830
|
+
|
|
791
831
|
for patch_text, target_file, skip_if_found, min_version, max_version, name in (
|
|
792
832
|
URLLIB_HEADERS_PATCH, CUSTOM_OBJECT_PATCH_23, CUSTOM_OBJECT_PATCH_25):
|
|
793
833
|
patch_target = package_major_dir / target_file
|
kubernator/app.py
CHANGED
|
@@ -35,7 +35,7 @@ import kubernator
|
|
|
35
35
|
from kubernator.api import (KubernatorPlugin, Globs, scan_dir, PropertyDict, config_as_dict, config_parent,
|
|
36
36
|
download_remote_file, load_remote_file, Repository, StripNL, jp, get_app_cache_dir,
|
|
37
37
|
get_cache_dir, install_python_k8s_client)
|
|
38
|
-
from kubernator.proc import run, run_capturing_out
|
|
38
|
+
from kubernator.proc import run, run_capturing_out, run_pass_through_capturing
|
|
39
39
|
|
|
40
40
|
TRACE = 5
|
|
41
41
|
|
|
@@ -215,7 +215,7 @@ class App(KubernatorPlugin):
|
|
|
215
215
|
self.context = self._top_dir_context
|
|
216
216
|
context = self.context
|
|
217
217
|
self._run_handlers(KubernatorPlugin.handle_shutdown, True, context, None)
|
|
218
|
-
except:
|
|
218
|
+
except: # noqa E722
|
|
219
219
|
raise
|
|
220
220
|
else:
|
|
221
221
|
self.context = self._top_dir_context
|
|
@@ -348,6 +348,7 @@ class App(KubernatorPlugin):
|
|
|
348
348
|
jp=jp,
|
|
349
349
|
run=self._run,
|
|
350
350
|
run_capturing_out=self._run_capturing_out,
|
|
351
|
+
run_passthrough_capturing=self._run_passthrough_capturing,
|
|
351
352
|
repository=self.repository,
|
|
352
353
|
StripNL=StripNL,
|
|
353
354
|
default_includes=Globs(["*"], True),
|
|
@@ -465,6 +466,9 @@ class App(KubernatorPlugin):
|
|
|
465
466
|
def _run_capturing_out(self, *args, **kwargs):
|
|
466
467
|
return run_capturing_out(*args, **kwargs)
|
|
467
468
|
|
|
469
|
+
def _run_passthrough_capturing(self, *args, **kwargs):
|
|
470
|
+
return run_pass_through_capturing(*args, **kwargs)
|
|
471
|
+
|
|
468
472
|
def __repr__(self):
|
|
469
473
|
return "Kubernator"
|
|
470
474
|
|
|
@@ -493,7 +497,7 @@ def pre_cache_k8s_clients(*versions, disable_patching=False):
|
|
|
493
497
|
for v in versions:
|
|
494
498
|
logger.info("Caching K8S client library ~=v%s.0%s...", v,
|
|
495
499
|
" (no patches)" if disable_patching else "")
|
|
496
|
-
install_python_k8s_client(
|
|
500
|
+
install_python_k8s_client(run_pass_through_capturing, v, logger, stdout_logger, stderr_logger, disable_patching)
|
|
497
501
|
|
|
498
502
|
|
|
499
503
|
def main():
|
kubernator/plugins/helm.py
CHANGED
|
@@ -37,7 +37,7 @@ from kubernator.api import (KubernatorPlugin, Globs, StripNL,
|
|
|
37
37
|
validator_with_defaults,
|
|
38
38
|
get_golang_os,
|
|
39
39
|
get_golang_machine,
|
|
40
|
-
prepend_os_path
|
|
40
|
+
prepend_os_path, TemplateEngine
|
|
41
41
|
)
|
|
42
42
|
from kubernator.plugins.k8s_api import K8SResource
|
|
43
43
|
from kubernator.proc import DEVNULL
|
|
@@ -102,6 +102,7 @@ class HelmPlugin(KubernatorPlugin):
|
|
|
102
102
|
self.context = None
|
|
103
103
|
self.repositories = set()
|
|
104
104
|
self.helm_dir = None
|
|
105
|
+
self.template_engine = TemplateEngine(logger)
|
|
105
106
|
|
|
106
107
|
def set_context(self, context):
|
|
107
108
|
self.context = context
|
|
@@ -180,7 +181,9 @@ class HelmPlugin(KubernatorPlugin):
|
|
|
180
181
|
display_p = context.app.display_path(p)
|
|
181
182
|
logger.debug("Adding Helm template from %s", display_p)
|
|
182
183
|
|
|
183
|
-
helm_templates = load_file(logger, p, FileType.YAML, display_p
|
|
184
|
+
helm_templates = load_file(logger, p, FileType.YAML, display_p,
|
|
185
|
+
self.template_engine,
|
|
186
|
+
{"ktor": context})
|
|
184
187
|
|
|
185
188
|
for helm_template in helm_templates:
|
|
186
189
|
self._add_helm(helm_template, display_p)
|
|
@@ -232,6 +235,17 @@ class HelmPlugin(KubernatorPlugin):
|
|
|
232
235
|
values_file = Path(values_file)
|
|
233
236
|
if not values_file.is_absolute():
|
|
234
237
|
values_file = self.context.app.cwd / values_file
|
|
238
|
+
values = list(load_file(logger, values_file, FileType.YAML,
|
|
239
|
+
template_engine=self.template_engine,
|
|
240
|
+
template_context={"ktor": self.context,
|
|
241
|
+
"helm": {"chart": chart,
|
|
242
|
+
"name": name,
|
|
243
|
+
"namespace": namespace,
|
|
244
|
+
"include_crds": include_crds,
|
|
245
|
+
"repository": repository,
|
|
246
|
+
"version": version,
|
|
247
|
+
}}))
|
|
248
|
+
values = values[0] if values else {}
|
|
235
249
|
|
|
236
250
|
version_spec = []
|
|
237
251
|
if repository:
|
|
@@ -260,8 +274,7 @@ class HelmPlugin(KubernatorPlugin):
|
|
|
260
274
|
] +
|
|
261
275
|
version_spec +
|
|
262
276
|
(["--include-crds"] if include_crds else []) +
|
|
263
|
-
|
|
264
|
-
(["-f", "-"] if values else []),
|
|
277
|
+
["-f", "-"],
|
|
265
278
|
stderr_logger,
|
|
266
279
|
stdin=stdin,
|
|
267
280
|
)
|
kubernator/plugins/istio.py
CHANGED
|
@@ -33,7 +33,7 @@ from kubernator.api import (KubernatorPlugin, scan_dir,
|
|
|
33
33
|
Globs,
|
|
34
34
|
get_golang_os,
|
|
35
35
|
get_golang_machine,
|
|
36
|
-
prepend_os_path, jp)
|
|
36
|
+
prepend_os_path, jp, load_file)
|
|
37
37
|
from kubernator.plugins.k8s_api import K8SResourcePluginMixin
|
|
38
38
|
|
|
39
39
|
logger = logging.getLogger("kubernator.istio")
|
|
@@ -210,10 +210,11 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
|
|
|
210
210
|
display_p = context.app.display_path(p)
|
|
211
211
|
logger.info("Adding Istio Operator from %s", display_p)
|
|
212
212
|
|
|
213
|
-
|
|
214
|
-
|
|
213
|
+
manifests = load_file(logger, p, FileType.YAML, display_p,
|
|
214
|
+
self.template_engine,
|
|
215
|
+
{"ktor": context})
|
|
215
216
|
|
|
216
|
-
self.add_resources(
|
|
217
|
+
self.add_resources(manifests, display_p)
|
|
217
218
|
|
|
218
219
|
def handle_apply(self):
|
|
219
220
|
context = self.context
|
kubernator/plugins/k8s.py
CHANGED
|
@@ -38,7 +38,8 @@ from kubernator.api import (KubernatorPlugin,
|
|
|
38
38
|
FileType,
|
|
39
39
|
load_remote_file,
|
|
40
40
|
StripNL,
|
|
41
|
-
install_python_k8s_client
|
|
41
|
+
install_python_k8s_client,
|
|
42
|
+
TemplateEngine)
|
|
42
43
|
from kubernator.merge import extract_merge_instructions, apply_merge_instructions
|
|
43
44
|
from kubernator.plugins.k8s_api import (K8SResourcePluginMixin,
|
|
44
45
|
K8SResource,
|
|
@@ -95,6 +96,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
|
|
|
95
96
|
self._transformers = []
|
|
96
97
|
self._validators = []
|
|
97
98
|
self._summary = 0, 0, 0
|
|
99
|
+
self._template_engine = TemplateEngine(logger)
|
|
98
100
|
|
|
99
101
|
def set_context(self, context):
|
|
100
102
|
self.context = context
|
|
@@ -164,7 +166,7 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
|
|
|
164
166
|
|
|
165
167
|
logger.info("Using Kubernetes client version =~%s.0 for server version %s",
|
|
166
168
|
server_minor, ".".join(k8s.server_version))
|
|
167
|
-
pkg_dir = install_python_k8s_client(self.context.app.
|
|
169
|
+
pkg_dir = install_python_k8s_client(self.context.app.run_passthrough_capturing, server_minor, logger,
|
|
168
170
|
stdout_logger, stderr_logger, k8s.disable_client_patches)
|
|
169
171
|
|
|
170
172
|
modules_to_delete = []
|
|
@@ -239,7 +241,10 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
|
|
|
239
241
|
display_p = context.app.display_path(p)
|
|
240
242
|
logger.debug("Adding Kubernetes manifest from %s", display_p)
|
|
241
243
|
|
|
242
|
-
manifests = load_file(logger, p, FileType.YAML, display_p
|
|
244
|
+
manifests = load_file(logger, p, FileType.YAML, display_p,
|
|
245
|
+
self._template_engine,
|
|
246
|
+
{"ktor": context}
|
|
247
|
+
)
|
|
243
248
|
|
|
244
249
|
for manifest in manifests:
|
|
245
250
|
if manifest:
|
kubernator/plugins/kops.py
CHANGED
|
@@ -30,7 +30,7 @@ from kubernator.api import (KubernatorPlugin, scan_dir,
|
|
|
30
30
|
io_StringIO,
|
|
31
31
|
TemplateEngine,
|
|
32
32
|
StripNL,
|
|
33
|
-
Globs)
|
|
33
|
+
Globs, load_file)
|
|
34
34
|
from kubernator.plugins.k8s_api import K8SResourcePluginMixin
|
|
35
35
|
from kubernator.proc import CalledProcessError
|
|
36
36
|
|
|
@@ -136,10 +136,11 @@ class KopsPlugin(KubernatorPlugin, K8SResourcePluginMixin):
|
|
|
136
136
|
display_p = context.app.display_path(p)
|
|
137
137
|
logger.debug("Adding Kops resources from %s", display_p)
|
|
138
138
|
|
|
139
|
-
|
|
140
|
-
|
|
139
|
+
manifests = load_file(logger, p, FileType.YAML, display_p,
|
|
140
|
+
self.template_engine,
|
|
141
|
+
{"ktor": context})
|
|
141
142
|
|
|
142
|
-
self.add_resources(
|
|
143
|
+
self.add_resources(manifests, display_p)
|
|
143
144
|
|
|
144
145
|
def update(self):
|
|
145
146
|
context = self.context
|
kubernator/plugins/minikube.py
CHANGED
|
@@ -35,6 +35,8 @@ proc_logger = logger.getChild("proc")
|
|
|
35
35
|
stdout_logger = StripNL(proc_logger.info)
|
|
36
36
|
stderr_logger = StripNL(proc_logger.warning)
|
|
37
37
|
|
|
38
|
+
MINIKUBE_MAX_VERSION_LEGACY = "1.36.0"
|
|
39
|
+
|
|
38
40
|
|
|
39
41
|
class MinikubePlugin(KubernatorPlugin):
|
|
40
42
|
logger = logger
|
|
@@ -99,9 +101,17 @@ class MinikubePlugin(KubernatorPlugin):
|
|
|
99
101
|
logger.critical(msg)
|
|
100
102
|
raise RuntimeError(msg)
|
|
101
103
|
|
|
104
|
+
k8s_version_tuple = tuple(map(int, k8s_version.split(".")))
|
|
105
|
+
|
|
102
106
|
if not minikube_version:
|
|
103
107
|
minikube_version = self.get_latest_minikube_version()
|
|
104
108
|
logger.info("No minikube version is specified, latest is %s", minikube_version)
|
|
109
|
+
if k8s_version_tuple < (1, 28, 0):
|
|
110
|
+
logger.info("While latest minikube version is %s, "
|
|
111
|
+
"the requested K8S version %s requires %s or earlier - choosing %s",
|
|
112
|
+
minikube_version, k8s_version, MINIKUBE_MAX_VERSION_LEGACY,
|
|
113
|
+
MINIKUBE_MAX_VERSION_LEGACY)
|
|
114
|
+
minikube_version = MINIKUBE_MAX_VERSION_LEGACY
|
|
105
115
|
|
|
106
116
|
minikube_dl_file, _ = context.app.download_remote_file(logger,
|
|
107
117
|
f"https://github.com/kubernetes/minikube/releases"
|
kubernator/proc.py
CHANGED
|
@@ -108,7 +108,7 @@ class ProcessRunner:
|
|
|
108
108
|
raise RuntimeError("not available")
|
|
109
109
|
return self._proc.stdin
|
|
110
110
|
|
|
111
|
-
def wait(self, fail=True, timeout=None, _out_func=None):
|
|
111
|
+
def wait(self, fail=True, timeout=None, _out_func=None, _stderr_func=None):
|
|
112
112
|
with Timeout(timeout, TimeoutExpired):
|
|
113
113
|
retcode = self._proc.wait()
|
|
114
114
|
if self._stdin_writer:
|
|
@@ -119,9 +119,12 @@ class ProcessRunner:
|
|
|
119
119
|
self._stderr_reader.join()
|
|
120
120
|
if fail and retcode:
|
|
121
121
|
output = None
|
|
122
|
+
stderr = None
|
|
122
123
|
if _out_func:
|
|
123
124
|
output = _out_func()
|
|
124
|
-
|
|
125
|
+
if _stderr_func:
|
|
126
|
+
stderr = _stderr_func()
|
|
127
|
+
raise CalledProcessError(retcode, self._safe_args, output=output, stderr=stderr)
|
|
125
128
|
return retcode
|
|
126
129
|
|
|
127
130
|
def terminate(self):
|
|
@@ -134,6 +137,25 @@ class ProcessRunner:
|
|
|
134
137
|
run = ProcessRunner
|
|
135
138
|
|
|
136
139
|
|
|
140
|
+
def run_pass_through_capturing(args, stdout_logger, stderr_logger, stdin=DEVNULL, *, safe_args=None,
|
|
141
|
+
universal_newlines=True, **kwargs):
|
|
142
|
+
out = StringIO(trimmed=False) if universal_newlines else BytesIO()
|
|
143
|
+
err = StringIO(trimmed=False) if universal_newlines else BytesIO()
|
|
144
|
+
|
|
145
|
+
def write_out(data):
|
|
146
|
+
out.write(data)
|
|
147
|
+
stdout_logger(data)
|
|
148
|
+
|
|
149
|
+
def write_err(data):
|
|
150
|
+
err.write(data)
|
|
151
|
+
stderr_logger(data)
|
|
152
|
+
|
|
153
|
+
proc = run(args, write_out, write_err, stdin, safe_args=safe_args, universal_newlines=universal_newlines,
|
|
154
|
+
**kwargs)
|
|
155
|
+
proc.wait(_out_func=lambda: out.getvalue(), _stderr_func=lambda: err.getvalue())
|
|
156
|
+
return out.getvalue(), err.getvalue()
|
|
157
|
+
|
|
158
|
+
|
|
137
159
|
def run_capturing_out(args, stderr_logger, stdin=DEVNULL, *, safe_args=None, universal_newlines=True, **kwargs):
|
|
138
160
|
out = StringIO(trimmed=False) if universal_newlines else BytesIO()
|
|
139
161
|
proc = run(args, out.write, stderr_logger, stdin, safe_args=safe_args, universal_newlines=universal_newlines,
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: kubernator
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.22
|
|
4
4
|
Summary: Kubernator is the a pluggable framework for K8S provisioning
|
|
5
5
|
Home-page: https://github.com/karellen/kubernator
|
|
6
6
|
Author: Express Systems USA, Inc.
|
|
7
7
|
Author-email:
|
|
8
8
|
Maintainer: Karellen, Inc., Arcadiy Ivanov
|
|
9
9
|
Maintainer-email: supervisor@karellen.co,arcadiy@karellen.co
|
|
10
|
-
License: Apache
|
|
10
|
+
License: Apache-2.0
|
|
11
11
|
Project-URL: Bug Tracker, https://github.com/karellen/kubernator/issues
|
|
12
12
|
Project-URL: Documentation, https://github.com/karellen/kubernator/
|
|
13
13
|
Project-URL: Source Code, https://github.com/karellen/kubernator/
|
|
14
14
|
Keywords: kubernetes k8s kube top provisioning kOps terraform tf AWS
|
|
15
|
-
Classifier: License :: OSI Approved :: Apache Software License
|
|
16
15
|
Classifier: Programming Language :: Python :: 3.9
|
|
17
16
|
Classifier: Programming Language :: Python :: 3.10
|
|
18
17
|
Classifier: Programming Language :: Python :: 3.11
|
|
19
18
|
Classifier: Programming Language :: Python :: 3.12
|
|
20
19
|
Classifier: Programming Language :: Python :: 3.13
|
|
20
|
+
Classifier: Programming Language :: Python :: 3.14
|
|
21
21
|
Classifier: Operating System :: MacOS :: MacOS X
|
|
22
22
|
Classifier: Operating System :: POSIX
|
|
23
23
|
Classifier: Operating System :: POSIX :: Linux
|
|
@@ -45,7 +45,7 @@ Requires-Dist: kubernetes~=32.0
|
|
|
45
45
|
Requires-Dist: openapi-schema-validator~=0.1
|
|
46
46
|
Requires-Dist: openapi-spec-validator~=0.3
|
|
47
47
|
Requires-Dist: platformdirs~=4.2
|
|
48
|
-
Requires-Dist: requests
|
|
48
|
+
Requires-Dist: requests>=2.31.0
|
|
49
49
|
Dynamic: author
|
|
50
50
|
Dynamic: classifier
|
|
51
51
|
Dynamic: description
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
|
|
2
|
+
kubernator/__init__.py,sha256=2Ip--l-XtVX9778fc9qar47xy5S1vx8WGZt0Qtar-jQ,915
|
|
3
|
+
kubernator/__main__.py,sha256=f0S60wgpLu--1UlOhzfWail-xt8zyIuODodX98_yPN0,707
|
|
4
|
+
kubernator/_json_path.py,sha256=pjQKXxgbpQWETYBIrIuJZHgugF92IbEAM19AC7JUmAQ,3162
|
|
5
|
+
kubernator/_k8s_client_patches.py,sha256=PEeWPInnW38NDyK7G24_Dmw-x7xHpN3vJWZeckdqgK0,76892
|
|
6
|
+
kubernator/api.py,sha256=nLHzhgKocgduBDT22-nlAhpR2xCS6z24jb8NTic0yNc,29547
|
|
7
|
+
kubernator/app.py,sha256=ETgysPcIKEDsMTbdIw00-enSLip7Z2cECJrRxjf9ciw,21214
|
|
8
|
+
kubernator/merge.py,sha256=eW5fajnDdI2n8aUqRfTmdG6GWDvDtcVKPKsp3fiB5Nk,5882
|
|
9
|
+
kubernator/proc.py,sha256=43jrpTe1FCdhDIK0b6hnB6XqU_m7iYu3wbzJyzO3pl0,5979
|
|
10
|
+
kubernator/plugins/__init__.py,sha256=h9TLYK8UFEi53ipZSZsTBjp0ljKhisWsgPpt_PkWrO8,670
|
|
11
|
+
kubernator/plugins/awscli.py,sha256=S6X7-qFiaZ7NDVDl2Jg0t-ih9KAJ45cUjjzd5Qe93ZM,4252
|
|
12
|
+
kubernator/plugins/eks.py,sha256=xe7vyPHNwuP8gEYDSzPyBkm-RkAtP64wCOqs9U5I7xI,2273
|
|
13
|
+
kubernator/plugins/helm.py,sha256=2563hLr0uJucw0xo9JLfbCtpGPRZ5e5gYTnapQrqy3w,12036
|
|
14
|
+
kubernator/plugins/istio.py,sha256=1dHjD9r6Kk2-tw6OFMOfBpksnqGMguTyyF1FwwWEtI8,14977
|
|
15
|
+
kubernator/plugins/k8s.py,sha256=XIHqFpdbRL57dnbgOonRD3Mxs9LVSUxQT-GPnpEyZyM,24762
|
|
16
|
+
kubernator/plugins/k8s_api.py,sha256=PDa7MB9q3WMm_9tr8T6LY_ojrHpyGYiNTlvBZinbgFY,27379
|
|
17
|
+
kubernator/plugins/kops.py,sha256=-yhpEjydz9E7Ep24WtEs93rLTXtw4yakdgVqXlIj1ww,9688
|
|
18
|
+
kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
|
|
19
|
+
kubernator/plugins/kubectl.py,sha256=IgNghW1Q6s8V2o08eNY2NWfkkdV9Z6X2A3YFQinFr4g,4028
|
|
20
|
+
kubernator/plugins/minikube.py,sha256=V7nf6YRi-NRIGMTuf4JvrIUFCQXyjBs3kTBjAk5NDDw,10922
|
|
21
|
+
kubernator/plugins/template.py,sha256=542nyS4ZNgdwJHEoIA5aLP1d4C312ydd7sPM9ZFbHuI,8357
|
|
22
|
+
kubernator/plugins/terraform.py,sha256=a1MPl9G8Rznjd28uMRdYWrjpFDLlFAVmLFH4hFEsMsQ,5285
|
|
23
|
+
kubernator/plugins/terragrunt.py,sha256=-qN8tTqPUXJ9O7CEiJVUB0GSUQU3DUTkv-aWdIIsm7Q,5051
|
|
24
|
+
kubernator-1.0.22.dist-info/METADATA,sha256=CnePh_LaJAjBca5EBd87AUv6Tkyj7SiqTKy2US_rNrA,10822
|
|
25
|
+
kubernator-1.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
26
|
+
kubernator-1.0.22.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
|
|
27
|
+
kubernator-1.0.22.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
28
|
+
kubernator-1.0.22.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
|
|
29
|
+
kubernator-1.0.22.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
30
|
+
kubernator-1.0.22.dist-info/RECORD,,
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
|
|
2
|
-
kubernator/__init__.py,sha256=6ClLvaPNEsotcD52r8d4zBWGcBBVaaT-MbAKrgeX4Wg,933
|
|
3
|
-
kubernator/__main__.py,sha256=f0S60wgpLu--1UlOhzfWail-xt8zyIuODodX98_yPN0,707
|
|
4
|
-
kubernator/_json_path.py,sha256=pjQKXxgbpQWETYBIrIuJZHgugF92IbEAM19AC7JUmAQ,3162
|
|
5
|
-
kubernator/_k8s_client_patches.py,sha256=PEeWPInnW38NDyK7G24_Dmw-x7xHpN3vJWZeckdqgK0,76892
|
|
6
|
-
kubernator/api.py,sha256=cU_dsS4PcTkRUcQqnRxsaqzeoApjhwRd2-l4CfwFZpU,27201
|
|
7
|
-
kubernator/app.py,sha256=ZtQm60Cb1z2SkD338B6nue3wLOo_auRqZRW5ou_-d84,20949
|
|
8
|
-
kubernator/merge.py,sha256=eW5fajnDdI2n8aUqRfTmdG6GWDvDtcVKPKsp3fiB5Nk,5882
|
|
9
|
-
kubernator/proc.py,sha256=8YlgbppyHic_51fVTPD7OP8x5yuRuL8j1kThR8MJjNI,5119
|
|
10
|
-
kubernator/plugins/__init__.py,sha256=h9TLYK8UFEi53ipZSZsTBjp0ljKhisWsgPpt_PkWrO8,670
|
|
11
|
-
kubernator/plugins/awscli.py,sha256=S6X7-qFiaZ7NDVDl2Jg0t-ih9KAJ45cUjjzd5Qe93ZM,4252
|
|
12
|
-
kubernator/plugins/eks.py,sha256=xe7vyPHNwuP8gEYDSzPyBkm-RkAtP64wCOqs9U5I7xI,2273
|
|
13
|
-
kubernator/plugins/helm.py,sha256=R5hrDDhQ8b5BYYswvxJaM9-KsHKWPBKqHVtTRa1eSuA,11122
|
|
14
|
-
kubernator/plugins/istio.py,sha256=oERwbVtIk9vMJp_miBXK3-XJKF6SDbh6PPe0p3QIekY,14924
|
|
15
|
-
kubernator/plugins/k8s.py,sha256=Zj3q_bUmbOADfjSHy2X0BhgrbXuH-fM8Vq75sYFy0nE,24496
|
|
16
|
-
kubernator/plugins/k8s_api.py,sha256=PDa7MB9q3WMm_9tr8T6LY_ojrHpyGYiNTlvBZinbgFY,27379
|
|
17
|
-
kubernator/plugins/kops.py,sha256=QsrQJUF6wGJo2QRVqP92pG5vmOTYQIc25PD_DWCzrAA,9635
|
|
18
|
-
kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
|
|
19
|
-
kubernator/plugins/kubectl.py,sha256=IgNghW1Q6s8V2o08eNY2NWfkkdV9Z6X2A3YFQinFr4g,4028
|
|
20
|
-
kubernator/plugins/minikube.py,sha256=FFGW8Rkap4CPEydEgxXhIuK3A263khjli0adC5j09MA,10393
|
|
21
|
-
kubernator/plugins/template.py,sha256=542nyS4ZNgdwJHEoIA5aLP1d4C312ydd7sPM9ZFbHuI,8357
|
|
22
|
-
kubernator/plugins/terraform.py,sha256=a1MPl9G8Rznjd28uMRdYWrjpFDLlFAVmLFH4hFEsMsQ,5285
|
|
23
|
-
kubernator/plugins/terragrunt.py,sha256=-qN8tTqPUXJ9O7CEiJVUB0GSUQU3DUTkv-aWdIIsm7Q,5051
|
|
24
|
-
kubernator-1.0.21.dev20250528230808.dist-info/METADATA,sha256=k8c4swQKrnr37T2muhR8-B1p6ri7gIyrwVmzD63bZFY,10869
|
|
25
|
-
kubernator-1.0.21.dev20250528230808.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
26
|
-
kubernator-1.0.21.dev20250528230808.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
|
|
27
|
-
kubernator-1.0.21.dev20250528230808.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
28
|
-
kubernator-1.0.21.dev20250528230808.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
|
|
29
|
-
kubernator-1.0.21.dev20250528230808.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
30
|
-
kubernator-1.0.21.dev20250528230808.dist-info/RECORD,,
|
|
File without changes
|
{kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/entry_points.txt
RENAMED
|
File without changes
|
{kubernator-1.0.21.dev20250528230808.dist-info → kubernator-1.0.22.dist-info}/namespace_packages.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|