upstream: upgrade nix, helm upstream, GHA

AtomiCloud · Aug 11, 2024 · 6a13576 · 6a13576
1 parent e814b1f
commit 6a13576
Show file tree

Hide file tree

Showing 12 changed files with 491 additions and 49 deletions.
diff --git a/.envrc b/.envrc
@@ -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
diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml
@@ -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-sulfur-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
 
@@ -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-sulfur-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 }}

diff --git a/chart/Chart.lock b/chart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: cert-manager
   repository: https://charts.jetstack.io
-  version: v1.13.2
-digest: sha256:860d8ae85675519d4006829bbbaf3be6ff06912a563b5520aa87300d8aef293c
-generated: "2023-11-18T15:05:00.454659+08:00"
+  version: v1.15.2
+digest: sha256:62cc40cb6fa9c0a3c7af092ab5dcf386ab8f3f312ae4a07d6eb85281639987e0
+generated: "2024-08-11T14:37:35.239661+08:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -3,8 +3,8 @@ name: sulfoxide-sulfur
 description: Helm chart to deploy Cert Manager to issue TLS and other certificates in AtomiCloud's Infrastructure
 type: application
 version: 1.8.0
-appVersion: "1.9.1"
+appVersion: "1.15.2"
 dependencies:
   - name: cert-manager
-    version: v1.13.2
+    version: v1.15.2
     repository: https://charts.jetstack.io
diff --git a/chart/README.md b/chart/README.md
@@ -1,14 +1,14 @@
 # sulfoxide-sulfur
 
-![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.1](https://img.shields.io/badge/AppVersion-1.9.1-informational?style=flat-square)
+![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15.2](https://img.shields.io/badge/AppVersion-1.15.2-informational?style=flat-square)
 
 Helm chart to deploy Cert Manager to issue TLS and other certificates in AtomiCloud's Infrastructure
 
 ## Requirements
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.jetstack.io | cert-manager | v1.13.2 |
+| https://charts.jetstack.io | cert-manager | v1.15.2 |
 
 ## Values
 
@@ -19,4 +19,4 @@ Helm chart to deploy Cert Manager to issue TLS and other certificates in AtomiCl
 | tags | object | `{"atomi.cloud/layer":"1","atomi.cloud/platform":"sulfoxide","atomi.cloud/service":"sulfur"}` | 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)
diff --git a/chart/charts/cert-manager-v1.13.2.tgz b/chart/charts/cert-manager-v1.13.2.tgz
diff --git a/chart/charts/cert-manager-v1.15.2.tgz b/chart/charts/cert-manager-v1.15.2.tgz
diff --git a/chart/values.entei.amber.yaml b/chart/values.entei.amber.yaml
@@ -0,0 +1,66 @@
+serviceTree:
+  landscape: &landscape entei
+  cluster: &cluster amber
+
+tags: &tags
+  atomi.cloud/landscape: *landscape
+  atomi.cloud/cluster: *cluster
+cert-manager:
+  serviceAccount:
+    annotations:
+      <<: *tags
+    labels:
+      <<: *tags
+  startupapicheck:
+    jobAnnotations:
+      <<: *tags
+    podAnnotations:
+      <<: *tags
+    podLabels:
+      <<: *tags
+    resources:
+      limits:
+        cpu: 10m
+        memory: 256Mi
+      requests:
+        cpu: 5m
+        memory: 64Mi
+  resources:
+    limits:
+      cpu: 10m
+      memory: 256Mi
+    requests:
+      cpu: 5m
+      memory: 64Mi
+  podLabels:
+    <<: *tags
+  podAnnotations:
+    <<: *tags
+  cainjector:
+    resources:
+      limits:
+        cpu: 10m
+        memory: 256Mi
+      requests:
+        cpu: 5m
+        memory: 64Mi
+    podAnnotations:
+      <<: *tags
+    deploymentAnnotations:
+      <<: *tags
+    podLabels:
+      <<: *tags
+  webhook:
+    resources:
+      limits:
+        cpu: 10m
+        memory: 256Mi
+      requests:
+        cpu: 5m
+        memory: 64Mi
+    podLabels:
+      <<: *tags
+    deploymentAnnotations:
+      <<: *tags
+    podAnnotations:
+      <<: *tags
diff --git a/chart/values.entei.topaz.yaml b/chart/values.entei.topaz.yaml
@@ -0,0 +1,66 @@
+serviceTree:
+  landscape: &landscape entei
+  cluster: &cluster topaz
+
+tags: &tags
+  atomi.cloud/landscape: *landscape
+  atomi.cloud/cluster: *cluster
+cert-manager:
+  serviceAccount:
+    annotations:
+      <<: *tags
+    labels:
+      <<: *tags
+  startupapicheck:
+    jobAnnotations:
+      <<: *tags
+    podAnnotations:
+      <<: *tags
+    podLabels:
+      <<: *tags
+    resources:
+      limits:
+        cpu: 10m
+        memory: 256Mi
+      requests:
+        cpu: 5m
+        memory: 64Mi
+  resources:
+    limits:
+      cpu: 10m
+      memory: 256Mi
+    requests:
+      cpu: 5m
+      memory: 64Mi
+  podLabels:
+    <<: *tags
+  podAnnotations:
+    <<: *tags
+  cainjector:
+    resources:
+      limits:
+        cpu: 10m
+        memory: 256Mi
+      requests:
+        cpu: 5m
+        memory: 64Mi
+    podAnnotations:
+      <<: *tags
+    deploymentAnnotations:
+      <<: *tags
+    podLabels:
+      <<: *tags
+  webhook:
+    resources:
+      limits:
+        cpu: 10m
+        memory: 256Mi
+      requests:
+        cpu: 5m
+        memory: 64Mi
+    podLabels:
+      <<: *tags
+    deploymentAnnotations:
+      <<: *tags
+    podAnnotations:
+      <<: *tags