gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(k8s): nixpkgs PR was merged

Browse source
This commit is contained in:
arcnmx 2024-02-19 15:43:43 -08:00
parent 4d96e07d0e
commit d13eaaaca6
4 changed files with 0 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
flake.lock generated
View file

@ -152,18 +152,6 @@
"type": "github" "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": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1707603439, "lastModified": 1707603439,
@ -205,7 +193,6 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"flakelib": "flakelib", "flakelib": "flakelib",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-patch-k8s-pki": "nixpkgs-patch-k8s-pki",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"std": "std", "std": "std",

5
flake.nix
View file

@ -2,11 +2,6 @@
description = "kat's nixfiles"; description = "kat's nixfiles";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; 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 = { arcexprs = {
url = "github:arcnmx/nixexprs/master"; url = "github:arcnmx/nixexprs/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

15
nixos/k8s.nix
View file

@ -12,21 +12,6 @@
kubeMasterHostname = "k8s.gensokyo.zone"; kubeMasterHostname = "k8s.gensokyo.zone";
kubeMasterAPIServerPort = 6443; kubeMasterAPIServerPort = 6443;
in { 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 # packages for administration tasks
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kompose kompose

1
outputs.nix
View file

@ -20,7 +20,6 @@
name = "nixpkgs"; name = "nixpkgs";
src = inputs.nixpkgs; src = inputs.nixpkgs;
patches = [ patches = [
inputs.nixpkgs-patch-k8s-pki
]; ];
}; };
deploy-rs = let deploy-rs = let