mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 04:19:19 -08:00
chore(k8s): nixpkgs PR was merged
This commit is contained in:
parent
4d96e07d0e
commit
d13eaaaca6
4 changed files with 0 additions and 34 deletions
13
flake.lock
generated
13
flake.lock
generated
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
name = "nixpkgs";
|
||||
src = inputs.nixpkgs;
|
||||
patches = [
|
||||
inputs.nixpkgs-patch-k8s-pki
|
||||
];
|
||||
};
|
||||
deploy-rs = let
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue