greg/nixos
1
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix broken auto-deployments

Browse Source
This commit is contained in:
Greg Hellings
2025-11-23 14:43:36 -06:00
parent bfd8e7cf95
commit 893db983e0
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+2 -3
View File
@@ -68,8 +68,7 @@
); );
charts_overlay = ( charts_overlay = (
_f: _p: { _f: _p: {
chartsDerivations = top.charts.chartsDerivations."${_p.stdenv.hostPlatform.system}"; chartsMetadata = top.charts.chartsMetadata;
kubelib = top.nix-kube-generators.lib;
} }
); );
overlays = [ overlays = [
@@ -113,7 +112,7 @@
... ...
}: }:
{ {
_module.args = { _module.args = rec {
pkgs = import top.nixunstable { inherit system overlays; }; pkgs = import top.nixunstable { inherit system overlays; };
}; };
manifests/bitwarden/deployment.yaml
+3 -3
View File
@@ -24,9 +24,9 @@ spec:
# Since my gitlab instance depends on the database hosted in k3s, and # Since my gitlab instance depends on the database hosted in k3s, and
# the database depends on this image, I need a way to bootstrap the # the database depends on this image, I need a way to bootstrap the
# system if # I am doing disaster recovery. And this is it. # system if # I am doing disaster recovery. And this is it.
#image: "ghcr.io/greg-hellings/nixos-config/img-bitwarden:latest" image: "ghcr.io/greg-hellings/nixos-config/img-bitwarden:latest"
image: >- #image: >-
registry.thehellings.com/greg/nixos-config/img-bitwarden:latest # registry.thehellings.com/greg/nixos-config/img-bitwarden:latest
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: BW_CLIENTID - name: BW_CLIENTID
modules/nixos/kubernetes.nix
+9 -3
View File
@@ -80,9 +80,11 @@ in
enable = true; enable = true;
autoDeployCharts = { autoDeployCharts = {
external-secrets = { external-secrets = {
inherit (pkgs.chartsMetadata.external-secrets.external-secrets) repo version;
enable = true; enable = true;
name = pkgs.chartsMetadata.external-secrets.external-secrets.chart;
hash = "sha256-w0wlFtECXg4/F8Ke26wQexGcbDIfjqvsZwZYeJyVmLU=";
createNamespace = true; createNamespace = true;
package = pkgs.chartsDerivations.external-secrets.external-secrets;
targetNamespace = "external-secrets"; targetNamespace = "external-secrets";
values = { values = {
crds.create = true; crds.create = true;
@@ -90,9 +92,11 @@ in
}; };
}; };
kyverno = { kyverno = {
inherit (pkgs.chartsMetadata.kyverno.kyverno) repo version;
enable = true; enable = true;
name = pkgs.chartsMetadata.kyverno.kyverno.chart;
hash = "sha256-QFdrhgziOIe194ltl00JkH3BAQHHury9qSgAX/YZzOg=";
createNamespace = true; createNamespace = true;
package = pkgs.chartsDerivations.kyverno.kyverno;
targetNamespace = "kyverno-system"; targetNamespace = "kyverno-system";
values = { values = {
admissionController.replicas = 3; admissionController.replicas = 3;
@@ -103,9 +107,11 @@ in
}; };
}; };
tailscale = { tailscale = {
inherit (pkgs.chartsMetadata.tailscale.tailscale-operator) repo version;
enable = true; enable = true;
name = pkgs.chartsMetadata.tailscale.tailscale-operator.chart;
hash = "sha256-89MSeInAckiBsCK0ag2hrflVBWGgVvl22uy8xk9HU2g=";
createNamespace = true; createNamespace = true;
package = pkgs.chartsDerivations.tailscale.tailscale-operator;
targetNamespace = "tailscale"; targetNamespace = "tailscale";
}; };
}; };