kubernator 1.0.9.dev20231221064456__py3-none-any.whl → 1.0.10__py3-none-any.whl

kubernator/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-__version__ = "1.0.9.dev20231221064456"
+__version__ = "1.0.10"
 
 
 def _main():

kubernator/api.py

@@ -236,6 +236,7 @@ def install_python_k8s_client(run, package_major, logger_stdout, logger_stderr):
         package_major_dir.mkdir(parents=True, exist_ok=True)
 
         run([sys.executable, "-m", "pip", "install", "--no-deps", "--no-cache-dir", "--no-input", "--pre",
+             "--root-user-action=ignore", "--break-system-packages", "--disable-pip-version-check",
              "--target", str(package_major_dir), f"kubernetes~={package_major}.0"], logger_stdout, logger_stderr).wait()
 
     return package_major_dir

kubernator/plugins/istio.py

@@ -66,8 +66,18 @@ class IstioPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
         if version:
             # Download and use specific version
+            istioctl_os = get_golang_os()
+            if istioctl_os == "darwin":
+                istioctl_os = "osx"
+                istioctl_machine = get_golang_machine()
+                if istioctl_machine == "amd64":
+                    istioctl_platform = istioctl_os
+                else:
+                    istioctl_platform = f"{istioctl_os}-{istioctl_machine}"
+            else:
+                istioctl_platform = f"{istioctl_os}-{get_golang_machine()}"
             istioctl_url = (f"https://github.com/istio/istio/releases/download/{version}/"
-                            f"istioctl-{version}-{get_golang_os()}-{get_golang_machine()}.tar.gz")
+                            f"istioctl-{version}-{istioctl_platform}.tar.gz")
             istioctl_file_dl, _ = context.app.download_remote_file(logger, istioctl_url, "bin")
             istioctl_file_dl = str(istioctl_file_dl)
             self.istioctl_dir = tempfile.TemporaryDirectory()

kubernator/plugins/k8s.py

@@ -49,6 +49,9 @@ proc_logger = logger.getChild("proc")
 stdout_logger = StripNL(proc_logger.info)
 stderr_logger = StripNL(proc_logger.warning)
 
+FIELD_VALIDATION_STRICT_MARKER = "strict decoding error: "
+VALID_FIELD_VALIDATION = ("Ignore", "Warn", "Strict")
+
 
 def final_resource_validator(resources: Sequence[K8SResource],
                              resource: K8SResource,
@@ -81,10 +84,12 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
     def set_context(self, context):
         self.context = context
 
-    def register(self, **kwargs):
+    def register(self, field_validation="Strict", field_validation_warn_fatal=True):
         self.context.app.register_plugin("kubeconfig")
 
-    def handle_init(self):
+        if field_validation not in VALID_FIELD_VALIDATION:
+            raise ValueError("'field_validation' must be one of %s" % (", ".join(VALID_FIELD_VALIDATION)))
+
         context = self.context
         context.globals.k8s = dict(patch_field_excludes=("^/metadata/managedFields",
                                                          "^/metadata/generation",
@@ -108,6 +113,9 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                    add_validator=self.api_remove_validator,
                                    get_api_versions=self.get_api_versions,
                                    create_resource=self.create_resource,
+                                   field_validation=field_validation,
+                                   field_validation_warn_fatal=field_validation_warn_fatal,
+                                   field_validation_warnings=0,
                                    _k8s=self,
                                    )
         context.k8s = dict(default_includes=Globs(context.globals.k8s.default_includes),
@@ -115,6 +123,9 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                            )
         self.api_add_validator(final_resource_validator)
 
+    def handle_init(self):
+        pass
+
     def handle_start(self):
         self.context.kubeconfig.register_change_notifier(self._kubeconfig_changed)
         self.setup_client()
@@ -180,6 +191,19 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
         logger.info("Found Kubernetes %s on %s", k8s.server_git_version, k8s.client.configuration.host)
         K8SResource._k8s_client_version = tuple(map(int, pkg_version("kubernetes").split(".")))
+        K8SResource._k8s_field_validation = k8s.field_validation
+        K8SResource._logger = self.logger
+        K8SResource._api_warnings = self._api_warnings
+
+    def _api_warnings(self, resource, warn):
+        k8s = self.context.k8s
+        self.context.globals.k8s.field_validation_warnings += 1
+
+        log = self.logger.warning
+        if k8s.field_validation_warn_fatal:
+            log = self.logger.error
+
+        log("FAILED FIELD VALIDATION on resource %s from %s: %s", resource, resource.source, warn)
 
     def handle_before_dir(self, cwd: Path):
         context = self.context
@@ -205,6 +229,8 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
 
     def handle_apply(self):
         context = self.context
+        k8s = context.k8s
+
         self._validate_resources()
 
         cmd = context.app.args.command
@@ -258,6 +284,14 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                  create_func,
                                  delete_func,
                                  status_msg)
+
+        if ((dump or dry_run) and
+                k8s.field_validation_warn_fatal and self.context.globals.k8s.field_validation_warnings):
+            msg = ("There were %d field validation warnings and the warnings are fatal!" %
+                   self.context.globals.k8s.field_validation_warnings)
+            logger.fatal(msg)
+            raise RuntimeError(msg)
+
         if dump:
             if file_format in ("json", "json-pretty"):
                 json.dump(dump_results, file, sort_keys=True,
@@ -339,6 +373,19 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
         rdef = resource.rdef
         rdef.populate_api(client, self.context.k8s.client)
 
+        def handle_400_strict_validation_error(e: ApiException):
+            if e.status == 400:
+                status = json.loads(e.body)
+
+                if status["status"] == "Failure" and FIELD_VALIDATION_STRICT_MARKER in status["message"]:
+                    message = status["message"]
+                    messages = message[message.find(FIELD_VALIDATION_STRICT_MARKER) +
+                                       len(FIELD_VALIDATION_STRICT_MARKER):].split(",")
+                    for m in messages:
+                        self._api_warnings(resource, m.strip())
+
+                    raise e from None
+
         def create(exists_ok=False):
             logger.info("Creating resource %s%s%s", resource, status_msg,
                         " (ignoring existing)" if exists_ok else "")
@@ -350,7 +397,6 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                         status = json.loads(e.body)
                         if status["reason"] == "AlreadyExists":
                             return
-
                 raise
 
         logger.debug("Applying resource %s%s", resource, status_msg)
@@ -359,7 +405,12 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
             logger.trace("Current resource %s: %s", resource, remote_resource)
         except ApiException as e:
             if e.status == 404:
-                create()
+                try:
+                    create()
+                except ApiException as e:
+                    if not handle_400_strict_validation_error(e):
+                        raise
+
             else:
                 raise
         else:
@@ -396,7 +447,8 @@ class KubernetesPlugin(KubernatorPlugin, K8SResourcePluginMixin):
                                 return
                         raise
                 else:
-                    raise
+                    if not handle_400_strict_validation_error(e):
+                        raise
             else:
                 logger.trace("Merged resource %s: %s", resource, merged_resource)
                 patch = jsonpatch.make_patch(remote_resource, merged_resource)

kubernator/plugins/k8s_api.py

@@ -37,6 +37,7 @@ from openapi_schema_validator import OAS30Validator
 
 from kubernator.api import load_file, FileType, load_remote_file, calling_frame_source
 
+K8S_WARNING_HEADER = re.compile(r'(?:,\s*)?(\d{3})\s+(\S+)\s+"(.+?)(?<!\\)"(?:\s+\"(.+?)(?<!\\)\")?\s*')
 UPPER_FOLLOWED_BY_LOWER_RE = re.compile(r"(.)([A-Z][a-z]+)")
 LOWER_OR_NUM_FOLLOWED_BY_UPPER_RE = re.compile(r"([a-z0-9])([A-Z])")
 
@@ -338,6 +339,9 @@ class K8SResourceKey(namedtuple("K8SResourceKey", ["group", "kind", "name", "nam
 
 class K8SResource:
     _k8s_client_version = None
+    _k8s_field_validation = None
+    _logger = None
+    _api_warnings = None
 
     def __init__(self, manifest: dict, rdef: K8SResourceDef, source: Union[str, Path] = None):
         self.key = self.get_manifest_key(manifest)
@@ -403,13 +407,18 @@ class K8SResource:
         rdef = self.rdef
         kwargs = {"body": self.manifest,
                   "_preload_content": False,
-                  "field_manager": "kubernator"
+                  "field_manager": "kubernator",
                   }
+
+        if self._k8s_client_version[0] > 22:
+            kwargs["field_validation"] = self._k8s_field_validation
         if rdef.namespaced:
             kwargs["namespace"] = self.namespace
         if dry_run:
             kwargs["dry_run"] = "All"
-        return json.loads(rdef.create(**kwargs).data)
+        resp = rdef.create(**kwargs)
+        self._process_response_headers(resp)
+        return json.loads(resp.data)
 
     def patch(self, json_patch, *, patch_type: K8SResourcePatchType, force=False, dry_run=True):
         rdef = self.rdef
@@ -420,6 +429,9 @@ class K8SResource:
                   "_preload_content": False,
                   "field_manager": "kubernator",
                   }
+
+        if self._k8s_client_version[0] > 22:
+            kwargs["field_validation"] = self._k8s_field_validation
         if patch_type == K8SResourcePatchType.SERVER_SIDE_PATCH:
             kwargs["force"] = force
         if rdef.namespaced:
@@ -442,7 +454,9 @@ class K8SResource:
         old_func = api_client.select_header_content_type
         try:
             api_client.select_header_content_type = select_header_content_type_patch
-            return json.loads(rdef.patch(**kwargs).data)
+            resp = rdef.patch(**kwargs)
+            self._process_response_headers(resp)
+            return json.loads(resp.data)
         finally:
             api_client.select_header_content_type = old_func
 
@@ -484,6 +498,20 @@ class K8SResource:
             return False
         return self.key == other.key and self.manifest == other.manifest
 
+    def _process_response_headers(self, resp):
+        headers = resp.headers
+        warn_headers = headers.get("Warning")
+        if warn_headers:
+            for warn in K8S_WARNING_HEADER.findall(warn_headers):
+                code, _, msg, _ = warn
+                code = int(code)
+                msg = msg.encode("utf-8").decode("unicode_escape")
+                if code == 299:
+                    self._api_warnings(self, msg)
+                else:
+                    self._logger.warning("Unknown API warning received for resource %s from %s: code %d: %s",
+                                         self, self.source, code, msg)
+
 
 class K8SResourcePluginMixin:
     def __init__(self):

kubernator/plugins/minikube.py

@@ -89,7 +89,7 @@ class MinikubePlugin(KubernatorPlugin):
 
     def register(self, minikube_version=None, profile="default", k8s_version=None,
                  keep_running=False, start_fresh=False,
-                 nodes=1, driver="docker", cpus="no-limit", extra_args=None):
+                 nodes=1, driver=None, cpus="no-limit", extra_args=None):
         context = self.context
 
         context.app.register_plugin("kubeconfig")
@@ -116,7 +116,7 @@ class MinikubePlugin(KubernatorPlugin):
         minikube_file = Path(self.minikube_dir.name) / "minikube"
         minikube_file.symlink_to(minikube_dl_file)
         prepend_os_path(self.minikube_dir.name)
-        version_out: str = self.context.app.run_capturing_out([minikube_file, "version", "--short"],
+        version_out: str = self.context.app.run_capturing_out([str(minikube_file), "version", "--short"],
                                                               stderr_logger).strip()
         version = version_out[1:]
         logger.info("Found minikube %s in %s", version, minikube_file)
@@ -127,6 +127,31 @@ class MinikubePlugin(KubernatorPlugin):
         self.kubeconfig_dir = profile_dir / ".kube"
         self.kubeconfig_dir.mkdir(parents=True, exist_ok=True)
 
+        if not driver:
+            driver = "docker"
+            if get_golang_os() == "darwin":
+                logger.debug("Auto-detecting Minikube driver on MacOS...")
+                cmd_debug_logger = StripNL(proc_logger.debug)
+                try:
+                    context.app.run(["docker", "info"], cmd_debug_logger, cmd_debug_logger).wait()
+                    logger.info("Docker is functional, selecting 'docker' as the driver for Minikube")
+                except (FileNotFoundError, CalledProcessError) as e:
+                    logger.trace("Docker is NOT functional", exc_info=e)
+                    driver = "hyperkit"
+                    try:
+                        context.app.run(["hyperkit", "-v"], cmd_debug_logger, cmd_debug_logger).wait()
+                        logger.info("Hyperkit is functional, selecting 'hyperkit' as the driver for Minikube")
+                    except (FileNotFoundError, CalledProcessError) as e:
+                        logger.trace("Hyperkit is NOT functional", exc_info=e)
+                        driver = "podman"
+                        try:
+                            context.app.run(["podman", "info"], cmd_debug_logger, cmd_debug_logger).wait()
+                            logger.info("Podman is functional, selecting 'podman' as the driver for Minikube")
+                        except (FileNotFoundError, CalledProcessError) as e:
+                            logger.trace("Podman is NOT functional", exc_info=e)
+                            raise RuntimeError("No Minikube driver is functional on MacOS. "
+                                               "Tried 'docker', 'hyperkit' and 'podman'!")
+
         context.globals.minikube = dict(version=version,
                                         minikube_file=str(minikube_file),
                                         profile=profile,
@@ -161,12 +186,16 @@ class MinikubePlugin(KubernatorPlugin):
         minikube = self.context.minikube
         if not self.minikube_is_running():
             logger.info("Starting minikube profile %r...", minikube.profile)
-            self.cmd("start",
-                     "--driver", str(minikube.driver),
-                     "--nodes", str(minikube.nodes),
-                     "--cpus", str(minikube.cpus),
-                     "--kubernetes-version", str(minikube.k8s_version),
-                     "--wait", "apiserver")
+            args = ["start",
+                    "--driver", str(minikube.driver),
+                    "--kubernetes-version", str(minikube.k8s_version),
+                    "--wait", "apiserver",
+                    "--nodes", str(minikube.nodes)]
+
+            if minikube.driver == "docker":
+                args.extend(["--cpus", str(minikube.cpus)])
+
+            self.cmd(*args)
         else:
             logger.warning("Minikube profile %r is already running!", minikube.profile)
 

{kubernator-1.0.9.dev20231221064456.dist-info → kubernator-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kubernator
-Version: 1.0.9.dev20231221064456
+Version: 1.0.10
 Summary: Kubernator is the a pluggable framework for K8S provisioning
 Home-page: https://github.com/karellen/kubernator
 Author: Express Systems USA, Inc.
@@ -94,6 +94,14 @@ A simple example is as follows:
 $ docker run --mount type=bind,source="$(pwd)",target=/root,readonly -t ghcr.io/karellen/kubernator:latest
 ```
 
+## Using Kubernator on MacOS
+
+```
+$ brew install python3.11
+$ pip3.11 install 'kubernator~=1.0.9'
+$ kubernator --version
+```
+
 Please note, that some plugins (e.g. `awscli`, `eks`) may require additional volume mounts or environmental
 variables to be passed for credentials and other external configuration.
 

kubernator-1.0.10.dist-info/RECORD

@@ -0,0 +1,27 @@
+kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
+kubernator/__init__.py,sha256=-fQpuCFMLl7Id-W5W1PlNxyWii9c5KfgUhYNguIFZzM,915
+kubernator/__main__.py,sha256=f0S60wgpLu--1UlOhzfWail-xt8zyIuODodX98_yPN0,707
+kubernator/api.py,sha256=3hxYHOJt_ps9VFqqOuIHOHPLThLb98RO-gZZ_E-xd9I,24951
+kubernator/app.py,sha256=kGS8jVcf-nCY1mP6MdqMR27XNcEMb5Uxek9FEW4GWLg,19472
+kubernator/proc.py,sha256=8YlgbppyHic_51fVTPD7OP8x5yuRuL8j1kThR8MJjNI,5119
+kubernator/plugins/__init__.py,sha256=h9TLYK8UFEi53ipZSZsTBjp0ljKhisWsgPpt_PkWrO8,670
+kubernator/plugins/awscli.py,sha256=S6X7-qFiaZ7NDVDl2Jg0t-ih9KAJ45cUjjzd5Qe93ZM,4252
+kubernator/plugins/eks.py,sha256=xe7vyPHNwuP8gEYDSzPyBkm-RkAtP64wCOqs9U5I7xI,2273
+kubernator/plugins/helm.py,sha256=3BYZBPoiMUtNgmhdcbYCVRTPtaQMYzhfnMqXWyZRJZc,10525
+kubernator/plugins/istio.py,sha256=rjqFyWWKVhcv8tB5sY9cAQV8XnmUYc5vn8t1R6GRjOQ,10432
+kubernator/plugins/k8s.py,sha256=OFhIJteUU_SDA9PIfLl3IvShqEWxXgB1xdCR0qoyLco,22580
+kubernator/plugins/k8s_api.py,sha256=nDM40srd5drZNirDJ0B5fsKRV1O7Yq6_cWpdkcWYN2w,27189
+kubernator/plugins/kops.py,sha256=QsrQJUF6wGJo2QRVqP92pG5vmOTYQIc25PD_DWCzrAA,9635
+kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
+kubernator/plugins/kubectl.py,sha256=IgNghW1Q6s8V2o08eNY2NWfkkdV9Z6X2A3YFQinFr4g,4028
+kubernator/plugins/minikube.py,sha256=Gm1aI5QlYFd8eyWm7g85z2aZmPcscYD63ww3sPcvxVQ,10152
+kubernator/plugins/template.py,sha256=o6UqLw1wK91gCfN7q-Wwc3P5iycAeELUryXh-egA2vQ,8070
+kubernator/plugins/terraform.py,sha256=a1MPl9G8Rznjd28uMRdYWrjpFDLlFAVmLFH4hFEsMsQ,5285
+kubernator/plugins/terragrunt.py,sha256=-qN8tTqPUXJ9O7CEiJVUB0GSUQU3DUTkv-aWdIIsm7Q,5051
+kubernator-1.0.10.dist-info/METADATA,sha256=tI1LSt3VbeyqlPl29hPpg6cKRJmkT9tbtngNeQnj-NE,10427
+kubernator-1.0.10.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+kubernator-1.0.10.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
+kubernator-1.0.10.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.10.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
+kubernator-1.0.10.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+kubernator-1.0.10.dist-info/RECORD,,

kubernator-1.0.9.dev20231221064456.dist-info/RECORD

@@ -1,27 +0,0 @@
-kubernator/LICENSE,sha256=wKKdOCMTCPQRV5gDkVLAsXX8qSnRJ5owk7yWPO1KZNo,11387
-kubernator/__init__.py,sha256=ca4dZf97wZBiYKrL-G9oQbQvXKtB9FwEqofjxBb2vho,932
-kubernator/__main__.py,sha256=f0S60wgpLu--1UlOhzfWail-xt8zyIuODodX98_yPN0,707
-kubernator/api.py,sha256=iO4clVqbCeGHO1SbW-xbDymK-KHkmPJYIRllRVyeN6Q,24851
-kubernator/app.py,sha256=kGS8jVcf-nCY1mP6MdqMR27XNcEMb5Uxek9FEW4GWLg,19472
-kubernator/proc.py,sha256=8YlgbppyHic_51fVTPD7OP8x5yuRuL8j1kThR8MJjNI,5119
-kubernator/plugins/__init__.py,sha256=h9TLYK8UFEi53ipZSZsTBjp0ljKhisWsgPpt_PkWrO8,670
-kubernator/plugins/awscli.py,sha256=S6X7-qFiaZ7NDVDl2Jg0t-ih9KAJ45cUjjzd5Qe93ZM,4252
-kubernator/plugins/eks.py,sha256=xe7vyPHNwuP8gEYDSzPyBkm-RkAtP64wCOqs9U5I7xI,2273
-kubernator/plugins/helm.py,sha256=3BYZBPoiMUtNgmhdcbYCVRTPtaQMYzhfnMqXWyZRJZc,10525
-kubernator/plugins/istio.py,sha256=dk4BjCjgYuhDw4aEV4lqhnuQMvAHNsy9URLmyH0eedw,9987
-kubernator/plugins/k8s.py,sha256=klbAU-DIDNzY-aXfbhxQKHwGhStTmJ-k7ydr1ckUqr8,20248
-kubernator/plugins/k8s_api.py,sha256=xsDQii32khCUOc4hMlNc0zHLQK73VTb4kdnug8ukmy4,26000
-kubernator/plugins/kops.py,sha256=QsrQJUF6wGJo2QRVqP92pG5vmOTYQIc25PD_DWCzrAA,9635
-kubernator/plugins/kubeconfig.py,sha256=uwtHmF2I6LiTPrC3M88G5SfYxDWtuh0MqcMfrHHoNRA,2178
-kubernator/plugins/kubectl.py,sha256=IgNghW1Q6s8V2o08eNY2NWfkkdV9Z6X2A3YFQinFr4g,4028
-kubernator/plugins/minikube.py,sha256=yLp3hbkn_Yv_Vn87YFCN3newYb2m-tyW2Qun-a65gfU,8411
-kubernator/plugins/template.py,sha256=o6UqLw1wK91gCfN7q-Wwc3P5iycAeELUryXh-egA2vQ,8070
-kubernator/plugins/terraform.py,sha256=a1MPl9G8Rznjd28uMRdYWrjpFDLlFAVmLFH4hFEsMsQ,5285
-kubernator/plugins/terragrunt.py,sha256=-qN8tTqPUXJ9O7CEiJVUB0GSUQU3DUTkv-aWdIIsm7Q,5051
-kubernator-1.0.9.dev20231221064456.dist-info/METADATA,sha256=5u-K76WFUuwUXWz89SLmPUKEDp2Bw4VUE05m5NKwc9Q,10318
-kubernator-1.0.9.dev20231221064456.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-kubernator-1.0.9.dev20231221064456.dist-info/entry_points.txt,sha256=IWDtHzyTleRqDSuVRXEr5GImrI7z_kh21t5DWZ8ldcQ,47
-kubernator-1.0.9.dev20231221064456.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.9.dev20231221064456.dist-info/top_level.txt,sha256=_z1CxWeKMI55ckf2vC8HqjbCn_E2Y_P5RdrhE_QWcIs,11
-kubernator-1.0.9.dev20231221064456.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-kubernator-1.0.9.dev20231221064456.dist-info/RECORD,,