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 d1af9de commit e1ed61d
Show file tree
Hide file tree
Showing 15 changed files with 369 additions and 108 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-argon-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/actions.setup-nix@v1.2.1
- 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-argon-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/github-slug-action@v3.x
- uses: AtomiCloud/actions.setup-nix@v1.2.1
- uses: AtomiCloud/actions.cache-npm@v1.0.1
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 6 additions & 0 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ includes:
vars:
LANDSCAPE: pichu
CLUSTER: opal
entei:topaz:
taskfile: tasks/Taskfile.cluster.yaml
vars:
LANDSCAPE: entei
CLUSTER: topaz


tasks:
# Utility
Expand Down
8 changes: 4 additions & 4 deletions chart/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: kyverno
repository: https://kyverno.github.io/kyverno/
version: 3.1.0
version: 3.2.6
- name: policy-reporter
repository: https://kyverno.github.io/policy-reporter
version: 2.21.2
digest: sha256:cd9ac44730769827c89add6647b0b4c1e4feec273db0e0efe0a153723367c068
generated: "2024-02-06T22:16:34.643855+08:00"
version: 2.24.1
digest: sha256:2dded07f46dfc4adfc06b4de493d7a58fa840ef2f0018aa5e8d0bce55fc7cfb8
generated: "2024-08-11T08:25:40.16759+08:00"
6 changes: 3 additions & 3 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: sulfoxide-argon
description: Helm chart to deploy AtomiCloud's Cluster policy engine, Kyverno
type: application
version: 1.9.0
appVersion: "3.1.0"
appVersion: "3.2.6"
dependencies:
- name: kyverno
version: 3.1.0
version: 3.2.6
repository: https://kyverno.github.io/kyverno/
- name: policy-reporter
version: 2.21.2
version: 2.24.1
repository: https://kyverno.github.io/policy-reporter
8 changes: 4 additions & 4 deletions chart/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# sulfoxide-argon

![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.6](https://img.shields.io/badge/AppVersion-3.2.6-informational?style=flat-square)

Helm chart to deploy AtomiCloud's Cluster policy engine, Kyverno

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| https://kyverno.github.io/kyverno/ | kyverno | 3.1.0 |
| https://kyverno.github.io/policy-reporter | policy-reporter | 2.21.2 |
| https://kyverno.github.io/kyverno/ | kyverno | 3.2.6 |
| https://kyverno.github.io/policy-reporter | policy-reporter | 2.24.1 |

## Values

Expand All @@ -21,4 +21,4 @@ Helm chart to deploy AtomiCloud's Cluster policy engine, Kyverno
| tags | object | `{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"argon"}` | 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)
Binary file removed chart/charts/kyverno-3.1.0.tgz
Binary file not shown.
Binary file added chart/charts/kyverno-3.2.6.tgz
Binary file not shown.
Binary file removed chart/charts/policy-reporter-2.21.2.tgz
Binary file not shown.
Binary file added chart/charts/policy-reporter-2.24.1.tgz
Binary file not shown.
55 changes: 0 additions & 55 deletions chart/values.entei.ruby.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
serviceTree:
landscape: &landscape entei
cluster: &cluster opal
cluster: &cluster topaz

tags: &tags
atomi.cloud/landscape: *landscape
Expand Down
Loading

0 comments on commit e1ed61d

Please sign in to comment.