Skip to content

Commit 103089f

Browse files
dangrondahldangrondahl
committed
merge: resolve conflicts with main (dependency versions + TODO.md)
2 parents aaa321f + 1f6a8cd commit 103089f

61 files changed

Lines changed: 1531 additions & 669 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/binary_provenance.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
artifact: ${{fromJson(inputs.artifacts)}}
3636
steps:
3737
- name: Harden Runner
38-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
38+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
3939
with:
4040
egress-policy: audit
4141

@@ -47,7 +47,7 @@ jobs:
4747
path: ${{ github.workspace }}/${{inputs.dir}}
4848

4949
- name: setup-kosli-cli
50-
uses: kosli-dev/setup-cli-action@v3
50+
uses: kosli-dev/setup-cli-action@v4
5151
with:
5252
version:
5353
${{ vars.KOSLI_CLI_VERSION }}

‎.github/workflows/claude-pr-review.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
pull-requests: write
2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
30+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
3131
with:
3232
egress-policy: audit
3333

@@ -80,7 +80,7 @@ jobs:
8080
pull-requests: write
8181
steps:
8282
- name: Harden Runner
83-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
83+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
8484
with:
8585
egress-policy: audit
8686

‎.github/workflows/daily-cli-tests.yml‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
trail_name: ${{ steps.prep.outputs.trail_name }}
1313
steps:
1414
- name: Harden Runner
15-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
15+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
1616
with:
1717
egress-policy: audit
1818

@@ -54,6 +54,38 @@ jobs:
5454
kosli_querying_api_token: ${{ secrets.KOSLI_API_TOKEN_PROD }}
5555
sonarqube_token: ${{ secrets.KOSLI_SONARQUBE_TOKEN }}
5656

57+
contract-tests:
58+
name: Contract Tests
59+
runs-on: ubuntu-latest
60+
permissions:
61+
id-token: write
62+
contents: read
63+
steps:
64+
- name: Harden Runner
65+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
66+
with:
67+
egress-policy: audit
68+
69+
- uses: actions/checkout@v6
70+
71+
- uses: actions/setup-go@v6
72+
with:
73+
go-version-file: '.go-version'
74+
check-latest: true
75+
76+
- name: Configure AWS credentials
77+
uses: aws-actions/configure-aws-credentials@v6
78+
with:
79+
role-to-assume: arn:aws:iam::772819027869:role/cli
80+
aws-region: eu-central-1
81+
role-duration-seconds: 2400
82+
role-session-name: ${{ github.event.repository.name }}
83+
84+
- name: Run contract tests
85+
run: make test_contract
86+
env:
87+
KOSLI_GITHUB_TOKEN: ${{ secrets.KOSLI_GITHUB_TOKEN }}
88+
5789
slack-notification-on-failure:
5890
runs-on: ubuntu-24.04
5991
permissions:
@@ -63,11 +95,12 @@ jobs:
6395
[
6496
set-trail-name,
6597
test,
98+
contract-tests,
6699
]
67-
if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref == 'refs/heads/master' }}
100+
if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref == 'refs/heads/main' }}
68101
steps:
69102
- name: Harden Runner
70-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
103+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
71104
with:
72105
egress-policy: audit
73106

‎.github/workflows/docker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
matrix: ${{ steps.set-matrix.outputs.matrix }}
6464
steps:
6565
- name: Harden Runner
66-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
66+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
6767
with:
6868
egress-policy: audit
6969

@@ -120,7 +120,7 @@ jobs:
120120

121121
steps:
122122
- name: Harden Runner
123-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
123+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
124124
with:
125125
egress-policy: audit
126126

@@ -187,7 +187,7 @@ jobs:
187187

188188
steps:
189189
- name: Harden Runner
190-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
190+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
191191
with:
192192
egress-policy: audit
193193

@@ -219,7 +219,7 @@ jobs:
219219
password: ${{ secrets.GITHUB_TOKEN }}
220220

221221
- name: setup-kosli-cli
222-
uses: kosli-dev/setup-cli-action@v3
222+
uses: kosli-dev/setup-cli-action@v4
223223
with:
224224
version: ${{ vars.KOSLI_CLI_VERSION }}
225225

‎.github/workflows/helm-chart.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: helm chart
22

33
on:
4-
workflow_dispatch:
4+
workflow_dispatch: {}
55
push:
66
branches:
77
- main
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
20+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
2121
with:
2222
egress-policy: audit
2323

@@ -41,13 +41,15 @@ jobs:
4141
- name: Lint
4242
run: make helm-lint
4343

44+
- name: Setup Helm Docs
45+
uses: gabe565/setup-helm-docs-action@d5c35bdc9133cfbea3b671acadf50a29029e87c2 # v1.0.4
46+
with:
47+
version: 'latest' # v1.14.2
48+
4449
- name: Generate Helm Docs
4550
run: |
46-
curl -L https://github.com/norwoodj/helm-docs/releases/download/v1.5.0/helm-docs_1.5.0_linux_amd64.deb --output helm-docs.dep
47-
sudo dpkg -i helm-docs.dep
48-
rm helm-docs.dep
49-
cd charts/k8s-reporter
50-
helm-docs --template-files README.md.gotmpl,_templates.gotmpl --output-file README.md
51+
cd charts/k8s-reporter
52+
helm-docs --template-files README.md.gotmpl,_templates.gotmpl --output-file README.md
5153
helm-docs --template-files README.md.gotmpl,_templates.gotmpl --output-file ../../docs.kosli.com/content/helm/_index.md
5254
5355
- name: Helm Package
@@ -72,11 +74,11 @@ jobs:
7274
- name: Upload new chart and the update index.yaml to S3
7375
run: |
7476
rm package/old-index.yaml
75-
aws s3 cp --recursive package s3://kosli-helm-charts-repo/stable/k8s-reporter/
77+
aws s3 cp --recursive package s3://kosli-helm-charts-repo/stable/k8s-reporter/
7678
7779
- name: cleanup
7880
run: |
79-
rm -rf package
81+
rm -rf package
8082
8183
- name: Create branch via GitHub API
8284
run: |

‎.github/workflows/init_kosli.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
steps:
4141

4242
- name: Harden Runner
43-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
43+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
4444
with:
4545
egress-policy: audit
4646

@@ -50,7 +50,7 @@ jobs:
5050
ref: ${{ inputs.checkout_ref || github.sha }}
5151

5252
- name: setup-kosli-cli
53-
uses: kosli-dev/setup-cli-action@v3
53+
uses: kosli-dev/setup-cli-action@v4
5454
with:
5555
version:
5656
${{ vars.KOSLI_CLI_VERSION }}

‎.github/workflows/install-script-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Harden Runner
36-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
36+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
3737
with:
3838
egress-policy: audit
3939

@@ -52,7 +52,7 @@ jobs:
5252

5353
steps:
5454
- name: Harden Runner
55-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
55+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
5656
with:
5757
egress-policy: audit
5858

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
report_to_kosli: ${{ steps.prep.outputs.report_to_kosli }}
2323
steps:
2424
- name: Harden Runner
25-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
25+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
2626
with:
2727
egress-policy: audit
2828

@@ -133,10 +133,10 @@ jobs:
133133
test,
134134
docker
135135
]
136-
if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref == 'refs/heads/master' }}
136+
if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref == 'refs/heads/main' }}
137137
steps:
138138
- name: Harden Runner
139-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
139+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
140140
with:
141141
egress-policy: audit
142142

‎.github/workflows/never_alone_trail.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242

4343
- name: Harden Runner
44-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
44+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
4545
with:
4646
egress-policy: audit
4747

@@ -50,7 +50,7 @@ jobs:
5050
fetch-depth: 0
5151

5252
- name: setup-kosli-cli
53-
uses: kosli-dev/setup-cli-action@v3
53+
uses: kosli-dev/setup-cli-action@v4
5454
with:
5555
version: ${{ vars.KOSLI_CLI_VERSION }}
5656

‎.github/workflows/publish_branch_docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Harden Runner
14-
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
14+
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
1515
with:
1616
egress-policy: audit
1717

0 commit comments

Comments
 (0)