Skip to content

Commit 4b144fb

Browse files
committed
updateStrategy and Pod scheduling changes
Signed-off-by: Ambika Nair <[email protected]>
1 parent 5d06018 commit 4b144fb

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

config/samples/csi_v1alpha1_ibmobjectcsi.yaml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,26 @@ spec:
2222
cpu: 40m
2323
memory: 40Mi
2424
affinity:
25+
podAntiAffinity:
26+
preferredDuringSchedulingIgnoredDuringExecution:
27+
- podAffinityTerm:
28+
labelSelector:
29+
matchExpressions:
30+
- key: app.kubernetes.io/component
31+
operator: In
32+
values:
33+
- controller
34+
topologyKey: topology.kubernetes.io/zone
35+
weight: 100
36+
- podAffinityTerm:
37+
labelSelector:
38+
matchExpressions:
39+
- key: app.kubernetes.io/component
40+
operator: In
41+
values:
42+
- controller
43+
topologyKey: topology.kubernetes.io/zone
44+
weight: 100
2545
nodeAffinity:
2646
requiredDuringSchedulingIgnoredDuringExecution:
2747
nodeSelectorTerms:
@@ -37,18 +57,6 @@ spec:
3757
repository: icr.io/ibm/ibm-object-csi-driver
3858
tag: "v0.1.8"
3959
imagePullPolicy: Always
40-
affinity:
41-
nodeAffinity:
42-
requiredDuringSchedulingIgnoredDuringExecution:
43-
nodeSelectorTerms:
44-
- matchExpressions:
45-
- key: kubernetes.io/arch
46-
operator: In
47-
values:
48-
- amd64
49-
50-
tolerations:
51-
- operator: Exists
5260

5361
sidecars:
5462
- name: csi-node-driver-registrar

controllers/syncer/csi_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ func NewCSIControllerSyncer(c client.Client, driver *crutils.IBMObjectCSI) synce
4444
},
4545
Spec: corev1.PodSpec{},
4646
},
47+
MinReadySeconds: 30,
4748
},
4849
}
4950

controllers/syncer/csi_node.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ func NewCSINodeSyncer(c client.Client, driver *crutils.IBMObjectCSI) syncer.Inte
4444
},
4545
Spec: corev1.PodSpec{},
4646
},
47+
MinReadySeconds: 30,
48+
UpdateStrategy: appsv1.DaemonSetUpdateStrategy{
49+
Type: appsv1.RollingUpdateDaemonSetStrategyType,
50+
RollingUpdate: &appsv1.RollingUpdateDaemonSet{
51+
MaxUnavailable: func(i intstr.IntOrString) *intstr.IntOrString { return &i }(intstr.FromString("100%")),
52+
},
53+
},
4754
},
4855
}
4956

0 commit comments

Comments
 (0)