ignore terminating resources while doing a backup #526
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yastij
force-pushed
the
ignore-resources-terminating
branch
2 times, most recently
from
2fef837 to
dbc67d7
Compare
yastij
changed the title
yastij
force-pushed
the
ignore-resources-terminating
branch
from
dbc67d7 to
111e82e
Compare
yastij
changed the title
ncdc
reviewed
Jun 4, 2018
pkg/backup/item_backupper.go
Outdated
| @@ -147,6 +147,22 @@ func (ib *defaultItemBackupper) backupItem(logger logrus.FieldLogger, obj runtim | |||
| return nil | |||
| } | |||
|
|
|||
| resource := obj.UnstructuredContent() | |||
| if conditions, err := collections.GetSlice(resource, "status.conditions"); err != nil { | |||
There was a problem hiding this comment.
I think checking for metadata.deletionTimestamp != nil would be more universal - WDYT?
yastij
force-pushed
the
ignore-resources-terminating
branch
from
111e82e to
7c539eb
Compare
|
@ncdc - updated |
ncdc
reviewed
Jun 4, 2018
pkg/backup/item_backupper.go
Outdated
| @@ -147,6 +147,12 @@ func (ib *defaultItemBackupper) backupItem(logger logrus.FieldLogger, obj runtim | |||
| return nil | |||
| } | |||
|
|
|||
| resource := obj.UnstructuredContent() | |||
| if deletionTimestamp, err := collections.GetString(resource, "metadata.deletionTimestamp"); err == nil { | |||
There was a problem hiding this comment.
You can use metadata.GetDeletionTimestamp()
ncdc
reviewed
Jun 4, 2018
pkg/backup/item_backupper_test.go
Outdated
| func TestBackupItemWhenInTerminatingStatus(t *testing.T) { | ||
| f := true | ||
| ib := &defaultItemBackupper{ | ||
| backup: &v1.Backup{ |
There was a problem hiding this comment.
You should be able to do &v1.Backup{} - any reason you needed IncludeClusterResources?
ncdc
reviewed
Jun 4, 2018
pkg/backup/item_backupper_test.go
Outdated
| ib := &defaultItemBackupper{ | ||
| backup: &v1.Backup{ | ||
| Spec: v1.BackupSpec{ | ||
| IncludeClusterResources: &f, |
There was a problem hiding this comment.
If you do need to keep this, use boolptr.True()
ncdc
reviewed
Jun 4, 2018
pkg/backup/item_backupper_test.go
Outdated
| resources: collections.NewIncludesExcludes(), | ||
| } | ||
|
|
||
| u := unstructuredOrDie(`{"apiVersion":"v1","kind":"Foo","metadata":{"name":"bar", "namespace": "test", "deletionTimestamp": "timestamp"}, "status": { |
There was a problem hiding this comment.
Please use a real deletionTimestamp. You can probably remove the conditions too.
ncdc
reviewed
Jun 4, 2018
pkg/backup/item_backupper_test.go
Outdated
| @@ -123,6 +123,35 @@ func TestBackupItemSkipsClusterScopedResourceWhenIncludeClusterResourcesFalse(t | |||
| assert.NoError(t, err) | |||
| } | |||
|
|
|||
| func TestBackupItemWhenInTerminatingStatus(t *testing.T) { | |||
There was a problem hiding this comment.
Please put this in TestBackupItemSkips
yastij
force-pushed
the
ignore-resources-terminating
branch
from
7c539eb to
7cdd559
Compare
ncdc
reviewed
Jun 6, 2018
pkg/backup/item_backupper.go
Outdated
| @@ -147,6 +147,9 @@ func (ib *defaultItemBackupper) backupItem(logger logrus.FieldLogger, obj runtim | |||
| return nil | |||
| } | |||
|
|
|||
| if metadata.GetDeletionTimestamp() != nil { | |||
| return nil | |||
There was a problem hiding this comment.
Let's log.Info that we're skipping it because it's being deleted.
pkg/backup/item_backupper_test.go
Outdated
| @@ -99,7 +109,12 @@ func TestBackupItemSkips(t *testing.T) { | |||
| backedUpItems: test.backedUpItems, | |||
| } | |||
|
|
|||
| u := unstructuredOrDie(fmt.Sprintf(`{"apiVersion":"v1","kind":"Pod","metadata":{"namespace":"%s","name":"%s"}}`, test.namespace, test.name)) | |||
| var deletionTimestamp string | |||
There was a problem hiding this comment.
Maybe we should use an actual Pod and then the unstructured converter so we're not conditionally modifying json...
yastij
force-pushed
the
ignore-resources-terminating
branch
3 times, most recently
from
53e5b4a to
7bccb54
Compare
ncdc
reviewed
Jun 8, 2018
pkg/backup/item_backupper_test.go
Outdated
| if test.terminating { | ||
| pod.ObjectMeta.DeletionTimestamp = &metav1.Time{Time: time.Now()} | ||
| } | ||
| unstructuredObj, _ := runtime.DefaultUnstructuredConverter.ToUnstructured(pod) |
There was a problem hiding this comment.
Can you require.NoError on the returned error?
Signed-off-by: Yassine TIJANI <[email protected]>
yastij
force-pushed
the
ignore-resources-terminating
branch
from
7bccb54 to
17f6a14
Compare
|
@ncdc - ready to merge |
|
LGTM, thanks @yastij! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this PR fixes #524