karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2415 from Garrybest/pr_pv 

retain PersistentVolume fields
This commit is contained in:
karmada-bot 2022-08-26 09:27:54 +08:00 committed by GitHub
parent 2daaa2d8c7 7b7428fb9e
commit f70fe8a0e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/resourceinterpreter/defaultinterpreter/retain.go
View File

@ -22,6 +22,7 @@ func getAllDefaultRetentionInterpreter() map[schema.GroupVersionKind]retentionIn
s[corev1.SchemeGroupVersion.WithKind(util.ServiceKind)] = lifted.RetainServiceFields s[corev1.SchemeGroupVersion.WithKind(util.ServiceKind)] = lifted.RetainServiceFields
s[corev1.SchemeGroupVersion.WithKind(util.ServiceAccountKind)] = lifted.RetainServiceAccountFields s[corev1.SchemeGroupVersion.WithKind(util.ServiceAccountKind)] = lifted.RetainServiceAccountFields
s[corev1.SchemeGroupVersion.WithKind(util.PersistentVolumeClaimKind)] = retainPersistentVolumeClaimFields s[corev1.SchemeGroupVersion.WithKind(util.PersistentVolumeClaimKind)] = retainPersistentVolumeClaimFields
s[corev1.SchemeGroupVersion.WithKind(util.PersistentVolumeKind)] = retainPersistentVolumeFields
s[batchv1.SchemeGroupVersion.WithKind(util.JobKind)] = retainJobSelectorFields s[batchv1.SchemeGroupVersion.WithKind(util.JobKind)] = retainJobSelectorFields
return s return s
} }
@ -74,6 +75,20 @@ func retainPersistentVolumeClaimFields(desired, observed *unstructured.Unstructu
return desired, nil return desired, nil
} }
func retainPersistentVolumeFields(desired, observed *unstructured.Unstructured) (*unstructured.Unstructured, error) {
// claimRef is updated by kube-controller-manager.
claimRef, ok, err := unstructured.NestedFieldNoCopy(observed.Object, "spec", "claimRef")
if err != nil {
return nil, fmt.Errorf("failed to retrieve claimRef from pv: %v", err)
}
if ok {
if err = unstructured.SetNestedField(desired.Object, claimRef, "spec", "claimRef"); err != nil {
return nil, fmt.Errorf("failed to set claimRef for pv: %v", err)
}
}
return desired, nil
}
func retainJobSelectorFields(desired, observed *unstructured.Unstructured) (*unstructured.Unstructured, error) { func retainJobSelectorFields(desired, observed *unstructured.Unstructured) (*unstructured.Unstructured, error) {
matchLabels, exist, err := unstructured.NestedStringMap(observed.Object, "spec", "selector", "matchLabels") matchLabels, exist, err := unstructured.NestedStringMap(observed.Object, "spec", "selector", "matchLabels")
if err != nil { if err != nil {