Skip to content

Commit 08de993

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#113 from openshift-cloud-team/rebase-bot-master
OCPCLOUD-2607: Merge https://github.com/kubernetes-sigs/cloud-provider-azure:master (e6f5e9a) into master
2 parents 0e95532 + 5e3e90b commit 08de993

File tree

1,886 files changed

+157600
-44241
lines changed

Some content is hidden

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

1,886 files changed

+157600
-44241
lines changed

‎.ci-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.21-openshift-4.16
4+
tag: rhel-9-release-golang-1.22-openshift-4.17

‎.github/workflows/dependency-review.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
20+
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
2121
with:
2222
egress-policy: audit
2323

2424
- name: 'Checkout Repository'
25-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
25+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3
27+
uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2

‎.github/workflows/lint-ci-weekly.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Harden Runner
17-
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
17+
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
1818
with:
1919
egress-policy: audit
2020
- name: Setup Golang
21-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
21+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
2222
with:
2323
go-version: '>=1.21'
2424
check-latest: true
2525
- name: Checkout
26-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
26+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2727
- name: golangci-lint
28-
uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
28+
uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
2929
with:
3030
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
3131
version: latest

‎.github/workflows/release-azclient-trace.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Release azclient trace
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- 'pkg/azclient/trace/*'
9+
permissions:
10+
contents: read
11+
jobs:
12+
build:
13+
runs-on: ubuntu-22.04
14+
permissions:
15+
contents: write
16+
steps:
17+
- name: Harden Runner
18+
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
19+
with:
20+
egress-policy: audit
21+
22+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
23+
with:
24+
fetch-depth: '0'
25+
- name: Bump version and push tag
26+
id: tag_version
27+
uses: mathieudutour/github-tag-action@a22cf08638b34d5badda920f9daf6e72c477b07b # v6.2
28+
with:
29+
tag_prefix: pkg/azclient/trace/v
30+
github_token: ${{ secrets.GITHUB_TOKEN }}
31+
fetch_all_tags: true

‎.github/workflows/release-azclient.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Release azclient
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- 'pkg/azclient/**'
9+
- '!pkg/azclient/configloader/**'
10+
- '!pkg/azclient/client-gen/**'
11+
- '!pkg/azclient/trace/**'
12+
permissions:
13+
contents: read
14+
jobs:
15+
build:
16+
runs-on: ubuntu-22.04
17+
permissions:
18+
contents: write
19+
steps:
20+
- name: Harden Runner
21+
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
22+
with:
23+
egress-policy: audit
24+
25+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
26+
with:
27+
fetch-depth: '0'
28+
- name: Bump version and push tag
29+
id: tag_version
30+
uses: mathieudutour/github-tag-action@a22cf08638b34d5badda920f9daf6e72c477b07b # v6.2
31+
with:
32+
tag_prefix: pkg/azclient/v
33+
github_token: ${{ secrets.GITHUB_TOKEN }}
34+
fetch_all_tags: true

‎.github/workflows/release-configloader.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Release azclient configloader
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- 'pkg/azclient/configloader/**'
9+
permissions:
10+
contents: read
11+
jobs:
12+
build:
13+
runs-on: ubuntu-22.04
14+
permissions:
15+
contents: write
16+
steps:
17+
- name: Harden Runner
18+
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
19+
with:
20+
egress-policy: audit
21+
22+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
23+
with:
24+
fetch-depth: '0'
25+
- name: Bump version and push tag
26+
id: tag_version
27+
uses: mathieudutour/github-tag-action@a22cf08638b34d5badda920f9daf6e72c477b07b # v6.2
28+
with:
29+
github_token: ${{ secrets.GITHUB_TOKEN }}
30+
tag_prefix: pkg/azclient/configloader/v
31+
fetch_all_tags: true

‎.github/workflows/scorecards.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ jobs:
3232

3333
steps:
3434
- name: Harden Runner
35-
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
35+
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
3636
with:
3737
egress-policy: audit
3838

3939
- name: "Checkout code"
40-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
40+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4141
with:
4242
persist-credentials: false
4343

4444
- name: "Run analysis"
45-
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
45+
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
4646
with:
4747
results_file: results.sarif
4848
results_format: sarif
@@ -64,14 +64,14 @@ jobs:
6464
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6565
# format to the repository Actions tab.
6666
- name: "Upload artifact"
67-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
67+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
6868
with:
6969
name: SARIF file
7070
path: results.sarif
7171
retention-days: 5
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
75+
uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
7676
with:
7777
sarif_file: results.sarif

‎.github/workflows/update-vendor-license.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737

3838
steps:
3939
- name: Harden Runner
40-
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
40+
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
4141
with:
4242
egress-policy: audit
4343

4444
- name: Checkout repository
45-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
45+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4646
- name: Set up Go 1.x
47-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
47+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4848
with:
4949
go-version: '>=1.20'
5050
check-latest: true
@@ -54,7 +54,7 @@ jobs:
5454
run: |
5555
make update
5656
- name: Create Pull Request
57-
uses: peter-evans/create-pull-request@v6
57+
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
5858
with:
5959
branch: doc/update-vendorlicense-${{github.ref_name}}
6060
delete-branch: true
@@ -69,7 +69,7 @@ jobs:
6969
/kind testing
7070
7171
#### What this PR does / why we need it:
72-
New release published.
72+
go.sum is out of sync
7373
7474
#### Does this PR introduce a user-facing change?
7575
```release-note

‎.pipelines/ccm-image.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ steps:
66
git show --stat
77
echo $REGISTRY_PASSWORD | docker login $REGISTRY_URL -u $REGISTRY_USERNAME --password-stdin
88
export IMAGE_REGISTRY=$REGISTRY_URL
9-
export GOPATH="/home/vsts/go"
9+
USER="cloudtest"
10+
if [[ -n "${RELEASE_PIPELINE:-}" ]]; then
11+
USER="vsts"
12+
fi
13+
export GOPATH="/home/${USER}/go"
1014
export PATH="${PATH}:${GOPATH}/bin"
1115
1216
if [[ ! -d kubetest2-aks ]]; then
@@ -19,10 +23,10 @@ steps:
1923
go install sigs.k8s.io/kubetest2@latest
2024
go mod tidy
2125
make deployer
22-
sudo GOPATH="/home/vsts/go" make install
26+
sudo GOPATH="/home/${USER}/go" make install
2327
popd
2428
25-
export IMAGE_TAG="$(git describe --tags)"
29+
export IMAGE_TAG="$(git describe --tags --match "v[0-9].*")"
2630
kubetest2 aks --build --target ccm --targetPath `pwd`
2731
displayName: make and push ccm image
2832
env:

‎.pipelines/cnm-image.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ steps:
66
git show --stat
77
echo $REGISTRY_PASSWORD | docker login $REGISTRY_URL -u $REGISTRY_USERNAME --password-stdin
88
export IMAGE_REGISTRY=$REGISTRY_URL
9-
export GOPATH="/home/vsts/go"
9+
USER="cloudtest"
10+
if [[ -n "${RELEASE_PIPELINE:-}" ]]; then
11+
USER="vsts"
12+
fi
13+
export GOPATH="/home/${USER}/go"
1014
export PATH="${PATH}:${GOPATH}/bin"
1115
1216
if [[ ! -d kubetest2-aks ]]; then
@@ -19,10 +23,10 @@ steps:
1923
go install sigs.k8s.io/kubetest2@latest
2024
go mod tidy
2125
make deployer
22-
sudo GOPATH="/home/vsts/go" make install
26+
sudo GOPATH="/home/${USER}/go" make install
2327
popd
2428
25-
export IMAGE_TAG="$(git describe --tags)"
29+
export IMAGE_TAG="$(git describe --tags --match "v[0-9].*")"
2630
kubetest2 aks --build --target cnm --targetPath `pwd`
2731
displayName: make and push cnm image
2832
env:

0 commit comments

Comments
 (0)