Skip to content

Commit a370bf2

Browse files
eleo007eleo007
committed
Merge branch 'main' into K8SPXC-1719-fix-chaos
2 parents 03b9ef3 + c06f955 commit a370bf2

File tree

15 files changed

+1481
-132
lines changed

15 files changed

+1481
-132
lines changed

‎.github/workflows/reviewdog.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: runner / suggester / golangci-lint
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v5
99
- uses: actions/setup-go@v5
1010
with:
1111
go-version: '1.23'
@@ -21,7 +21,7 @@ jobs:
2121
name: runner / suggester / gofmt
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- run: gofmt -w -s $(find . -not -path "*/vendor/*" -name "*.go")
2626
- uses: reviewdog/action-suggester@v1
2727
with:
@@ -31,7 +31,7 @@ jobs:
3131
name: runner / suggester / shfmt
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- uses: actions/setup-go@v5
3636
with:
3737
go-version: '1.23'
@@ -47,7 +47,7 @@ jobs:
4747
name: runner / shellcheck
4848
runs-on: ubuntu-latest
4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151
- uses: reviewdog/action-shellcheck@v1
5252
with:
5353
github_token: ${{ secrets.github_token }}
@@ -59,7 +59,7 @@ jobs:
5959
name: runner / misspell
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v5
6363
- uses: reviewdog/action-misspell@v1
6464
with:
6565
github_token: ${{ secrets.github_token }}
@@ -71,7 +71,7 @@ jobs:
7171
name: runner / alex
7272
runs-on: ubuntu-latest
7373
steps:
74-
- uses: actions/checkout@v4
74+
- uses: actions/checkout@v5
7575
- uses: reviewdog/action-alex@v1
7676
with:
7777
github_token: ${{ secrets.github_token }}
@@ -82,7 +82,7 @@ jobs:
8282
name: runner / manifests
8383
runs-on: ubuntu-latest
8484
steps:
85-
- uses: actions/checkout@v4
85+
- uses: actions/checkout@v5
8686
- uses: actions/setup-go@v5
8787
with:
8888
go-version: '1.23'

‎.github/workflows/scan.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Set up QEMU
2020
uses: docker/setup-qemu-action@v3
@@ -31,7 +31,7 @@ jobs:
3131
./e2e-tests/build
3232
3333
- name: Run Trivy vulnerability scanner image (linux/arm64)
34-
uses: aquasecurity/trivy-action@0.31.0
34+
uses: aquasecurity/trivy-action@0.32.0
3535
with:
3636
image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64'
3737
format: 'table'
@@ -50,7 +50,7 @@ jobs:
5050
./e2e-tests/build
5151
5252
- name: Run Trivy vulnerability scanner image (linux/amd64)
53-
uses: aquasecurity/trivy-action@0.31.0
53+
uses: aquasecurity/trivy-action@0.32.0
5454
with:
5555
image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64'
5656
format: 'table'

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
- uses: actions/setup-go@v5
99
with:
1010
go-version: '1.23'
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- name: go test
1313
run: make test

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ pipeline {
403403
ENABLE_LOGGING = "true"
404404
}
405405
agent {
406-
label 'docker'
406+
label 'docker-x64-min'
407407
}
408408
options {
409409
disableConcurrentBuilds(abortPrevious: true)

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ help: ## Display this help.
1515

1616
generate: controller-gen ## Generate CRDs and RBAC files
1717
go generate ./...
18-
$(CONTROLLER_GEN) crd:maxDescLen=0,allowDangerousTypes=true rbac:roleName=$(NAME) webhook paths="./..." output:crd:artifacts:config=config/crd/bases ## Generate WebhookConfiguration, Role and CustomResourceDefinition objects.
18+
$(CONTROLLER_GEN) crd:maxDescLen=0,allowDangerousTypes=true,generateEmbeddedObjectMeta=true rbac:roleName=$(NAME) webhook paths="./..." output:crd:artifacts:config=config/crd/bases ## Generate WebhookConfiguration, Role and CustomResourceDefinition objects.
1919
$(CONTROLLER_GEN) object paths="./..." ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
2020

2121
$(DEPLOYDIR)/crd.yaml: kustomize generate

‎build/pxc-entrypoint.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,7 @@ if [ "$1" = 'mysqld' ] && [ -z "$wantHelp" ]; then
637637
if [ ! -f "${recovery_file}" ]; then
638638
exit 0
639639
fi
640+
sleep 3
640641
done
641642
fi
642643
set -o xtrace

‎config/crd/bases/pxc.percona.com_perconaxtradbclusterbackups.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,23 @@ spec:
109109
- fieldPath
110110
type: object
111111
x-kubernetes-map-type: atomic
112+
fileKeyRef:
113+
properties:
114+
key:
115+
type: string
116+
optional:
117+
default: false
118+
type: boolean
119+
path:
120+
type: string
121+
volumeName:
122+
type: string
123+
required:
124+
- key
125+
- path
126+
- volumeName
127+
type: object
128+
x-kubernetes-map-type: atomic
112129
resourceFieldRef:
113130
properties:
114131
containerName:

‎config/crd/bases/pxc.percona.com_perconaxtradbclusterrestores.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,23 @@ spec:
191191
- fieldPath
192192
type: object
193193
x-kubernetes-map-type: atomic
194+
fileKeyRef:
195+
properties:
196+
key:
197+
type: string
198+
optional:
199+
default: false
200+
type: boolean
201+
path:
202+
type: string
203+
volumeName:
204+
type: string
205+
required:
206+
- key
207+
- path
208+
- volumeName
209+
type: object
210+
x-kubernetes-map-type: atomic
194211
resourceFieldRef:
195212
properties:
196213
containerName:

0 commit comments

Comments
 (0)