From d13eaaaca602175da0316ff6b87a7e67f2d78f7e Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Mon, 19 Feb 2024 15:43:43 -0800
Subject: [PATCH] chore(k8s): nixpkgs PR was merged

---
 flake.lock    | 13 -------------
 flake.nix     |  5 -----
 nixos/k8s.nix | 15 ---------------
 outputs.nix   |  1 -
 4 files changed, 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index f23a6c11..72a58a6c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -152,18 +152,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-patch-k8s-pki": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-Qz3TV1Z/pdKxLqOoV/bmprlmlAfJpTsHUCiWXVgoukw=",
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/275896/commits/9c870ac78f6157260ba1f96f9ce077ce84478532.patch"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/275896/commits/9c870ac78f6157260ba1f96f9ce077ce84478532.patch"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1707603439,
@@ -205,7 +193,6 @@
         "flake-utils": "flake-utils",
         "flakelib": "flakelib",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-patch-k8s-pki": "nixpkgs-patch-k8s-pki",
         "nur": "nur",
         "sops-nix": "sops-nix",
         "std": "std",
diff --git a/flake.nix b/flake.nix
index 3b5b459c..448c1830 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,6 @@
   description = "kat's nixfiles";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-patch-k8s-pki = {
-      # https://github.com/NixOS/nixpkgs/pull/275896
-      url = "https://github.com/NixOS/nixpkgs/pull/275896/commits/9c870ac78f6157260ba1f96f9ce077ce84478532.patch";
-      flake = false;
-    };
     arcexprs = {
       url = "github:arcnmx/nixexprs/master";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/nixos/k8s.nix b/nixos/k8s.nix
index 8abd66cd..6f9af72d 100644
--- a/nixos/k8s.nix
+++ b/nixos/k8s.nix
@@ -12,21 +12,6 @@
   kubeMasterHostname = "k8s.gensokyo.zone";
   kubeMasterAPIServerPort = 6443;
 in {
-  # apply fix: https://github.com/NixOS/nixpkgs/pull/275896
-  imports = let
-    pkiModulePath = "services/cluster/kubernetes/pki.nix";
-    inherit (inputs.self.legacyPackages.${system}) patchedNixpkgs;
-  in [
-    (_: {
-      imports = [
-        (patchedNixpkgs + "/nixos/modules/${pkiModulePath}")
-      ];
-      disabledModules = [
-        pkiModulePath
-      ];
-    })
-  ];
-
   # packages for administration tasks
   environment.systemPackages = with pkgs; [
     kompose
diff --git a/outputs.nix b/outputs.nix
index 7bcfbc21..da19819d 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -20,7 +20,6 @@
           name = "nixpkgs";
           src = inputs.nixpkgs;
           patches = [
-            inputs.nixpkgs-patch-k8s-pki
           ];
         };
         deploy-rs = let