Skip to content

Commit f1327fe

Browse files
authored
Merge branch 'main' into feature/daemonset-priority-class
2 parents d160a50 + b8ea795 commit f1327fe

File tree

5 files changed

+37
-38
lines changed

5 files changed

+37
-38
lines changed

.github/workflows/validate.yaml

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,46 +10,27 @@ env:
1010

1111
jobs:
1212
test:
13-
name: Test
1413
runs-on: ubuntu-latest
1514
steps:
1615
- uses: actions/checkout@v2
17-
- uses: actions-rs/toolchain@v1
18-
with:
19-
profile: minimal
20-
toolchain: stable
21-
override: true
22-
- uses: actions-rs/cargo@v1
23-
with:
24-
command: test
25-
args: -- --test-threads=1
16+
- name: Update local toolchain
17+
run: |
18+
rustup update
19+
rustup component add clippy
2620
27-
fmt:
28-
name: Rustfmt
29-
runs-on: ubuntu-latest
30-
steps:
31-
- uses: actions/checkout@v2
32-
- uses: actions-rs/toolchain@v1
33-
with:
34-
toolchain: stable
35-
override: true
36-
components: rustfmt
37-
- uses: actions-rs/cargo@v1
38-
with:
39-
command: fmt
40-
args: --all -- --check
21+
- name: Toolchain info
22+
run: |
23+
cargo --version --verbose
24+
rustc --version
25+
cargo clippy --version
26+
27+
- name: Lint
28+
run: |
29+
cargo fmt -- --check
30+
cargo clippy -- -D warnings
31+
32+
- name: Test
33+
run: |
34+
cargo check
35+
cargo test --all
4136
42-
clippy:
43-
name: Clippy
44-
runs-on: ubuntu-latest
45-
steps:
46-
- uses: actions/checkout@v2
47-
- uses: actions-rs/toolchain@v1
48-
with:
49-
toolchain: stable
50-
override: true
51-
components: clippy
52-
- uses: actions-rs/clippy-check@v1
53-
with:
54-
token: ${{ secrets.GITHUB_TOKEN }}
55-
args: -- -D warnings

charts/core-dump-handler/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,3 +327,7 @@ Daemonset
327327
* envFrom: Array of [EnvFromSource](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#envfromsource-v1-core) to inject into main container.
328328
* sidecarContainers: Array of [Container](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#container-v1-core) to define as part of the pod.
329329
* 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.
330+
331+
Service account:
332+
* useToken: automatically create a service account token secret
333+
* tokenSecretName: name of the service account token secret to create if `serviceAccount.useToken` is `true` (Default: "core-dump-service-account-token")
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{{- if .Values.serviceAccount.useToken }}
2+
apiVersion: v1
3+
kind: Secret
4+
metadata:
5+
name: {{ default "core-dump-service-account-token" .Values.serviceAccount.tokenSecretName }}
6+
annotations:
7+
kubernetes.io/service-account.name: {{ include "core-dump-handler.serviceAccountName" . }}
8+
type: kubernetes.io/service-account-token
9+
{{- end }}

charts/core-dump-handler/values.aws.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
daemonset:
33
includeCrioExe: true
44
vendor: rhel7 # EKS EC2 images have an old libc=2.26
5+
6+
serviceAccount:
7+
useToken: true

charts/core-dump-handler/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ serviceAccount:
6464
name: "core-dump-admin"
6565
# annotations:
6666
# eks.amazonaws.com/role-arn: arn:aws:iam::123456789000:role/iam-role-name-here
67+
useToken: false
68+
tokenSecretName: core-dump-service-account-token
6769

6870
# OpenShift specific for SecurityContextConstraints
6971
scc:

0 commit comments

Comments
 (0)