Allow extra args to helm_apply

This commit is contained in:
Jonas Juselius
2020-11-13 15:24:34 +01:00
parent da7b4dcfc8
commit ef4bbd1a69

View File

@@ -108,12 +108,12 @@ let
helm_apply () { helm_apply () {
local name chart local name chart
name="$1" name="$1"; shift
chart="$2" chart="$1"; shift
create_namespace $namespace create_namespace $namespace
cat values.yaml | \ cat values.yaml | \
substitute_defaults | \ substitute_defaults | \
helm template -n $namespace -f- $name $chart | \ helm template -n $namespace -f- $name $chart $@ | \
kubectl -n $namespace $apply -f - kubectl -n $namespace $apply -f -
} }
@@ -251,12 +251,25 @@ let
Restart = "on-failure"; Restart = "on-failure";
}; };
}; };
systemd.services.cfssl-restart = { systemd.services.cfssl-restart = {
enable = true; enable = true;
startAt = "00/6:00"; startAt = "00/6:00";
description = "Restrart cfssl which regularly locks up"; description = "Restrart cfssl which regularly locks up";
script = "systemctl restart cfssl.service"; script = "systemctl restart cfssl.service";
}; };
systemd.services.kube-socat-https-proxy = {
enable = true;
wantedBy = [ "kubernetes.target" ];
after = [ "kubelet.target" ];
description = "Proxy TCP port 443 to ingress NodePort at 32443";
script = "${pkgs.socat}/bin/socat TCP-LISTEN:443,fork,reuseaddr TCP:127.0.0.1:32443";
serviceConfig = {
RestartSec = "10s";
Restart = "on-failure";
};
};
}; };
kubeNode = { kubeNode = {