Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: avoid silent rejection to invalid podManagementPolicy #4650

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: avoid silent rejection to invalid podManagementPolicy #4650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c62bf2
avoid silent rejection to invalid podManagementPolicy
hoyhbx Jul 27, 2022
62ac9d0
remove klog; add validation in types.go
hoyhbx Aug 3, 2022
5b41895
remove unnecessary checking
hoyhbx Aug 3, 2022
0fce0aa
Merge branch 'FixPodManagementPolicy' of github.com:hoyhbx/tidb-opera…
hoyhbx Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 172 additions & 40 deletions manifests/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,16 +265,19 @@ spec:
matchLabels:
additionalProperties:
type: string
type: object
type: object
namespaces:
items:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
topologyKey:
type: string
required:
- topologyKey
matchLabels:
additionalProperties:
type: string
type: object
type: object
weight:
format: int32
Expand Down Expand Up @@ -1608,28 +1611,27 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
items:
properties:
labelSelector:
configMap:
properties:
matchExpressions:
items:
items:
properties:
key:
type: string
operator:
mode:
format: int32
type: integer
path:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
- path
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
name:
type: string
optional:
type: boolean
type: object
namespaces:
items:
Expand Down Expand Up @@ -1694,35 +1696,38 @@ spec:
properties:
labelSelector:
properties:
matchExpressions:
items:
items:
properties:
key:
type: string
operator:
mode:
format: int32
type: integer
path:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
- path
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
name:
type: string
optional:
type: boolean
type: object
serviceAccountToken:
properties:
audience:
type: string
expirationSeconds:
format: int64
type: integer
path:
type: string
required:
- path
type: object
namespaces:
items:
type: string
type: array
topologyKey:
type: string
required:
- topologyKey
type: object
type: array
type: object
Expand Down Expand Up @@ -1855,6 +1860,130 @@ spec:
- resource
type: object
secretKeyRef:
properties:
labelSelector:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
type: object
namespaces:
items:
type: string
type: array
topologyKey:
type: string
required:
- topologyKey
type: object
type: array
type: object
type: object
azblob:
properties:
accessTier:
type: string
container:
type: string
path:
type: string
prefix:
type: string
secretName:
type: string
type: object
backupType:
type: string
br:
properties:
checkRequirements:
type: boolean
checksum:
type: boolean
cluster:
type: string
clusterNamespace:
type: string
concurrency:
format: int32
type: integer
db:
type: string
logLevel:
type: string
onLine:
type: boolean
options:
items:
type: string
type: array
rateLimit:
type: integer
sendCredToTikv:
type: boolean
statusAddr:
type: string
table:
type: string
timeAgo:
type: string
required:
- cluster
type: object
cleanOption:
properties:
batchConcurrency:
format: int32
type: integer
disableBatchConcurrency:
type: boolean
pageSize:
format: int64
type: integer
routineConcurrency:
format: int32
type: integer
type: object
cleanPolicy:
type: string
dumpling:
properties:
options:
items:
type: string
type: array
tableFilter:
items:
type: string
type: array
type: object
env:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
Expand Down Expand Up @@ -17419,6 +17548,9 @@ spec:
type: string
type: array
podManagementPolicy:
enum:
- OrderedReady
- Parallel
type: string
podSecurityContext:
properties:
Expand Down
3 changes: 3 additions & 0 deletions manifests/crd/v1/pingcap.com_tidbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5110,6 +5110,9 @@ spec:
type: string
type: array
podManagementPolicy:
enum:
- OrderedReady
- Parallel
type: string
podSecurityContext:
properties:
Expand Down
3 changes: 3 additions & 0 deletions manifests/crd/v1beta1/pingcap.com_tidbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5104,6 +5104,9 @@ spec:
type: string
type: array
podManagementPolicy:
enum:
- OrderedReady
- Parallel
type: string
podSecurityContext:
properties:
Expand Down
Loading