Skip to content

Commit 5b5856c

Browse files
ope + cnpg
1 parent 412472a commit 5b5856c

5 files changed

Lines changed: 24 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
- uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
1616
with:
1717
github_access_token: ${{ secrets.GITHUB_TOKEN }}
18+
extra_nix_config: |
19+
extra-experimental-features = pipe-operators
1820
1921
- uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
2022
with:

.github/workflows/containers.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: Containers
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
paths:
77
- .github/workflows/containers.yml
88
- containers/**
99
pull_request:
10-
branches: [ main ]
10+
branches: [main]
1111
paths:
1212
- .github/workflows/containers.yml
1313
- containers/**
@@ -21,6 +21,8 @@ jobs:
2121
- uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
2222
with:
2323
github_access_token: ${{ secrets.GITHUB_TOKEN }}
24+
extra_nix_config: |
25+
extra-experimental-features = pipe-operators
2426
2527
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
2628
if: github.event_name != 'pull_request'

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
- uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
2121
with:
2222
github_access_token: ${{ secrets.GITHUB_TOKEN }}
23+
extra_nix_config: |
24+
extra-experimental-features = pipe-operators
2325
2426
- uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
2527
with:

flux/crds.nix

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ let
2424
version = rel.spec.chart.spec.version;
2525
};
2626

27+
agones = kubelib.buildHelmChart {
28+
name = "agones";
29+
chart = downloadFluxHelmChart {
30+
namespace = "agones-system";
31+
chartHash = "sha256-8eaRT40afNFNi/YMIq14A8xODDiI2L+ZUbqpbSA8/kM=";
32+
};
33+
includeCRDs = true;
34+
};
35+
2736
cert-manager = fetchurl {
2837
url = "https://github.com/cert-manager/cert-manager/releases/download/v1.20.2/cert-manager.crds.yaml";
2938
hash = "sha256-bam+tTJGlQN94x/qmYCZwURvbOToCfMrE6dolPTxafA=";
@@ -41,18 +50,18 @@ let
4150
};
4251
};
4352

44-
agones = kubelib.buildHelmChart {
45-
name = "agones";
53+
cloudnative-pg = kubelib.buildHelmChart {
54+
name = "cloudnative-pg";
4655
chart = downloadFluxHelmChart {
47-
namespace = "agones-system";
48-
chartHash = "sha256-8eaRT40afNFNi/YMIq14A8xODDiI2L+ZUbqpbSA8/kM=";
56+
namespace = "cnpg-system";
57+
chartHash = "sha256-IE5HEzMotxW00cdnmgJgDedNS42iBiuiwYRo9pe/10w=";
4958
};
5059
includeCRDs = true;
5160
};
5261

5362
sliceCRDs =
5463
name: src:
55-
runCommand "${name}-cds" { } ''
64+
runCommand "${name}-crds" { } ''
5665
mkdir -p $out/crds
5766
${kubectl-slice}/bin/kubectl-slice \
5867
--input-file ${src} \
@@ -74,6 +83,6 @@ symlinkJoin {
7483
(sliceCRDs "agones" agones)
7584
(copyFile "cert-manager" cert-manager)
7685
(sliceCRDs "cert-manager-helm" cert-manager-helm)
77-
(sliceCRDs "cloudflare-operator" cloudflare-operator)
86+
(sliceCRDs "cloudnative-pg" cloudnative-pg)
7887
];
7988
}

flux/src.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@ fs.toSource {
66
root = ./.;
77

88
# Everything except nix files
9-
fileset = fs.unions [
10-
(fs.gitTracked ./.)
11-
./infrastructure
12-
];
9+
fileset = fs.intersection (fs.gitTracked ./.) ./infrastructure;
1310
}

0 commit comments

Comments
 (0)