Skip to content

Commit

Permalink
Merge branch 'main' into feature/daemonset-priority-class
Browse files Browse the repository at this point in the history
  • Loading branch information
No9 authored May 2, 2024
2 parents d160a50 + b8ea795 commit f1327fe
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 38 deletions.
57 changes: 19 additions & 38 deletions .github/workflows/validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,46 +10,27 @@ env:

jobs:
test:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- uses: actions-rs/cargo@v1
with:
command: test
args: -- --test-threads=1
- name: Update local toolchain
run: |
rustup update
rustup component add clippy
fmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
- name: Toolchain info
run: |
cargo --version --verbose
rustc --version
cargo clippy --version
- name: Lint
run: |
cargo fmt -- --check
cargo clippy -- -D warnings
- name: Test
run: |
cargo check
cargo test --all
clippy:
name: Clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: clippy
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: -- -D warnings
4 changes: 4 additions & 0 deletions charts/core-dump-handler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -327,3 +327,7 @@ Daemonset
* envFrom: Array of [EnvFromSource](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#envfromsource-v1-core) to inject into main container.
* sidecarContainers: Array of [Container](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#container-v1-core) to define as part of the pod.
* updateStrategy: [DaemonsetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#daemonsetupdatestrategy-v1-apps) is a struct used to control the update strategy for the DaemonSet.
Service account:
* useToken: automatically create a service account token secret
* tokenSecretName: name of the service account token secret to create if `serviceAccount.useToken` is `true` (Default: "core-dump-service-account-token")
9 changes: 9 additions & 0 deletions charts/core-dump-handler/templates/sa-token-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{{- if .Values.serviceAccount.useToken }}
apiVersion: v1
kind: Secret
metadata:
name: {{ default "core-dump-service-account-token" .Values.serviceAccount.tokenSecretName }}
annotations:
kubernetes.io/service-account.name: {{ include "core-dump-handler.serviceAccountName" . }}
type: kubernetes.io/service-account-token
{{- end }}
3 changes: 3 additions & 0 deletions charts/core-dump-handler/values.aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
daemonset:
includeCrioExe: true
vendor: rhel7 # EKS EC2 images have an old libc=2.26

serviceAccount:
useToken: true
2 changes: 2 additions & 0 deletions charts/core-dump-handler/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ serviceAccount:
name: "core-dump-admin"
# annotations:
# eks.amazonaws.com/role-arn: arn:aws:iam::123456789000:role/iam-role-name-here
useToken: false
tokenSecretName: core-dump-service-account-token

# OpenShift specific for SecurityContextConstraints
scc:
Expand Down

0 comments on commit f1327fe

Please sign in to comment.