Skip to content

Commit e5576b6

Browse files
authored
Merge branch 'main' into broadcast-link-checker-fix
2 parents d81f8a7 + 84003c4 commit e5576b6

File tree

167 files changed

+657
-223
lines changed

Some content is hidden

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

167 files changed

+657
-223
lines changed

.github/assets-config.yml

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

.github/auto-labeler-config.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
conventional-commits:
3+
- type: 'fix'
4+
nouns: ['FIX', 'Fix', 'fix', 'FIXED', 'Fixed', 'fixed']
5+
labels: ['bug']
6+
- type: 'feature'
7+
nouns: ['FEATURE', 'Feature', 'feature', 'FEAT', 'Feat', 'feat']
8+
labels: ['enhancement']
9+
- type: 'breaking_change'
10+
nouns: ['BREAKING CHANGE', 'BREAKING', 'MAJOR']
11+
labels: ['breaking-change']
12+
- type: 'refactor'
13+
nouns: ['refactor', 'Refactor']
14+
labels: ['refactor']
15+
- type: 'documentation'
16+
nouns: ['docs', 'doc', 'document', 'documentation']
17+
labels: ['documentation']
18+
- type: 'build'
19+
nouns: ['build', 'rebuild']
20+
labels: ['build']
21+
- type: 'config'
22+
nouns: ['config', 'conf', 'configuration', 'configure']
23+
labels: ['config']
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77

88
charts:
99
- name: qubership-zookeeper
10-
chart_file: charts/helm/zookeeper-service/Chart.yaml
11-
values_file: charts/helm/zookeeper-service/values.yaml
10+
chart_file: operator/charts/helm/zookeeper-service/Chart.yaml
11+
values_file: operator/charts/helm/zookeeper-service/values.yaml
1212
image:
1313
- ghcr.io/netcracker/qubership-zookeeper-operator:${release}
1414
- ghcr.io/netcracker/qubership-docker-zookeeper:${release}
1515
- ghcr.io/netcracker/qubership-zookeeper-monitoring:${release}
1616
- ghcr.io/netcracker/qubership-zookeeper-backup-daemon:${release}
17-
- ghcr.io/netcracker/qubership-zookeeper-integration-tests:${release}
17+
- ghcr.io/netcracker/qubership-zookeeper-integration-tests:${release}
18+
- ghcr.io/netcracker/qubership-docker-kubectl:#latest

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ updates:
1313
schedule:
1414
interval: "weekly"
1515
- package-ecosystem: "docker"
16-
directory: "/zookeeper-backup-daemon"
16+
directory: "/backup-daemon"
1717
schedule:
1818
interval: "weekly"
1919
- package-ecosystem: "docker"
20-
directory: "/zookeeper-monitoring"
20+
directory: "/monitoring"
2121
schedule:
2222
interval: "weekly"

.github/docker-build-config.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
},
88
{
99
"name": "qubership-zookeeper-operator",
10-
"file": "Dockerfile",
11-
"context": "."
10+
"file": "operator/Dockerfile",
11+
"context": "operator"
1212
},
1313
{
1414
"name": "qubership-zookeeper-transfer",
1515
"file": "docker-transfer/Dockerfile",
16-
"context": ""
16+
"context": "."
1717
},
1818
{
1919
"name": "qubership-zookeeper-backup-daemon",
20-
"file": "zookeeper-backup-daemon/docker/Dockerfile",
21-
"context": "zookeeper-backup-daemon"
20+
"file": "backup-daemon/docker/Dockerfile",
21+
"context": "backup-daemon"
2222
},
2323
{
2424
"name": "qubership-zookeeper-monitoring",
25-
"file": "zookeeper-monitoring/docker/Dockerfile",
26-
"context": "zookeeper-monitoring"
25+
"file": "monitoring/docker/Dockerfile",
26+
"context": "monitoring"
2727
},
2828
{
2929
"name": "qubership-docker-zookeeper",

.github/release-drafter-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ version-resolver:
4545
patch:
4646
labels:
4747
- patch
48-
default: patch
48+
default: patch

.github/versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.4
1+
0.10.5

.github/workflows/automatic-pr-labeler.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@ jobs:
2424
if: (github.event.pull_request.merged == false) && (github.event.pull_request.user.login != 'dependabot[bot]') && (github.event.pull_request.user.login != 'github-actions[bot]')
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
with:
29+
persist-credentials: false
2830

2931
- name: "Execute assign labels"
3032
id: action-assign-labels
3133
uses: mauroalderete/action-assign-labels@v1
3234
with:
3335
pull-request-number: ${{ github.event.pull_request.number }}
3436
github-token: ${{ github.token }}
35-
conventional-commits: ".github/workflows/automatic-pr-labeler.yaml"
37+
conventional-commits: "./.github/auto-labeler-config.yaml"
3638
maintain-labels-not-matched: true
3739
apply-changes: ${{ github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id }}
3840
- name: "Drop warning if PR from fork"
@@ -42,4 +44,4 @@ jobs:
4244
echo "⚠️ Pull request from fork! ⚠️";
4345
echo "Labels will not be applied to PR. Assign them manually please.";
4446
echo "Labels to assign: ${{ steps.action-assign-labels.outputs.labels-next }}";
45-
} >> $GITHUB_STEP_SUMMARY
47+
} >> "$GITHUB_STEP_SUMMARY"

.github/workflows/cla.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ on:
77
types: [opened, closed, synchronize]
88

99
permissions:
10-
actions: write
11-
contents: write
12-
pull-requests: write
13-
statuses: write
10+
contents: read
1411

1512
jobs:
1613
CLAAssistant:
14+
if: github.event.pull_request.draft == false
15+
permissions:
16+
actions: write
17+
contents: write
18+
pull-requests: write
19+
statuses: write
1720
runs-on: ubuntu-latest
1821
steps:
1922
- name: "CLA Assistant"

.github/workflows/clean.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
file: docker-transfer/Dockerfile
2121
context: ""
2222
- name: qubership-zookeeper-backup-daemon
23-
file: zookeeper-backup-daemon/docker/Dockerfile
24-
context: zookeeper-backup-daemon
23+
file: backup-daemon/docker/Dockerfile
24+
context: backup-daemon
2525
- name: qubership-zookeeper-monitoring
26-
file: zookeeper-monitoring/docker/Dockerfile
27-
context: zookeeper-monitoring
26+
file: monitoring/docker/Dockerfile
27+
context: monitoring
2828
- name: qubership-docker-zookeeper
2929
file: docker-zookeeper/docker/Dockerfile
3030
context: docker-zookeeper

0 commit comments

Comments
 (0)