diff --git a/modules/k8s.nix b/modules/k8s.nix index 6ab8ba7..0593503 100644 --- a/modules/k8s.nix +++ b/modules/k8s.nix @@ -5,8 +5,6 @@ let pki = import ./pki.nix { inherit pkgs; ca = cfg.initca; }; - linkerd-certs = import ./linkerd-certs.nix { inherit pkgs; }; - masterAddress = cfg.k8s.master.address; apiserverAddress = "https://${masterAddress}:4443"; @@ -56,8 +54,6 @@ let acme_email="${cfg.k8s.charts.acme_email}" grafana_smtp_user="$(echo -n ${cfg.k8s.charts.grafana_smtp_user} | base64 -w0)" grafana_smtp_password="$(echo -n ${cfg.k8s.charts.grafana_smtp_password} | base64 -w0)" - linkerd_identity_ca="${linkerd-certs.identity}" - linkerd_webhook_ca="${linkerd-certs.webhook}" ) # -------------------- no modifications below -------------------- diff --git a/modules/linkerd-certs.nix b/modules/linkerd-certs.nix deleted file mode 100644 index 63bf92d..0000000 --- a/modules/linkerd-certs.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: -let - identity = import ./initca.nix { - inherit pkgs; - name = "linkerd-identity-ca"; - algo = "ecdsa"; - hosts = [ "identity.linkerd.cluster.local" ]; - }; - - webhook = import ./initca.nix { - inherit pkgs; - name = "linkerd-webhook-ca"; - algo = "ecdsa"; - hosts = [ "webhook.linkerd.cluster.local" ]; - }; -in { - inherit identity webhook; -}