Skip to content

Commit 4d2e9fe

Browse files
smoshiur1237smoshiur1237
committed
Revert "Fix indentation"
This reverts commit 7d2a86a. Signed-off-by: smoshiur1237 <[email protected]>
1 parent 7d2a86a commit 4d2e9fe

File tree

39 files changed

+1640
-1823
lines changed

39 files changed

+1640
-1823
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ about: Tell us about a problem you are experiencing
99
**What steps did you take and what happened:**
1010
[A clear and concise description of what the bug is.]
1111

12+
1213
**What did you expect to happen:**
1314

15+
1416
**Anything else you would like to add:**
1517
[Miscellaneous information that will assist in solving the issue.]
1618

19+
1720
**Environment:**
1821

1922
- Cluster API Provider OpenStack version (Or `git rev-parse HEAD` if manually built):

‎.github/dependabot.yml‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ updates:
1212
target-branch: main
1313
groups:
1414
all-github-actions:
15-
patterns: [ "*" ]
15+
patterns: ["*"]
1616
commit-message:
1717
prefix: ":seedling:"
1818
include: scope
@@ -30,20 +30,20 @@ updates:
3030
target-branch: main
3131
groups:
3232
all-go-mod-patch-and-minor:
33-
patterns: [ "*" ]
34-
update-types: [ "patch", "minor" ]
33+
patterns: ["*"]
34+
update-types: ["patch", "minor"]
3535
commit-message:
3636
prefix: ":seedling:"
3737
include: scope
3838
ignore:
3939
# Ignore controller-runtime major and minor bumps as its upgraded manually.
4040
- dependency-name: "sigs.k8s.io/controller-runtime"
41-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
41+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
4242
# Ignore k8s major and minor bumps and its transitives modules
4343
- dependency-name: "k8s.io/*"
44-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
44+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
4545
- dependency-name: "sigs.k8s.io/controller-tools"
46-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
46+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
4747
labels:
4848
- "area/dependency"
4949
- "ok-to-test"
@@ -58,7 +58,7 @@ updates:
5858
target-branch: release-0.13
5959
groups:
6060
all-github-actions:
61-
patterns: [ "*" ]
61+
patterns: ["*"]
6262
commit-message:
6363
prefix: ":seedling:"
6464
include: scope
@@ -76,23 +76,23 @@ updates:
7676
target-branch: release-0.13
7777
groups:
7878
all-go-mod-patch-and-minor:
79-
patterns: [ "*" ]
80-
update-types: [ "patch", "minor" ]
79+
patterns: ["*"]
80+
update-types: ["patch", "minor"]
8181
commit-message:
8282
prefix: ":seedling:"
8383
include: scope
8484
ignore:
8585
# Ignore CAPI major and minor bumps
8686
- dependency-name: "sigs.k8s.io/cluster-api*"
87-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
87+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
8888
# Ignore controller-runtime major and minor bumps as its upgraded manually.
8989
- dependency-name: "sigs.k8s.io/controller-runtime"
90-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
90+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
9191
# Ignore k8s major and minor bumps and its transitives modules
9292
- dependency-name: "k8s.io/*"
93-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
93+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
9494
- dependency-name: "sigs.k8s.io/controller-tools"
95-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
95+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
9696
labels:
9797
- "area/dependency"
9898
- "ok-to-test"
@@ -107,7 +107,7 @@ updates:
107107
target-branch: release-0.12
108108
groups:
109109
all-github-actions:
110-
patterns: [ "*" ]
110+
patterns: ["*"]
111111
commit-message:
112112
prefix: ":seedling:"
113113
include: scope
@@ -125,23 +125,23 @@ updates:
125125
target-branch: release-0.12
126126
groups:
127127
all-go-mod-patch-and-minor:
128-
patterns: [ "*" ]
129-
update-types: [ "patch", "minor" ]
128+
patterns: ["*"]
129+
update-types: ["patch", "minor"]
130130
commit-message:
131131
prefix: ":seedling:"
132132
include: scope
133133
ignore:
134134
# Ignore CAPI major and minor bumps
135135
- dependency-name: "sigs.k8s.io/cluster-api*"
136-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
136+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
137137
# Ignore controller-runtime major and minor bumps as its upgraded manually.
138138
- dependency-name: "sigs.k8s.io/controller-runtime"
139-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
139+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
140140
# Ignore k8s major and minor bumps and its transitives modules
141141
- dependency-name: "k8s.io/*"
142-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
142+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
143143
- dependency-name: "sigs.k8s.io/controller-tools"
144-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
144+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
145145
# We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
146146
- dependency-name: "sigs.k8s.io/structured-merge-diff/*"
147147
# These dependencies are skipped because they require a newer version of go:
@@ -154,5 +154,4 @@ updates:
154154
labels:
155155
- "area/dependency"
156156
- "ok-to-test"
157-
158157
## release-0.12 branch config ends here

‎.github/workflows/pr-dependabot.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ name: PR dependabot code generation and go modules fix
44
on:
55
pull_request:
66
branches:
7-
- dependabot/**
7+
- dependabot/**
88
push:
99
branches:
10-
- dependabot/**
10+
- dependabot/**
1111
workflow_dispatch:
1212

13-
1413
permissions:
1514
contents: write # Allow to update the PR.
1615

@@ -47,4 +46,4 @@ jobs:
4746
author_name: dependabot[bot]
4847
author_email: 49699333+dependabot[bot]@users.noreply.github.com
4948
default_author: github_actor
50-
message: 'Update generated code'
49+
message: 'Update generated code'

‎.github/workflows/pr-gh-workflow-approve.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Approve GH Workflows
66

77
on:
88
pull_request_target:
9-
types: [ opened, edited, reopened, synchronize, ready_for_review ]
9+
types: [opened, edited, reopened, synchronize, ready_for_review]
1010

1111
permissions: {}
1212

‎.github/workflows/pr-link-check.yaml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Check Links In Pull Requests
22

33
on:
44
pull_request:
5-
types: [ opened, edited, reopened, synchronize, ready_for_review ]
5+
types: [opened, edited, reopened, synchronize, ready_for_review]
66

77
permissions: {}
88

@@ -15,58 +15,58 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- name: Clone repository
19-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
20-
with:
21-
fetch-depth: 0
22-
ref: ${{github.event.pull_request.head.ref}}
23-
repository: ${{github.event.pull_request.head.repo.full_name}}
18+
- name: Clone repository
19+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
20+
with:
21+
fetch-depth: 0
22+
ref: ${{github.event.pull_request.head.ref}}
23+
repository: ${{github.event.pull_request.head.repo.full_name}}
2424

25-
- name: Add upstream remote
26-
run: |
27-
upstreamurl="https://github.com/kubernetes-sigs/cluster-api-provider-openstack.git"
28-
git remote add upstream "${upstreamurl}"
29-
git fetch upstream
25+
- name: Add upstream remote
26+
run: |
27+
upstreamurl="https://github.com/kubernetes-sigs/cluster-api-provider-openstack.git"
28+
git remote add upstream "${upstreamurl}"
29+
git fetch upstream
3030
31-
- name: Checkout base branch
32-
run: git checkout "upstream/${{ github.event.pull_request.base.ref }}"
31+
- name: Checkout base branch
32+
run: git checkout "upstream/${{ github.event.pull_request.base.ref }}"
3333

34-
- name: Get list of changed Markdown files
35-
id: changed-files
36-
run: |
37-
git diff --name-only "upstream/${{ github.event.pull_request.base.ref }}...${{ github.head_ref }}" -- "*.md" > changed-files.txt
38-
cat changed-files.txt
39-
if [[ -s "changed-files.txt" ]]; then
40-
echo "Changed md files found"
41-
echo "foundFiles=true" >> "${GITHUB_ENV}"
42-
fi
34+
- name: Get list of changed Markdown files
35+
id: changed-files
36+
run: |
37+
git diff --name-only "upstream/${{ github.event.pull_request.base.ref }}...${{ github.head_ref }}" -- "*.md" > changed-files.txt
38+
cat changed-files.txt
39+
if [[ -s "changed-files.txt" ]]; then
40+
echo "Changed md files found"
41+
echo "foundFiles=true" >> "${GITHUB_ENV}"
42+
fi
4343
44-
- name: Switch to PR branch
45-
run: git checkout ${{ github.head_ref }}
44+
- name: Switch to PR branch
45+
run: git checkout ${{ github.head_ref }}
4646

47-
- name: Check links in changed files
48-
if: env.foundFiles == 'true'
49-
uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2.7.0
50-
with:
51-
failIfEmpty: false
52-
args: |
53-
--user-agent "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:135.0) Gecko/20100101 Firefox/135.0"
54-
--root-dir "$(pwd)/"
55-
--fallback-extensions "md"
56-
--github-token "${GITHUB_TOKEN}"
57-
$(cat changed-files.txt | tr '\n' ' ')
47+
- name: Check links in changed files
48+
if: env.foundFiles == 'true'
49+
uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2.7.0
50+
with:
51+
failIfEmpty: false
52+
args: |
53+
--user-agent "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:135.0) Gecko/20100101 Firefox/135.0"
54+
--root-dir "$(pwd)/"
55+
--fallback-extensions "md"
56+
--github-token "${GITHUB_TOKEN}"
57+
$(cat changed-files.txt | tr '\n' ' ')
5858
59-
- name: Provide helpful failure message
60-
if: failure()
61-
run: |
62-
echo "::error::Link check failed! Please review the broken links reported above."
63-
echo ""
64-
echo "If certain links are valid but fail due to:"
65-
echo "- CAPTCHA challenges"
66-
echo "- IP blocking"
67-
echo "- Authentication requirements"
68-
echo "- Rate limiting"
69-
echo ""
70-
echo "Consider adding them to .lycheeignore to bypass future checks."
71-
echo "Format: Add one URL pattern per line"
72-
exit 1
59+
- name: Provide helpful failure message
60+
if: failure()
61+
run: |
62+
echo "::error::Link check failed! Please review the broken links reported above."
63+
echo ""
64+
echo "If certain links are valid but fail due to:"
65+
echo "- CAPTCHA challenges"
66+
echo "- IP blocking"
67+
echo "- Authentication requirements"
68+
echo "- Rate limiting"
69+
echo ""
70+
echo "Consider adding them to .lycheeignore to bypass future checks."
71+
echo "Format: Add one URL pattern per line"
72+
exit 1

‎.github/workflows/pr-verifer.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,51 @@ permissions: {}
33

44
on:
55
pull_request_target:
6-
types: [ opened, edited, reopened, synchronize, ready_for_review ]
6+
types: [opened, edited, reopened, synchronize, ready_for_review]
77

88
jobs:
99
check-title:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Check out repository
13-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
12+
- name: Check out repository
13+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1414

15-
- name: Validate PR Title
16-
env:
17-
PR_TITLE: ${{ github.event.pull_request.title }}
18-
run: |
19-
WIP_REGEX='^\W?WIP\W'
20-
TAG_REGEX='^\[[[:alnum:]\._-]*\]'
15+
- name: Validate PR Title
16+
env:
17+
PR_TITLE: ${{ github.event.pull_request.title }}
18+
run: |
19+
WIP_REGEX='^\W?WIP\W'
20+
TAG_REGEX='^\[[[:alnum:]\._-]*\]'
2121
22-
# Trim WIP and tags from title
23-
trimmed_title=$(echo "${PR_TITLE}" | sed -E "s/${WIP_REGEX}//" | sed -E "s/${TAG_REGEX}//" | xargs)
22+
# Trim WIP and tags from title
23+
trimmed_title=$(echo "${PR_TITLE}" | sed -E "s/${WIP_REGEX}//" | sed -E "s/${TAG_REGEX}//" | xargs)
2424
25-
# Normalize common emojis in text form to actual emojis
26-
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:warning:/⚠/g")
27-
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:sparkles:/✨/g")
28-
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:bug:/🐛/g")
29-
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:book:/📖/g")
30-
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:rocket:/🚀/g")
31-
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:seedling:/🌱/g")
25+
# Normalize common emojis in text form to actual emojis
26+
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:warning:/⚠/g")
27+
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:sparkles:/✨/g")
28+
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:bug:/🐛/g")
29+
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:book:/📖/g")
30+
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:rocket:/🚀/g")
31+
trimmed_title=$(echo "$trimmed_title" | sed -E "s/:seedling:/🌱/g")
3232
33-
# Check PR type prefix
34-
if [[ "${trimmed_title}" =~ ^(⚠|✨|🐛|📖|🚀|🌱) ]]; then
35-
echo "PR title is valid: $trimmed_title"
36-
else
37-
echo "Error: No matching PR type indicator found in title."
38-
echo "You need to have one of these as the prefix of your PR title:"
39-
echo "- Breaking change: ⚠ (:warning:)"
40-
echo "- Non-breaking feature: ✨ (:sparkles:)"
41-
echo "- Patch fix: 🐛 (:bug:)"
42-
echo "- Docs: 📖 (:book:)"
43-
echo "- Release: 🚀 (:rocket:)"
44-
echo "- Infra/Tests/Other: 🌱 (:seedling:)"
45-
exit 1
46-
fi
33+
# Check PR type prefix
34+
if [[ "${trimmed_title}" =~ ^(⚠|✨|🐛|📖|🚀|🌱) ]]; then
35+
echo "PR title is valid: $trimmed_title"
36+
else
37+
echo "Error: No matching PR type indicator found in title."
38+
echo "You need to have one of these as the prefix of your PR title:"
39+
echo "- Breaking change: ⚠ (:warning:)"
40+
echo "- Non-breaking feature: ✨ (:sparkles:)"
41+
echo "- Patch fix: 🐛 (:bug:)"
42+
echo "- Docs: 📖 (:book:)"
43+
echo "- Release: 🚀 (:rocket:)"
44+
echo "- Infra/Tests/Other: 🌱 (:seedling:)"
45+
exit 1
46+
fi
4747
48-
# Check that PR title does not contain Issue or PR number
49-
if [[ "${trimmed_title}" =~ \#[0-9]+ ]]; then
50-
echo "Error: PR title should not contain issue or PR number."
51-
echo "Issue numbers belong in the PR body as either \"Fixes #XYZ\" (if it closes the issue or PR), or something like \"Related to #XYZ\" (if it's just related)."
52-
exit 1
53-
fi
48+
# Check that PR title does not contain Issue or PR number
49+
if [[ "${trimmed_title}" =~ \#[0-9]+ ]]; then
50+
echo "Error: PR title should not contain issue or PR number."
51+
echo "Issue numbers belong in the PR body as either \"Fixes #XYZ\" (if it closes the issue or PR), or something like \"Related to #XYZ\" (if it's just related)."
52+
exit 1
53+
fi

‎.github/workflows/security-scan.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
branch: [ main, release-0.13, release-0.12 ]
16+
branch: [main, release-0.13, release-0.12]
1717
name: Trivy
1818
runs-on: ubuntu-latest
1919
steps:

0 commit comments

Comments
 (0)