Skip to content

Commit 76f6272

Browse files
committed
Merge branch 'main' into kubernetes-1.33
2 parents 9d0b0a5 + eecb687 commit 76f6272

86 files changed

Lines changed: 2748 additions & 3036 deletions

Some content is hidden

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

.github/dependabot.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/local_action/start_ccm_e2e/action.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ inputs:
1919
oks_region:
2020
description: 'Region'
2121
required: true
22-
public_cloud:
23-
description: 'Create cluster in public cloud'
24-
required: false
25-
default: "false"
2622
image_name:
2723
description: 'OMI name'
2824
required: true
@@ -36,7 +32,7 @@ runs:
3632
using: "composite"
3733
steps:
3834
- name: ⬇️ Checkout CAPOSC
39-
uses: actions/checkout@v5
35+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
4036
with:
4137
repository: 'outscale/cluster-api-provider-outscale'
4238
path: "cluster-api-provider-outscale"
@@ -61,7 +57,7 @@ runs:
6157
-n kube-system
6258
echo "installing CCM"
6359
helm install --wait k8s-osc-ccm deploy/k8s-osc-ccm --set oscSecretName=osc-secret --set image.repository=${{ inputs.registry }}/outscale/cloud-provider-osc --set oscSecretFormat=v1 --set image.tag=${{ inputs.version }} \
64-
--set extraLoadBalancerTags.clikey=clivalue
60+
--set extraLoadBalancerTags.clikey=clivalue --set "extraNodeLabels.clilabel=\{\{ .SubRegion \}\}"
6561
echo "waiting for worker nodes"
6662
kubectl wait --for=condition=Ready nodes --all --timeout=900s
6763
kubectl get nodes -o wide
@@ -97,7 +93,7 @@ runs:
9793
kubectl create secret generic osc-secret-file --from-literal=config.json=$profile -n kube-system
9894
echo "updating CCM config"
9995
helm upgrade --wait k8s-osc-ccm deploy/k8s-osc-ccm --set oscSecretName=osc-secret-file --set oscCredentialsFromFile=true --set image.repository=${{ inputs.registry }}/outscale/cloud-provider-osc --set image.tag=${{ inputs.version }}\
100-
--set extraLoadBalancerTags.clikey=clivalue
96+
--set extraLoadBalancerTags.clikey=clivalue --set "extraNodeLabels.clilabel=\{\{ .SubRegion \}\}"
10197
sleep 5
10298
kubectl get pod -n kube-system -l "app=osc-cloud-controller-manager"
10399
shell: bash

.github/renovate.json5

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>outscale/oks-tools-team//renovate/default.json5#initial"
5+
],
6+
"packageRules": [
7+
{
8+
"matchManagers": [
9+
"gomod"
10+
],
11+
"matchPackageNames": [
12+
"k8s.io/**",
13+
"sigs.k8s.io/**"
14+
],
15+
"enabled": false
16+
}
17+
]
18+
}

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: ⬇️ Checkout repository
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3030
- name: 🔎 Docker Lint
3131
run: bash -c "make dockerlint"
3232
- name: 🔎 golangci-lint
33-
uses: golangci/golangci-lint-action@v9
33+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9
3434
with:
3535
version: v2.7.1
3636
args: --timeout=300s

.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@v5
31+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3232

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

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

4242
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@v4
43+
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # 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@v5
16+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1717
- name: Scan credentials
1818
uses: outscale/cred-scan@main
1919
with:

.github/workflows/e2e_test.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626
runs-on: [self-hosted, linux]
2727
steps:
2828
- name: ⬇️ Checkout
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3030
- name: ⬇️ Install kubectl
31-
uses: azure/setup-kubectl@v4
31+
uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4
3232
with:
3333
version: v1.34.2
3434
- name: ⬇️ Install Helm
35-
uses: azure/setup-helm@v4
35+
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
3636
- name: ⬇️ Install Python
37-
uses: actions/setup-python@v6
37+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6
3838
- name: ⬇️ Install Go
39-
uses: actions/setup-go@v6
39+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
4040
with:
4141
go-version-file: 'go.mod'
4242
- name: 🔐 Set AK/SK name based on runner region
@@ -67,14 +67,3 @@ jobs:
6767
image_name: "ubuntu-2204-kubernetes-v1.33.6-2025-11-17"
6868
version: ${{ format('{0}.{1}', github.sha, github.run_attempt) }}
6969
registry: ${{ vars.REGISTRY }}
70-
## Create Public Cloud Cluster
71-
# - name: 🧪 Test on Public cluster
72-
# uses: ./.github/local_action/start_ccm_e2e
73-
# with:
74-
# osc_access_key: ${{ secrets[env.OSC_ACCESS_KEY_NAME] }}
75-
# osc_secret_key: ${{ secrets[env.OSC_SECRET_KEY_NAME] }}
76-
# osc_region: ${{ env.OSC_REGION }}
77-
# public_cloud: "true"
78-
# image_id: ${{ secrets.OMI_ID }}
79-
# version: ${{ format('{0}.{1}', github.sha, github.run_attempt) }}
80-
# registry: ${{ vars.REGISTRY }}

.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@v5
16+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 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@v5
16+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1717
with:
1818
fetch-depth: 0
19-
- uses: azure/setup-helm@v4
19+
- uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
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@v5
16+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1717
- name: Docker login
1818
run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
1919
env:

0 commit comments

Comments
 (0)