Skip to content

Commit 69ccaf1

Browse files
davidgamerodavidgamero
authored
Merge branch 'main' into dependabot/go_modules/sigs.k8s.io/kustomize/api-0.21.0
2 parents 956b0e8 + 0535aa0 commit 69ccaf1

File tree

12 files changed

+57
-73
lines changed

12 files changed

+57
-73
lines changed

‎.github/workflows/integration-json.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
go-version: '1.24'
2020
- name: make
2121
run: make
22-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
22+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2323
with:
2424
name: helm-skaffold
2525
path: ./test/skaffold.yaml
2626
if-no-files-found: error
27-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
27+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2828
with:
2929
name: draft-binary
3030
path: ./draft
@@ -35,7 +35,7 @@ jobs:
3535
needs: build
3636
steps:
3737
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
38-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
38+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
3939
with:
4040
name: draft-binary
4141
- run: chmod +x ./draft

‎.github/workflows/integration-per-language.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
18+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
1919
with:
2020
name: draft-binary
2121
- run: chmod +x ./draft
@@ -70,7 +70,7 @@ jobs:
7070
ingress_test_args: "-a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1"
7171
steps:
7272
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
73-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
73+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
7474
with:
7575
name: draft-binary
7676
- run: chmod +x ./draft
@@ -199,7 +199,7 @@ jobs:
199199
runs-on: ubuntu-latest
200200
steps:
201201
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
202-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
202+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
203203
with:
204204
name: draft-binary
205205
- run: chmod +x ./draft
@@ -254,7 +254,7 @@ jobs:
254254
ingress_test_args: "-a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1"
255255
steps:
256256
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
257-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
257+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
258258
with:
259259
name: draft-binary
260260
- run: chmod +x ./draft
@@ -377,7 +377,7 @@ jobs:
377377
runs-on: ubuntu-latest
378378
steps:
379379
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
380-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
380+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
381381
with:
382382
name: draft-binary
383383
- run: chmod +x ./draft
@@ -432,7 +432,7 @@ jobs:
432432
ingress_test_args: "-a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1"
433433
steps:
434434
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
435-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
435+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
436436
with:
437437
name: draft-binary
438438
- run: chmod +x ./draft
@@ -529,7 +529,7 @@ jobs:
529529
run: |
530530
find ./langtest/.github/workflows -type f \( -iname \*.yaml -o -iname \*.yml \) \
531531
| xargs -I {} action-validator --verbose {}
532-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
532+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
533533
with:
534534
name: ${{inputs.language}}-manifests-create
535535
path: |
@@ -550,11 +550,11 @@ jobs:
550550
- 5000:5000
551551
steps:
552552
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
553-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
553+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
554554
with:
555555
name: draft-binary
556556
- run: chmod +x ./draft
557-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
557+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
558558
with:
559559
name: ${{inputs.language}}-manifests-create
560560
path: ./langtest/
@@ -592,7 +592,7 @@ jobs:
592592
runs-on: windows-latest
593593
steps:
594594
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
595-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
595+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
596596
with:
597597
name: draft-binary-win
598598
- run: mkdir ./langtest
@@ -607,13 +607,13 @@ jobs:
607607
- run: Remove-Item ./langtest/Dockerfile -ErrorAction Ignore
608608
- run: Remove-Item ./langtest/.dockerignore -ErrorAction Ignore
609609
- run: ./draft.exe -v create -c ./test/integration/${{inputs.language}}/helm.yaml -d ./langtest/
610-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
610+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
611611
with:
612612
name: check_windows_helm
613613
path: ./langtest/
614614
- run: ./check_windows_helm.ps1
615615
working-directory: ./langtest/
616-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
616+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
617617
with:
618618
name: ${{inputs.language}}-win-helm-create
619619
path: |
@@ -624,16 +624,16 @@ jobs:
624624
runs-on: windows-latest
625625
steps:
626626
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
627-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
627+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
628628
with:
629629
name: draft-binary-win
630-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
630+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
631631
with:
632632
name: ${{inputs.language}}-win-helm-create
633633
path: ./langtest/
634634
- run: Remove-Item ./langtest/charts/templates/ingress.yaml -Recurse -Force -ErrorAction Ignore
635635
- run: ./draft.exe -v update -d ./langtest/ -a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1
636-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
636+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
637637
with:
638638
name: check_windows_addon_helm
639639
path: ./langtest/
@@ -643,7 +643,7 @@ jobs:
643643
runs-on: windows-latest
644644
steps:
645645
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
646-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
646+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
647647
with:
648648
name: draft-binary-win
649649
- run: mkdir ./langtest
@@ -658,13 +658,13 @@ jobs:
658658
- run: Remove-Item ./langtest/Dockerfile -ErrorAction Ignore
659659
- run: Remove-Item ./langtest/.dockerignore -ErrorAction Ignore
660660
- run: ./draft.exe -v create -c ./test/integration/${{ inputs.language }}/kustomize.yaml -d ./langtest/
661-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
661+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
662662
with:
663663
name: check_windows_kustomize
664664
path: ./langtest/
665665
- run: ./check_windows_kustomize.ps1
666666
working-directory: ./langtest/
667-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
667+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
668668
with:
669669
name: ${{ inputs.language }}-win-kustomize-create
670670
path: |
@@ -674,16 +674,16 @@ jobs:
674674
needs: win-kustomize-create
675675
runs-on: windows-latest
676676
steps:
677-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
677+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
678678
with:
679679
name: draft-binary-win
680-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
680+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
681681
with:
682682
name: ${{inputs.language}}-win-kustomize-create
683683
path: ./langtest
684684
- run: Remove-Item ./langtest/overlays/production/ingress.yaml -ErrorAction Ignore
685685
- run: ./draft.exe -v update -d ./langtest/ -a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1
686-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
686+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
687687
with:
688688
name: check_windows_addon_kustomize
689689
path: ./langtest/

‎.github/workflows/integration-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
go-version: '1.24'
1717
- name: make
1818
run: make
19-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
19+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2020
with:
2121
name: helm-skaffold
2222
path: ./test/skaffold.yaml
2323
if-no-files-found: error
24-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
24+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2525
with:
2626
name: draft-binary
2727
path: ./draft
@@ -37,27 +37,27 @@ jobs:
3737
go-version: '1.24'
3838
- name: make
3939
run: make
40-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
40+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4141
with:
4242
name: draft-binary-win
4343
path: ./draft.exe
4444
if-no-files-found: error
45-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
45+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4646
with:
4747
name: check_windows_helm
4848
path: ./test/check_windows_helm.ps1
4949
if-no-files-found: error
50-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
50+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5151
with:
5252
name: check_windows_addon_helm
5353
path: ./test/check_windows_addon_helm.ps1
5454
if-no-files-found: error
55-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
55+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5656
with:
5757
name: check_windows_kustomize
5858
path: ./test/check_windows_kustomize.ps1
5959
if-no-files-found: error
60-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
60+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6161
with:
6262
name: check_windows_addon_kustomize
6363
path: ./test/check_windows_addon_kustomize.ps1

‎.github/workflows/poll-starter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ jobs:
7676
done
7777
7878
- name: Upload run information
79-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
79+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
8080
with:
8181
name: seen
8282
path: /tmp/seenWorkflows
8383

8484
- name: Create Pull Request
8585
if: ${{ steps.update-workflows.outputs.changes == 'true' }}
86-
uses: peter-evans/create-pull-request@v7
86+
uses: peter-evans/create-pull-request@v8
8787
with:
8888
commit-message: update starter workflows
8989
title: Automated Update Starter Workflows

‎pkg/fixtures/deployments/helm/charts/values.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,18 @@ securityContext:
9393
drop:
9494
- ALL
9595
add:
96-
- SETPCAP
97-
- MKNOD
9896
- AUDIT_WRITE
9997
- CHOWN
10098
- DAC_OVERRIDE
10199
- FOWNER
102100
- FSETID
103101
- KILL
102+
- MKNOD
103+
- NET_BIND_SERVICE
104+
- SETPCAP
104105
- SETGID
105106
- SETUID
106-
- NET_BIND_SERVICE
107107
- SYS_CHROOT
108-
- SETFCAP
109-
- SYS_PTRACE
110108

111109
envVars:
112110

‎pkg/fixtures/deployments/kustomize/base/deployment-override-workload-identity.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,18 @@ spec:
6363
drop:
6464
- ALL
6565
add:
66-
- SETPCAP
67-
- MKNOD
6866
- AUDIT_WRITE
6967
- CHOWN
7068
- DAC_OVERRIDE
7169
- FOWNER
7270
- FSETID
7371
- KILL
72+
- MKNOD
73+
- NET_BIND_SERVICE
74+
- SETPCAP
7475
- SETGID
7576
- SETUID
76-
- NET_BIND_SERVICE
7777
- SYS_CHROOT
78-
- SETFCAP
79-
- SYS_PTRACE
8078
affinity:
8179
podAntiAffinity:
8280
preferredDuringSchedulingIgnoredDuringExecution:

‎pkg/fixtures/deployments/kustomize/base/deployment.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,18 @@ spec:
6161
drop:
6262
- ALL
6363
add:
64-
- SETPCAP
65-
- MKNOD
6664
- AUDIT_WRITE
6765
- CHOWN
6866
- DAC_OVERRIDE
6967
- FOWNER
7068
- FSETID
7169
- KILL
70+
- MKNOD
71+
- NET_BIND_SERVICE
72+
- SETPCAP
7273
- SETGID
7374
- SETUID
74-
- NET_BIND_SERVICE
7575
- SYS_CHROOT
76-
- SETFCAP
77-
- SYS_PTRACE
7876
affinity:
7977
podAntiAffinity:
8078
preferredDuringSchedulingIgnoredDuringExecution:

‎pkg/fixtures/deployments/manifest/manifests/deployment-override-workload-identity.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,18 @@ spec:
6363
drop:
6464
- ALL
6565
add:
66-
- SETPCAP
67-
- MKNOD
6866
- AUDIT_WRITE
6967
- CHOWN
7068
- DAC_OVERRIDE
7169
- FOWNER
7270
- FSETID
7371
- KILL
72+
- MKNOD
73+
- NET_BIND_SERVICE
74+
- SETPCAP
7475
- SETGID
7576
- SETUID
76-
- NET_BIND_SERVICE
7777
- SYS_CHROOT
78-
- SETFCAP
79-
- SYS_PTRACE
8078
affinity:
8179
podAntiAffinity:
8280
preferredDuringSchedulingIgnoredDuringExecution:

‎pkg/fixtures/deployments/manifest/manifests/deployment.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,18 @@ spec:
6161
drop:
6262
- ALL
6363
add:
64-
- SETPCAP
65-
- MKNOD
6664
- AUDIT_WRITE
6765
- CHOWN
6866
- DAC_OVERRIDE
6967
- FOWNER
7068
- FSETID
7169
- KILL
70+
- MKNOD
71+
- NET_BIND_SERVICE
72+
- SETPCAP
7273
- SETGID
7374
- SETUID
74-
- NET_BIND_SERVICE
7575
- SYS_CHROOT
76-
- SETFCAP
77-
- SYS_PTRACE
7876
affinity:
7977
podAntiAffinity:
8078
preferredDuringSchedulingIgnoredDuringExecution:

‎template/deployments/helm/charts/values.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,18 @@ securityContext:
115115
drop:
116116
- ALL
117117
add:
118-
- SETPCAP
119-
- MKNOD
120118
- AUDIT_WRITE
121119
- CHOWN
122120
- DAC_OVERRIDE
123121
- FOWNER
124122
- FSETID
125123
- KILL
124+
- MKNOD
125+
- NET_BIND_SERVICE
126+
- SETPCAP
126127
- SETGID
127128
- SETUID
128-
- NET_BIND_SERVICE
129129
- SYS_CHROOT
130-
- SETFCAP
131-
- SYS_PTRACE
132130

133131
envVars:
134132
{{- range $key, $value := .Config.GetVariableValue "ENVVARS" }}

0 commit comments

Comments
 (0)