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 a311d2d commit db3ec15
Show file tree
Hide file tree
Showing 16 changed files with 523 additions and 53 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-lead-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-lead-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
10 changes: 5 additions & 5 deletions chart/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: aws-ebs-csi-driver
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
version: 2.27.0
version: 2.33.0
- name: aws-efs-csi-driver
repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
version: 2.5.5
version: 3.0.8
- name: aws-load-balancer-controller
repository: https://aws.github.io/eks-charts
version: 1.7.1
digest: sha256:d570d434004ba9f774b6b657bbccf548e1148582a7135377d1400ddf40beb409
generated: "2024-02-17T17:04:56.971697+08:00"
version: 1.8.2
digest: sha256:2d2dabbe934e42517796a7076e78bcf01ebd3040de135c8ede5a7c8ad9c61353
generated: "2024-08-11T11:48:13.95673+08:00"
6 changes: 3 additions & 3 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ appVersion: "0.1.0"
dependencies:
- name: aws-ebs-csi-driver
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
version: 2.27.0
version: 2.33.0
condition: aws-ebs-csi-driver.enabled
- name: aws-efs-csi-driver
repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
version: 2.5.5
version: 3.0.8
condition: aws-efs-csi-driver.enabled
- name: aws-load-balancer-controller
repository: https://aws.github.io/eks-charts
version: 1.7.1
version: 1.8.2
condition: aws-load-balancer-controller.enabled
8 changes: 4 additions & 4 deletions chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Helm chart to deploy EKS Bootstrap components includingg CSI (EBS and EFS) and L

| Repository | Name | Version |
|------------|------|---------|
| https://aws.github.io/eks-charts | aws-load-balancer-controller | 1.7.1 |
| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.27.0 |
| https://kubernetes-sigs.github.io/aws-efs-csi-driver | aws-efs-csi-driver | 2.5.5 |
| https://aws.github.io/eks-charts | aws-load-balancer-controller | 1.8.2 |
| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.33.0 |
| https://kubernetes-sigs.github.io/aws-efs-csi-driver | aws-efs-csi-driver | 3.0.8 |

## Values

Expand All @@ -31,4 +31,4 @@ Helm chart to deploy EKS Bootstrap components includingg CSI (EBS and EFS) and L
| zoneSpread.zones | object | `{"zone1":{"enabled":false,"replicas":1,"zone":"ap-southeast-1a"}}` | topology zones to deploy zone-spread pod to force node provisioning across zones |

----------------------------------------------
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/aws-ebs-csi-driver-2.27.0.tgz
Binary file not shown.
Binary file added chart/charts/aws-ebs-csi-driver-2.33.0.tgz
Binary file not shown.
Binary file removed chart/charts/aws-efs-csi-driver-2.5.5.tgz
Binary file not shown.
Binary file added chart/charts/aws-efs-csi-driver-3.0.8.tgz
Binary file not shown.
Binary file removed chart/charts/aws-load-balancer-controller-1.7.1.tgz
Binary file not shown.
Binary file not shown.
80 changes: 80 additions & 0 deletions chart/values.entei.amber.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
serviceTree:
landscape: &landscape entei
cluster: &cluster amber
tags: &tags
atomi.cloud/landscape: *landscape
atomi.cloud/cluster: *cluster
clusterName: &clusterName entei-amber
role: &role ""
aws-ebs-csi-driver:
enabled: true
customLabels:
!!merge <<: *tags
storageClasses:
- name: ebs-gp3
annotations:
storageclass.kubernetes.io/is-default-class: "true"
labels:
!!merge <<: *tags
tr8.io/layer: "1"
volumeBindingMode: WaitForFirstConsumer
reclaimPolicy: Retain
parameters:
type: gp3
encrypted: "true"
controller:
replicaCount: 2
podLabels:
!!merge <<: *tags
podAnnotations:
!!merge <<: *tags
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: *role
extraVolumeTags:
!!merge <<: *tags
aws-efs-csi-driver:
enabled: false
storageClasses:
- name: efs
labels:
!!merge <<: *tags
tr8.io/layer: "1"
volumeBindingMode: WaitForFirstConsumer
reclaimPolicy: Retain
parameters: {}
replicaCount: 2
controller:
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: *role
create: true
podAnnotations:
!!merge <<: *tags
aws-load-balancer-controller:
enabled: true
clusterName: *clusterName
replicaCount: 2
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: *role
additionalLabels:
!!merge <<: *tags
podLabels:
!!merge <<: *tags
podAnnotations:
!!merge <<: *tags
zoneSpread:
zones:
zone1:
zone: ap-southeast-1a
enabled: true
replicas: 1
zone2:
zone: ap-southeast-1b
enabled: true
replicas: 1
zone3:
zone: ap-southeast-1c
enabled: true
replicas: 1
80 changes: 80 additions & 0 deletions chart/values.entei.topaz.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
serviceTree:
landscape: &landscape entei
cluster: &cluster topaz
tags: &tags
atomi.cloud/landscape: *landscape
atomi.cloud/cluster: *cluster
clusterName: &clusterName entei-topaz
role: &role "arn:aws:iam::021891601985:role/entei-topaz-irsa"
aws-ebs-csi-driver:
enabled: true
customLabels:
!!merge <<: *tags
storageClasses:
- name: ebs-gp3
annotations:
storageclass.kubernetes.io/is-default-class: "true"
labels:
!!merge <<: *tags
tr8.io/layer: "1"
volumeBindingMode: WaitForFirstConsumer
reclaimPolicy: Retain
parameters:
type: gp3
encrypted: "true"
controller:
replicaCount: 2
podLabels:
!!merge <<: *tags
podAnnotations:
!!merge <<: *tags
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: *role
extraVolumeTags:
!!merge <<: *tags
aws-efs-csi-driver:
enabled: false
storageClasses:
- name: efs
labels:
!!merge <<: *tags
tr8.io/layer: "1"
volumeBindingMode: WaitForFirstConsumer
reclaimPolicy: Retain
parameters: {}
replicaCount: 2
controller:
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: *role
create: true
podAnnotations:
!!merge <<: *tags
aws-load-balancer-controller:
enabled: true
clusterName: *clusterName
replicaCount: 2
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: *role
additionalLabels:
!!merge <<: *tags
podLabels:
!!merge <<: *tags
podAnnotations:
!!merge <<: *tags
zoneSpread:
zones:
zone1:
zone: ap-southeast-1a
enabled: true
replicas: 1
zone2:
zone: ap-southeast-1b
enabled: true
replicas: 1
zone3:
zone: ap-southeast-1c
enabled: true
replicas: 1
Loading

0 comments on commit db3ec15

Please sign in to comment.