Skip to content

Commit

Permalink
Use sources: [new, existing] in PVC rebase config
Browse files Browse the repository at this point in the history
  • Loading branch information
yujunz committed Apr 16, 2020
1 parent 0f0f1b1 commit 3370a9c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions docs/rebase-pvc.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,20 @@ kind: Config
rebaseRules:
- path: [metadata, annotations, pv.kubernetes.io/bind-completed]
type: copy
sources: [existing]
sources: [new, existing]
resourceMatchers: &pvcs
- apiVersionKindMatcher:
apiVersion: v1
kind: PersistentVolumeClaim
- path: [metadata, annotations, pv.kubernetes.io/bound-by-controller]
type: copy
sources: [existing]
sources: [new, existing]
resourceMatchers: *pvcs
- path: [metadata, annotations, volume.beta.kubernetes.io/storage-provisioner]
type: copy
sources: [existing]
sources: [new, existing]
resourceMatchers: *pvcs
- path: [spec, volumeMode]
Expand Down
6 changes: 3 additions & 3 deletions pkg/kapp/config/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,20 @@ rebaseRules:
# PVC
- path: [metadata, annotations, pv.kubernetes.io/bind-completed]
type: copy
sources: [existing]
sources: [new, existing]
resourceMatchers: &pvcs
- apiVersionKindMatcher:
apiVersion: v1
kind: PersistentVolumeClaim
- path: [metadata, annotations, pv.kubernetes.io/bound-by-controller]
type: copy
sources: [existing]
sources: [new, existing]
resourceMatchers: *pvcs
- path: [metadata, annotations, volume.beta.kubernetes.io/storage-provisioner]
type: copy
sources: [existing]
sources: [new, existing]
resourceMatchers: *pvcs
- path: [spec, storageClassName]
Expand Down

0 comments on commit 3370a9c

Please sign in to comment.