Skip to content

Commit 724cfb3

Browse files
committed
Sync APIs from karmada repo based on v1.16.0
Signed-off-by: RainbowMango <qdurenhongcai@gmail.com>
1 parent 932ae47 commit 724cfb3

12 files changed

Lines changed: 137 additions & 75 deletions

File tree

.gitignore

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Binaries for programs and plugins
2+
*.exe
3+
*.exe~
4+
*.dll
5+
*.so
6+
*.dylib
7+
8+
# Test binary, built with `go test -c`
9+
*.test
10+
11+
# Output of the go coverage tool, specifically when used with LiteIDE
12+
*.out
13+
_tmp/
14+
_output/
15+
16+
# Dependency directories (remove the comment below to include it)
17+
# vendor/
18+
19+
.idea/
20+
.vscode/
21+
22+
# OSX trash
23+
.DS_Store

config/v1alpha1/interpretercontext_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ type ResourceInterpreterResponse struct {
107107
// +optional
108108
PatchType *PatchType `json:"patchType,omitempty" protobuf:"bytes,5,opt,name=patchType"`
109109

110-
// ReplicaRequirements represents the requirements required by each replica.
110+
// ReplicaRequirements represents the resource and scheduling requirements for each replica.
111111
// Required if InterpreterOperation is InterpreterOperationInterpretReplica.
112112
// +optional
113113
ReplicaRequirements *workv1alpha2.ReplicaRequirements `json:"replicaRequirements,omitempty"`

go.mod

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
module github.com/karmada-io/api
22

3-
go 1.24.6
3+
go 1.24.10
44

55
require (
6-
k8s.io/api v0.33.2
7-
k8s.io/apiextensions-apiserver v0.33.2
8-
k8s.io/apimachinery v0.33.2
9-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
10-
sigs.k8s.io/controller-runtime v0.21.0
6+
k8s.io/api v0.34.1
7+
k8s.io/apiextensions-apiserver v0.34.1
8+
k8s.io/apimachinery v0.34.1
9+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
10+
sigs.k8s.io/controller-runtime v0.22.4
1111
)
1212

1313
require (
14-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
14+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
1515
github.com/go-logr/logr v1.4.2 // indirect
1616
github.com/gogo/protobuf v1.3.2 // indirect
1717
github.com/json-iterator/go v1.1.12 // indirect
1818
github.com/kr/text v0.2.0 // indirect
1919
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
20-
github.com/modern-go/reflect2 v1.0.2 // indirect
20+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
2121
github.com/x448/float16 v0.8.4 // indirect
22+
go.yaml.in/yaml/v2 v2.4.2 // indirect
2223
golang.org/x/net v0.39.0 // indirect
2324
golang.org/x/text v0.24.0 // indirect
2425
gopkg.in/inf.v0 v0.9.1 // indirect
2526
k8s.io/klog/v2 v2.130.1 // indirect
26-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
27+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
2728
sigs.k8s.io/randfill v1.0.0 // indirect
28-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
29-
sigs.k8s.io/yaml v1.4.0 // indirect
29+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
30+
sigs.k8s.io/yaml v1.6.0 // indirect
3031
)

go.sum

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
22
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
6-
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
5+
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
6+
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
77
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
88
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
99
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
1010
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
11-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1211
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1312
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
1413
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -23,14 +22,15 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
2322
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
2423
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
2524
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
26-
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
2725
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
26+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
27+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
2828
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2929
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3030
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
3131
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
32-
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
33-
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
32+
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
33+
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
3434
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3535
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
3636
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
@@ -39,6 +39,10 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
3939
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
4040
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
4141
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
42+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
43+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
44+
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
45+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
4246
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
4347
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
4448
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -75,24 +79,23 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
7579
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
7680
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
7781
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
78-
k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
79-
k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
80-
k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
81-
k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
82-
k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
83-
k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
82+
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
83+
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
84+
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
85+
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
86+
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
87+
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
8488
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
8589
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
86-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
87-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
88-
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
89-
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
90-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
91-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
92-
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
90+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
91+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
92+
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
93+
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
94+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
95+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
9396
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
9497
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
95-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
96-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
97-
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
98-
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
98+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
99+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
100+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
101+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

networking/v1alpha1/service_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ type MultiClusterServiceSpec struct {
112112
type ClusterSelector struct {
113113
// Name is the name of the cluster to be selected.
114114
// +required
115-
Name string `json:"name,omitempty"`
115+
Name string `json:"name"`
116116
}
117117

118118
// ExposureType describes how to expose the service.

operator/v1alpha1/type.go

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package v1alpha1
1919
import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22+
"k8s.io/apimachinery/pkg/util/intstr"
2223
)
2324

2425
// +genclient
@@ -59,7 +60,7 @@ const (
5960
type HTTPSource struct {
6061
// URL specifies the URL of the CRD tarball resource.
6162
// +required
62-
URL string `json:"url,omitempty"`
63+
URL string `json:"url"`
6364

6465
// Proxy specifies the configuration of a proxy server to use when downloading the CRD tarball.
6566
// When set, the operator will use the configuration to determine how to establish a connection to the proxy to fetch the tarball from the URL specified above.
@@ -179,7 +180,7 @@ type ImageRegistry struct {
179180
type KarmadaComponents struct {
180181
// Etcd holds configuration for etcd.
181182
// +required
182-
Etcd *Etcd `json:"etcd,omitempty"`
183+
Etcd *Etcd `json:"etcd"`
183184

184185
// KarmadaAPIServer holds settings to kube-apiserver component. Currently, kube-apiserver
185186
// is used as the apiserver of karmada. we had the same experience as k8s apiserver.
@@ -291,21 +292,6 @@ type ExternalEtcd struct {
291292
// +required
292293
Endpoints []string `json:"endpoints"`
293294

294-
// CAData is an SSL Certificate Authority file used to secure etcd communication.
295-
// Required if using a TLS connection.
296-
// Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
297-
CAData []byte `json:"caData,omitempty"`
298-
299-
// CertData is an SSL certification file used to secure etcd communication.
300-
// Required if using a TLS connection.
301-
// Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
302-
CertData []byte `json:"certData,omitempty"`
303-
304-
// KeyData is an SSL key file used to secure etcd communication.
305-
// Required if using a TLS connection.
306-
// Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
307-
KeyData []byte `json:"keyData,omitempty"`
308-
309295
// SecretRef references a Kubernetes secret containing the etcd connection credentials.
310296
// The secret must contain the following data keys:
311297
// ca.crt: The Certificate Authority (CA) certificate data.
@@ -700,6 +686,11 @@ type CommonSettings struct {
700686
// +kubebuilder:default="system-node-critical"
701687
// +optional
702688
PriorityClassName string `json:"priorityClassName,omitempty"`
689+
690+
// PodDisruptionBudgetConfig specifies the PodDisruptionBudget configuration
691+
// for this component's pods. If not set, no PDB will be created.
692+
// +optional
693+
PodDisruptionBudgetConfig *PodDisruptionBudgetConfig `json:"podDisruptionBudgetConfig,omitempty"`
703694
}
704695

705696
// Image allows to customize the image used for components.
@@ -793,6 +784,24 @@ type LocalSecretReference struct {
793784
Name string `json:"name,omitempty"`
794785
}
795786

787+
// PodDisruptionBudgetConfig defines a subset of PodDisruptionBudgetSpec fields
788+
// that users can configure for their control plane components.
789+
// +kubebuilder:validation:XValidation:rule="has(self.minAvailable) || has(self.maxUnavailable)",message="either minAvailable or maxUnavailable must be set"
790+
// +kubebuilder:validation:XValidation:rule="!(has(self.minAvailable) && has(self.maxUnavailable))",message="minAvailable and maxUnavailable are mutually exclusive"
791+
type PodDisruptionBudgetConfig struct {
792+
// MinAvailable specifies the minimum number or percentage of pods
793+
// that must remain available after evictions.
794+
// Mutually exclusive with MaxUnavailable.
795+
// +optional
796+
MinAvailable *intstr.IntOrString `json:"minAvailable,omitempty"`
797+
798+
// MaxUnavailable specifies the maximum number or percentage of pods
799+
// that can be unavailable after evictions.
800+
// Mutually exclusive with MinAvailable.
801+
// +optional
802+
MaxUnavailable *intstr.IntOrString `json:"maxUnavailable,omitempty"`
803+
}
804+
796805
// +kubebuilder:object:root=true
797806
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
798807

operator/v1alpha1/zz_generated.deepcopy.go

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

policy/v1alpha1/override_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ type LabelAnnotationOverrider struct {
148148
// Items in Value which match in annotations/labels will be deleted when Operator is 'remove'.
149149
// Items in Value which match in annotations/labels will be replaced when Operator is 'replace'.
150150
// +required
151-
Value map[string]string `json:"value,omitempty"`
151+
Value map[string]string `json:"value"`
152152
}
153153

154154
// ImageOverrider represents the rules dedicated to handling image overrides.

search/searchregistry_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type OpenSearchConfig struct {
9292
// - secret.data.userName
9393
// - secret.data.password
9494
// +required
95-
SecretRef clusterv1alpha1.LocalSecretReference `json:"secretRef,omitempty"`
95+
SecretRef clusterv1alpha1.LocalSecretReference `json:"secretRef"`
9696

9797
// More configurations such as transport, index should be added from here.
9898
}

search/v1alpha1/searchregistry_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ type OpenSearchConfig struct {
104104
// - secret.data.userName
105105
// - secret.data.password
106106
// +required
107-
SecretRef clusterv1alpha1.LocalSecretReference `json:"secretRef,omitempty"`
107+
SecretRef clusterv1alpha1.LocalSecretReference `json:"secretRef"`
108108

109109
// More configurations such as transport, index should be added from here.
110110
}

0 commit comments

Comments
 (0)