Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Prevent resource patching when applying in dry-run mode#902

Merged
shomron merged 1 commit intoksonnet:masterfrom
shomron:dry-run
Jan 4, 2019
Merged

Prevent resource patching when applying in dry-run mode#902
shomron merged 1 commit intoksonnet:masterfrom
shomron:dry-run

Conversation

@shomron
Copy link
Collaborator

@shomron shomron commented Jan 4, 2019

Fixes #615

Signed-off-by: Oren Shomron shomron@gmail.com

Before fix

$ k create -f kuard.yaml
pod/kuard created
$ k get -o yaml pod/kuard | yq .metadata.labels
null
$ ks apply --dry-run default
INFO tagging ksonnet managed object (dry-run)
INFO upserting object (dry-run)
$ k get -o yaml pod/kuard | yq .metadata.labels
{
  "ksonnet.io/component": "kuard"
}

After fix

$ k delete -f kuard.yaml
pod "kuard" deleted
$ k create -f kuard.yaml
pod/kuard created
$ k get -o yaml pod/kuard | yq .metadata.labels
null
$ ksdev apply --dry-run default
INFO tagging ksonnet managed object (dry-run)
INFO upserting object (dry-run)
$ k get -o yaml pod/kuard | yq .metadata.labels
null

@shomron shomron requested a review from bryanl January 4, 2019 15:58
@bryanl
Copy link
Member

bryanl commented Jan 4, 2019

@shomron could you check the build?

@shomron
Prevent resource patching when applying in dry-run mode
7ea77a0 
Fixes ksonnet#615

Signed-off-by: Oren Shomron <shomron@gmail.com>
@coveralls
Copy link

coveralls commented Jan 4, 2019

Pull Request Test Coverage Report for Build 1385

  • 10 of 21 (47.62%) changed or added relevant lines in 4 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.03%) to 70.511%
Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/cluster/apply.go 0 1 0.0%
pkg/cluster/merger.go 7 17 41.18%
Totals Coverage Status
Change from base Build 1384: -0.03%
Covered Lines: 12587
Relevant Lines: 17851
💛 - Coveralls

@shomron
Copy link
Collaborator Author

shomron commented Jan 4, 2019

@bryanl sorry about that - should be resolved.

@shomron shomron merged commit 6bb3cd0 into ksonnet:master Jan 4, 2019
@shomron shomron deleted the dry-run branch January 4, 2019 19:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@bryanl bryanl bryanl approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ksonnet changes objects even in dry-run mode

3 participants

@shomron @bryanl @coveralls