Skip to content

Commit

Permalink
upstream: upgrade nix, helm upstream, GHA
Browse files Browse the repository at this point in the history
  • Loading branch information
kirinnee committed Aug 11, 2024
1 parent 1177835 commit f730463
Show file tree
Hide file tree
Showing 9 changed files with 372 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nix_direnv_watch_file "./nix/env.nix" "./nix/fmt.nix" "./nix/packages.nix" "./nix/shells.nix" "./nix/pre-commit.nix" "./flake.nix" "./parse.nix"
watch_file "./nix/env.nix" "./nix/fmt.nix" "./nix/packages.nix" "./nix/shells.nix" "./nix/pre-commit.nix" "./flake.nix" "./parse.nix"
use flake
22 changes: 13 additions & 9 deletions .github/workflows/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
jobs:
precommit:
name: Pre-commit Check
runs-on: ubuntu-22.04
runs-on:
- nscloud-ubuntu-22.04-amd64-4x8-with-cache
- nscloud-cache-size-50gb
- nscloud-cache-tag-sulfoxide-iron-nix-store-cache
- nscloud-git-mirror-1gb
steps:
- uses: actions/checkout@v3
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- uses: AtomiCloud/[email protected]
- name: Run pre-commit
run: nix develop .#ci -c ./scripts/ci/pre-commit.sh

Expand All @@ -19,12 +21,14 @@ jobs:
needs:
- precommit
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
runs-on:
- nscloud-ubuntu-22.04-amd64-4x8-with-cache
- nscloud-cache-size-50gb
- nscloud-cache-tag-sulfoxide-iron-releaser-nix-store-cache
- nscloud-git-mirror-1gb
steps:
- uses: actions/checkout@v3
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- uses: rlespinasse/[email protected]
- uses: AtomiCloud/[email protected]
- uses: AtomiCloud/[email protected]
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ version: 1.5.1
appVersion: "2.12.0"
dependencies:
- name: keda
version: 2.10.2
version: 2.15.0
repository: https://kedacore.github.io/charts
4 changes: 2 additions & 2 deletions chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Helm chart to deploy KEDA scaler as pod autoscaler

| Repository | Name | Version |
|------------|------|---------|
| https://kedacore.github.io/charts | keda | 2.10.2 |
| https://kedacore.github.io/charts | keda | 2.15.0 |

## Values

Expand All @@ -20,4 +20,4 @@ Helm chart to deploy KEDA scaler as pod autoscaler
| tags | object | `{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"iron"}` | Kubernetes labels and annotations, following Service Tree |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.11.1](https://github.com/norwoodj/helm-docs/releases/v1.11.1)
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
9 changes: 9 additions & 0 deletions chart/values.entei.amber.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
tags: &tags
atomi.cloud/landscape: entei
atomi.cloud/cluster: amber

keda:
additionalAnnotations:
<<: *tags
additionalLabels:
<<: *tags
9 changes: 9 additions & 0 deletions chart/values.entei.topaz.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
tags: &tags
atomi.cloud/landscape: entei
atomi.cloud/cluster: topaz

keda:
additionalAnnotations:
<<: *tags
additionalLabels:
<<: *tags
Loading

0 comments on commit f730463

Please sign in to comment.