Add more sas tooling

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
2025-01-09 16:30:02 +00:00
parent b355f72b2e
commit 79ff5a55e2
8 changed files with 101 additions and 4 deletions

View File

@@ -2,9 +2,26 @@
user ? throw "user argument is required",
home ? throw "home argument is required",
}:
{ ... }:
{ pkgs, ... }:
{
nixpkgs.overlays = [
(final: prev: {
telepresence = prev.telepresence.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [
./fix-versioneer.patch
./extend-timeout.patch
];
});
})
];
home-manager.users.${user} = {
home.packages = with pkgs; [
telepresence
kubeval
kustomize
];
sops.secrets = {
"kubeconfig/d90270" = {
sopsFile = ../../../../../../../secrets/sas/secrets.yaml;

View File

@@ -0,0 +1,13 @@
diff --git a/telepresence/proxy/remote.py b/telepresence/proxy/remote.py
index 835d42054..d910bd03f 100644
--- a/telepresence/proxy/remote.py
+++ b/telepresence/proxy/remote.py
@@ -112,7 +112,7 @@ def wait_for_pod(runner: Runner, remote_info: RemoteInfo) -> None:
runner.kubectl(
"wait",
"--for=condition=ready",
- "--timeout=60s",
+ "--timeout=240s",
"pod/" + remote_info.pod_name,
)
)

View File

@@ -0,0 +1,16 @@
diff --git a/versioneer.py b/versioneer.py
index 7e5bb402e..60d65ef76 100644
--- a/versioneer.py
+++ b/versioneer.py
@@ -339,9 +339,9 @@ def get_config_from_root(root):
# configparser.NoOptionError (if it lacks "VCS="). See the docstring at
# the top of versioneer.py for instructions on writing your setup.cfg .
setup_cfg = os.path.join(root, "setup.cfg")
- parser = configparser.SafeConfigParser()
+ parser = configparser.ConfigParser()
with open(setup_cfg, "r") as f:
- parser.readfp(f)
+ parser.read_file(f)
VCS = parser.get("versioneer", "VCS") # mandatory
def get(parser, name):