Skip to content

Commit

Permalink
PB-7859: Add node affinity for kdmp live backup job pods with ROX or …
Browse files Browse the repository at this point in the history
…RWX pvc
  • Loading branch information
shkumari-px committed Aug 16, 2024
1 parent 22b4371 commit b4aa9e7
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 4 deletions.
35 changes: 35 additions & 0 deletions deploy/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: kdmp-operator
namespace: kube-system
labels:
name: kdmp-operator
spec:
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
replicas: 1
selector:
matchLabels:
name: kdmp-operator
template:
metadata:
labels:
name: kdmp-operator
spec:
containers:
- name: kdmp-operator
image: portworx/kdmp:latest
imagePullPolicy: Always
resources:
requests:
cpu: 0.5
memory: 200Mi
limits:
cpu: 1
memory: 500Mi
serviceAccountName: kdmp-operator
22 changes: 18 additions & 4 deletions pkg/drivers/kopiabackup/kopiabackup.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,6 @@ func jobFor(
}
}

if len(nodeName) != 0 {
job.Spec.Template.Spec.NodeName = nodeName
}

// Add the image secret in job spec only if it is present in the stork deployment.
if len(imageRegistrySecret) != 0 {
job.Spec.Template.Spec.ImagePullSecrets = utils.ToImagePullSecret(utils.GetImageSecretName(jobName))
Expand All @@ -417,6 +413,24 @@ func jobFor(
if err != nil {
return nil, err
}
} else {
accessModes, err := utils.GetAccessModeFromPvc(jobOption.SourcePVCName, jobOption.SourcePVCNamespace)
if err != nil {
return nil, err
}
for _, val := range accessModes {
if val == "ReadOnlyMany" || val == "ReadWriteMany" {
job, err = utils.AddNodeAffinityToJob(job, jobOption)
if err != nil {
return nil, err
}
break
}
}

if job.Spec.Template.Spec.Affinity == nil && len(nodeName) != 0 {
job.Spec.Template.Spec.NodeName = nodeName
}
}

if len(jobOption.NfsServer) != 0 {
Expand Down
9 changes: 9 additions & 0 deletions pkg/drivers/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -1168,3 +1168,12 @@ func AddNodeAffinityToJob(job *batchv1.Job, jobOption drivers.JobOpts) (*batchv1
}
return job, nil
}

func GetAccessModeFromPvc(srcPvcName, srcPvcNameSpace string) ([]corev1.PersistentVolumeAccessMode, error) {
srcPvc, err := core.Instance().GetPersistentVolumeClaim(srcPvcName, srcPvcNameSpace)
if err != nil {
return nil, err
}
accessModes := srcPvc.Spec.AccessModes
return accessModes, nil
}

0 comments on commit b4aa9e7

Please sign in to comment.