Skip to content

Commit 913a525

Browse files
committed
Merge branch 'main' into kubernetes-1.34
2 parents 47ca845 + 8c20cec commit 913a525

27 files changed

Lines changed: 349 additions & 122 deletions
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: outscale/actions-extensions-model-pack
2+
version: 0.0.0
3+
library: true
4+
extensionTargets:
5+
codeql/actions-all: '*'
6+
dataExtensions:
7+
- models/**/*.yml
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/actions-all
4+
extensible: trustedActionsOwnerDataModel
5+
data:
6+
- ["outscale"]

.github/local_action/start_ccm_e2e/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
using: "composite"
3333
steps:
3434
- name: ⬇️ Checkout CAPOSC
35-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
35+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3636
with:
3737
repository: 'outscale/cluster-api-provider-outscale'
3838
path: "cluster-api-provider-outscale"

.github/workflows/build.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
- "deploy/**"
1818
- "!tests/**"
1919
workflow_dispatch:
20-
20+
2121
permissions:
2222
contents: read
2323

@@ -26,15 +26,11 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: ⬇️ Checkout repository
29-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
29+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3030
- name: 🔎 Docker Lint
3131
run: bash -c "make dockerlint"
3232
- name: 🔎 golangci-lint
33-
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9
34-
with:
35-
version: v2.7.1
36-
args: --timeout=300s
37-
only-new-issues: true
33+
uses: outscale/goutils/.github/actions/lint@main
3834
- name: 🔎 Reuse check
3935
run: make lint-reuse
4036
shell: bash
@@ -46,11 +42,3 @@ jobs:
4642
run: bash -c "make check-helm-docs"
4743
- name: 🔎 Check manifest
4844
run: bash -c "make check-helm-manifest"
49-
- name: 🔎 Trivy-Scan
50-
id: trivyscan
51-
run: make trivy-scan
52-
# - name: Upload Trivy results
53-
# if: ${{ github.event_name != 'pull_request' }}
54-
# uses: github/codeql-action/upload-sarif@v4
55-
# with:
56-
# sarif_file: './.trivyscan/report.sarif'

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828

2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3232

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4
34+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
3535
with:
3636
languages: ${{ matrix.language }}
3737
queries: +security-and-quality
3838

3939
- name: Autobuild
40-
uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4
40+
uses: github/codeql-action/autobuild@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
4141

4242
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4
43+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
4444
with:
4545
category: "/language:${{ matrix.language }}"

.github/workflows/cred-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
cred-scan:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
16+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1717
- name: Scan credentials
1818
uses: outscale/cred-scan@main
1919
with:

.github/workflows/e2e_test.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ on:
1717
- ".github/workflows/e2e_test.yml"
1818
- ".github/local_action/start_ccm_e2e/action.yml"
1919
workflow_dispatch:
20-
20+
2121
permissions:
2222
contents: read
23-
23+
2424
jobs:
2525
create_cluster:
2626
runs-on: [self-hosted, linux]
2727
steps:
2828
- name: ⬇️ Checkout
29-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
29+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3030
- name: ⬇️ Install kubectl
31-
uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4
31+
uses: azure/setup-kubectl@829323503d1be3d00ca8346e5391ca0b07a9ab0d # v5
3232
with:
3333
version: v1.34.2
3434
- name: ⬇️ Install Helm
35-
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
35+
uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5
3636
- name: ⬇️ Install Python
37-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6
37+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
3838
- name: ⬇️ Install Go
39-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
39+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
4040
with:
4141
go-version-file: 'go.mod'
4242
- name: 🔐 Set AK/SK name based on runner region
@@ -47,7 +47,8 @@ jobs:
4747
access_key: ${{ secrets[env.OSC_ACCESS_KEY_NAME] }}
4848
secret_key: ${{ secrets[env.OSC_SECRET_KEY_NAME] }}
4949
region: ${{ env.OSC_REGION }}
50-
- name: 📦 Build and push Docker image
50+
exclude_resource_types: access_key
51+
- name: 📦 Build and push Docker image
5152
run: |
5253
docker login ${{ vars.REGISTRY }} -u admin -p ${{ secrets.HARBOR_ADMIN_PASSWORD }}
5354
make buildx-image image-tag image-push

.github/workflows/github-sanity-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
github-sanity-scan:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
16+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1717
- name: Github sanity scanner
1818
uses: outscale/github-sanity-scan@main
1919
with:

.github/workflows/publish-helm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
steps:
1515
- name: Check the repo
16-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1717
with:
1818
fetch-depth: 0
19-
- uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
19+
- uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5
2020
with:
2121
version: v3.18.3
2222
- name: Docker login

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
steps:
1515
- name: Check the repo
16-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1717
- name: Docker login
1818
run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
1919
env:

0 commit comments

Comments
 (0)