Skip to content

Commit 74c0105

Browse files
Madhu-1Madhu-1
authored
Merge pull request #539 from ceph/mergify/bp/release-1.0/pr-538
remove the default replicas from validation (backport #538)
2 parents 6499639 + 172fe2b commit 74c0105

9 files changed

Lines changed: 48 additions & 48 deletions

File tree

‎api/v1/driver_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ type ControllerPluginSpec struct {
229229
//+kubebuilder:validation:Optional
230230
DeploymentStrategy *appsv1.DeploymentStrategy `json:"deploymentStrategy,omitempty"`
231231

232-
// Set replicas for controller plugin's deployment. Defaults to 2.
233-
// On single-node clusters, the operator automatically caps the replica
234-
// count to the number of available nodes when this field is not set.
232+
// Set replicas for controller plugin's deployment.
233+
// If not set, defaults to 2 or to the number of available nodes
234+
// on single-node clusters. When OperatorConfig specifies a replica
235+
// count, it is used as the default for all drivers.
235236
//+kubebuilder:validation:Optional
236237
//+kubebuilder:validation:Minimum:=1
237-
//+kubebuilder:default:=2
238238
Replicas *int32 `json:"replicas,omitempty"`
239239

240240
// Resource requirements for controller plugin's containers

‎config/crd/bases/csi.ceph.io_drivers.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,11 +1076,11 @@ spec:
10761076
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
10771077
type: boolean
10781078
replicas:
1079-
default: 2
10801079
description: |-
1081-
Set replicas for controller plugin's deployment. Defaults to 2.
1082-
On single-node clusters, the operator automatically caps the replica
1083-
count to the number of available nodes when this field is not set.
1080+
Set replicas for controller plugin's deployment.
1081+
If not set, defaults to 2 or to the number of available nodes
1082+
on single-node clusters. When OperatorConfig specifies a replica
1083+
count, it is used as the default for all drivers.
10841084
format: int32
10851085
minimum: 1
10861086
type: integer

‎config/crd/bases/csi.ceph.io_operatorconfigs.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,11 +1085,11 @@ spec:
10851085
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
10861086
type: boolean
10871087
replicas:
1088-
default: 2
10891088
description: |-
1090-
Set replicas for controller plugin's deployment. Defaults to 2.
1091-
On single-node clusters, the operator automatically caps the replica
1092-
count to the number of available nodes when this field is not set.
1089+
Set replicas for controller plugin's deployment.
1090+
If not set, defaults to 2 or to the number of available nodes
1091+
on single-node clusters. When OperatorConfig specifies a replica
1092+
count, it is used as the default for all drivers.
10931093
format: int32
10941094
minimum: 1
10951095
type: integer

‎deploy/all-in-one/install-openshift.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,11 +1414,11 @@ spec:
14141414
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
14151415
type: boolean
14161416
replicas:
1417-
default: 2
14181417
description: |-
1419-
Set replicas for controller plugin's deployment. Defaults to 2.
1420-
On single-node clusters, the operator automatically caps the replica
1421-
count to the number of available nodes when this field is not set.
1418+
Set replicas for controller plugin's deployment.
1419+
If not set, defaults to 2 or to the number of available nodes
1420+
on single-node clusters. When OperatorConfig specifies a replica
1421+
count, it is used as the default for all drivers.
14221422
format: int32
14231423
minimum: 1
14241424
type: integer
@@ -8629,11 +8629,11 @@ spec:
86298629
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
86308630
type: boolean
86318631
replicas:
8632-
default: 2
86338632
description: |-
8634-
Set replicas for controller plugin's deployment. Defaults to 2.
8635-
On single-node clusters, the operator automatically caps the replica
8636-
count to the number of available nodes when this field is not set.
8633+
Set replicas for controller plugin's deployment.
8634+
If not set, defaults to 2 or to the number of available nodes
8635+
on single-node clusters. When OperatorConfig specifies a replica
8636+
count, it is used as the default for all drivers.
86378637
format: int32
86388638
minimum: 1
86398639
type: integer

‎deploy/all-in-one/install.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,11 +1414,11 @@ spec:
14141414
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
14151415
type: boolean
14161416
replicas:
1417-
default: 2
14181417
description: |-
1419-
Set replicas for controller plugin's deployment. Defaults to 2.
1420-
On single-node clusters, the operator automatically caps the replica
1421-
count to the number of available nodes when this field is not set.
1418+
Set replicas for controller plugin's deployment.
1419+
If not set, defaults to 2 or to the number of available nodes
1420+
on single-node clusters. When OperatorConfig specifies a replica
1421+
count, it is used as the default for all drivers.
14221422
format: int32
14231423
minimum: 1
14241424
type: integer
@@ -8629,11 +8629,11 @@ spec:
86298629
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
86308630
type: boolean
86318631
replicas:
8632-
default: 2
86338632
description: |-
8634-
Set replicas for controller plugin's deployment. Defaults to 2.
8635-
On single-node clusters, the operator automatically caps the replica
8636-
count to the number of available nodes when this field is not set.
8633+
Set replicas for controller plugin's deployment.
8634+
If not set, defaults to 2 or to the number of available nodes
8635+
on single-node clusters. When OperatorConfig specifies a replica
8636+
count, it is used as the default for all drivers.
86378637
format: int32
86388638
minimum: 1
86398639
type: integer

‎deploy/charts/ceph-csi-operator/templates/driver-crd.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,11 +1076,11 @@ spec:
10761076
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
10771077
type: boolean
10781078
replicas:
1079-
default: 2
10801079
description: |-
1081-
Set replicas for controller plugin's deployment. Defaults to 2.
1082-
On single-node clusters, the operator automatically caps the replica
1083-
count to the number of available nodes when this field is not set.
1080+
Set replicas for controller plugin's deployment.
1081+
If not set, defaults to 2 or to the number of available nodes
1082+
on single-node clusters. When OperatorConfig specifies a replica
1083+
count, it is used as the default for all drivers.
10841084
format: int32
10851085
minimum: 1
10861086
type: integer

‎deploy/charts/ceph-csi-operator/templates/operatorconfig-crd.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,11 +1082,11 @@ spec:
10821082
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
10831083
type: boolean
10841084
replicas:
1085-
default: 2
10861085
description: |-
1087-
Set replicas for controller plugin's deployment. Defaults to 2.
1088-
On single-node clusters, the operator automatically caps the replica
1089-
count to the number of available nodes when this field is not set.
1086+
Set replicas for controller plugin's deployment.
1087+
If not set, defaults to 2 or to the number of available nodes
1088+
on single-node clusters. When OperatorConfig specifies a replica
1089+
count, it is used as the default for all drivers.
10901090
format: int32
10911091
minimum: 1
10921092
type: integer

‎deploy/multifile/crd.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,11 +1405,11 @@ spec:
14051405
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
14061406
type: boolean
14071407
replicas:
1408-
default: 2
14091408
description: |-
1410-
Set replicas for controller plugin's deployment. Defaults to 2.
1411-
On single-node clusters, the operator automatically caps the replica
1412-
count to the number of available nodes when this field is not set.
1409+
Set replicas for controller plugin's deployment.
1410+
If not set, defaults to 2 or to the number of available nodes
1411+
on single-node clusters. When OperatorConfig specifies a replica
1412+
count, it is used as the default for all drivers.
14131413
format: int32
14141414
minimum: 1
14151415
type: integer
@@ -8620,11 +8620,11 @@ spec:
86208620
For example, OpenShift with SELinux restrictions requires the pod to be privileged to write to hostPath.
86218621
type: boolean
86228622
replicas:
8623-
default: 2
86248623
description: |-
8625-
Set replicas for controller plugin's deployment. Defaults to 2.
8626-
On single-node clusters, the operator automatically caps the replica
8627-
count to the number of available nodes when this field is not set.
8624+
Set replicas for controller plugin's deployment.
8625+
If not set, defaults to 2 or to the number of available nodes
8626+
on single-node clusters. When OperatorConfig specifies a replica
8627+
count, it is used as the default for all drivers.
86288628
format: int32
86298629
minimum: 1
86308630
type: integer

‎vendor/github.com/ceph/ceph-csi-operator/api/v1/driver_types.go‎

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

0 commit comments

Comments
 (0)