Skip to content

Commit 30950f8

Browse files
pooknullpooknull
committed
Merge remote-tracking branch 'origin/main' into K8SPS-131
2 parents eae001c + 1d949ed commit 30950f8

22 files changed

+814
-108
lines changed

‎.github/workflows/scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.30.0
34+
uses: aquasecurity/trivy-action@0.31.0
3535
with:
3636
image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64'
3737
format: 'table'
@@ -49,7 +49,7 @@ jobs:
4949
./e2e-tests/build
5050
5151
- name: Run Trivy vulnerability scanner image (linux/amd64)
52-
uses: aquasecurity/trivy-action@0.30.0
52+
uses: aquasecurity/trivy-action@0.31.0
5353
with:
5454
image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64'
5555
format: 'table'

‎api/v1alpha1/perconaservermysql_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ type PMMSpec struct {
217217
Resources corev1.ResourceRequirements `json:"resources,omitempty"`
218218
ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
219219
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
220-
RuntimeClassName *string `json:"runtimeClassName,omitempty"`
221220
}
222221

223222
type BackupSpec struct {

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/ps.percona.com_perconaservermysqls.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6450,8 +6450,6 @@ spec:
64506450
x-kubernetes-int-or-string: true
64516451
type: object
64526452
type: object
6453-
runtimeClassName:
6454-
type: string
64556453
serverHost:
64566454
type: string
64576455
required:

‎deploy/bundle.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8373,8 +8373,6 @@ spec:
83738373
x-kubernetes-int-or-string: true
83748374
type: object
83758375
type: object
8376-
runtimeClassName:
8377-
type: string
83788376
serverHost:
83798377
type: string
83808378
required:

‎deploy/cr.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ spec:
4141
autoRecovery: true
4242
image: perconalab/percona-server-mysql-operator:main-psmysql
4343
imagePullPolicy: Always
44+
# runtimeClassName: image-rc
45+
# tolerations:
46+
# - key: "node.alpha.kubernetes.io/unreachable"
47+
# operator: "Exists"
48+
# effect: "NoExecute"
49+
# tolerationSeconds: 6000
50+
# imagePullSecrets:
51+
# - "secret-1"
52+
# - "secret-2"
4453
# initImage: perconalab/percona-server-mysql-operator:main
4554
size: 3
4655

@@ -156,6 +165,15 @@ spec:
156165

157166
image: perconalab/percona-server-mysql-operator:main-haproxy
158167
imagePullPolicy: Always
168+
# runtimeClassName: image-rc
169+
# tolerations:
170+
# - key: "node.alpha.kubernetes.io/unreachable"
171+
# operator: "Exists"
172+
# effect: "NoExecute"
173+
# tolerationSeconds: 6000
174+
# imagePullSecrets:
175+
# - "secret-1"
176+
# - "secret-2"
159177

160178
resources:
161179
requests:
@@ -265,6 +283,15 @@ spec:
265283
enabled: false
266284
image: perconalab/percona-server-mysql-operator:main-router
267285
imagePullPolicy: Always
286+
# runtimeClassName: image-rc
287+
# tolerations:
288+
# - key: "node.alpha.kubernetes.io/unreachable"
289+
# operator: "Exists"
290+
# effect: "NoExecute"
291+
# tolerationSeconds: 6000
292+
# imagePullSecrets:
293+
# - "secret-1"
294+
# - "secret-2"
268295
# initImage: perconalab/percona-server-mysql-operator:main
269296
# ports:
270297
# - name: http
@@ -347,6 +374,15 @@ spec:
347374

348375
image: perconalab/percona-server-mysql-operator:main-orchestrator
349376
imagePullPolicy: Always
377+
# runtimeClassName: image-rc
378+
# tolerations:
379+
# - key: "node.alpha.kubernetes.io/unreachable"
380+
# operator: "Exists"
381+
# effect: "NoExecute"
382+
# tolerationSeconds: 6000
383+
# imagePullSecrets:
384+
# - "secret-1"
385+
# - "secret-2"
350386
# serviceAccountName: percona-server-mysql-operator-orchestrator
351387
# initImage: perconalab/percona-server-mysql-operator:main
352388

@@ -421,6 +457,9 @@ spec:
421457
# storageName: s3
422458
# backoffLimit: 6
423459
imagePullPolicy: Always
460+
# imagePullSecrets:
461+
# - "secret-1"
462+
# - "secret-2"
424463
# initImage: perconalab/percona-server-mysql-operator:main
425464
# containerSecurityContext:
426465
# privileged: true
@@ -474,6 +513,7 @@ spec:
474513
# podSecurityContext:
475514
# fsGroup: 1001
476515
# supplementalGroups: [1001, 1002, 1003]
516+
# runtimeClassName: image-rc
477517
s3:
478518
bucket: S3-BACKUP-BUCKET-NAME-HERE
479519
credentialsSecret: cluster1-s3-credentials

‎deploy/crd.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8373,8 +8373,6 @@ spec:
83738373
x-kubernetes-int-or-string: true
83748374
type: object
83758375
type: object
8376-
runtimeClassName:
8377-
type: string
83788376
serverHost:
83798377
type: string
83808378
required:

‎deploy/cw-bundle.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8373,8 +8373,6 @@ spec:
83738373
x-kubernetes-int-or-string: true
83748374
type: object
83758375
type: object
8376-
runtimeClassName:
8377-
type: string
83788376
serverHost:
83798377
type: string
83808378
required:

‎go.mod

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ require (
2626
golang.org/x/sync v0.15.0
2727
golang.org/x/text v0.26.0
2828
google.golang.org/grpc v1.73.0
29-
k8s.io/api v0.33.1
30-
k8s.io/apiextensions-apiserver v0.33.1
31-
k8s.io/apimachinery v0.33.1
32-
k8s.io/client-go v0.33.1
29+
k8s.io/api v0.33.2
30+
k8s.io/apiextensions-apiserver v0.33.2
31+
k8s.io/apimachinery v0.33.2
32+
k8s.io/client-go v0.33.2
3333
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
3434
sigs.k8s.io/controller-runtime v0.21.0
3535
)
@@ -49,13 +49,14 @@ require (
4949
github.com/x448/float16 v0.8.4 // indirect
5050
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
5151
go.uber.org/automaxprocs v1.6.0 // indirect
52+
go.yaml.in/yaml/v2 v2.4.2 // indirect
5253
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5354
sigs.k8s.io/randfill v1.0.0 // indirect
5455
)
5556

5657
require (
5758
filippo.io/edwards25519 v1.1.0 // indirect
58-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
59+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
5960
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
6061
github.com/Percona-Lab/percona-version-service v0.0.0-20230324081000-27de445df239
6162
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -79,7 +80,7 @@ require (
7980
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
8081
github.com/google/uuid v1.6.0 // indirect
8182
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
82-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0
83+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1
8384
github.com/iancoleman/orderedmap v0.3.0 // indirect
8485
github.com/josharian/intern v1.0.0 // indirect
8586
github.com/json-iterator/go v1.1.12 // indirect
@@ -134,5 +135,5 @@ require (
134135
sigs.k8s.io/gateway-api v1.1.0 // indirect
135136
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
136137
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
137-
sigs.k8s.io/yaml v1.4.0
138+
sigs.k8s.io/yaml v1.5.0
138139
)

‎go.sum

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5T
109109
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
110110
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0=
111111
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc=
112-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 h1:+epNPbD5EqgpEMm5wrl4Hqts3jZt8+kYaqUisuuIGTk=
113-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
112+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
113+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
114114
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
115115
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
116116
github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc=
@@ -257,6 +257,10 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
257257
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
258258
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
259259
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
260+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
261+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
262+
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
263+
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
260264
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
261265
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
262266
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -325,14 +329,14 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
325329
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
326330
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
327331
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
328-
k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
329-
k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
330-
k8s.io/apiextensions-apiserver v0.33.1 h1:N7ccbSlRN6I2QBcXevB73PixX2dQNIW0ZRuguEE91zI=
331-
k8s.io/apiextensions-apiserver v0.33.1/go.mod h1:uNQ52z1A1Gu75QSa+pFK5bcXc4hq7lpOXbweZgi4dqA=
332-
k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
333-
k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
334-
k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
335-
k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
332+
k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
333+
k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
334+
k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
335+
k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
336+
k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
337+
k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
338+
k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
339+
k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
336340
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
337341
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
338342
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
@@ -350,5 +354,6 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
350354
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
351355
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
352356
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
353-
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
354357
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
358+
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
359+
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

0 commit comments

Comments
 (0)