Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Configurable Dekorate integration #36

Merged
merged 1 commit into from
Jan 28, 2020
Merged

feat: Configurable Dekorate integration #36

merged 1 commit into from
Jan 28, 2020

Conversation

manusa
Copy link
Member

@manusa manusa commented Dec 20, 2019

@codecov
Copy link

codecov bot commented Dec 20, 2019 •
edited
Loading

Codecov Report

Merging #36 into master will increase coverage by 0.01%.
The diff coverage is 25%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master      #36      +/-   ##
============================================
+ Coverage     24.46%   24.47%   +0.01%     
- Complexity     1334     1336       +2     
============================================
  Files           326      327       +1     
  Lines         17603    17608       +5     
  Branches       2691     2692       +1     
============================================
+ Hits           4307     4310       +3     
- Misses        12805    12807       +2     
  Partials        491      491
Impacted Files Coverage Δ Complexity Δ
...jkube/maven/enricher/api/MavenEnricherContext.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...ipse/jkube/maven/enricher/api/EnricherContext.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...pse/jkube/kit/common/util/ProjectClassLoaders.java 0% <ø> (ø) 0 <0> (?)
...e/kit/build/service/docker/DockerBuildService.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...rg/eclipse/jkube/kit/common/util/ResourceUtil.java 12.5% <0%> (-0.41%) 1 <0> (ø)
...aven/enricher/api/util/KubernetesResourceUtil.java 17.18% <0%> (-0.04%) 30 <0> (ø)
...clipse/jkube/kit/build/maven/ResourceMojoUtil.java 100% <100%> (ø) 2 <2> (?)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e98ba69...d38465f. Read the comment docs.

@manusa manusa force-pushed the feature/dekorate-integration branch from e42974e to a8acd90 Compare December 23, 2019 07:48
rohanKanojia
rohanKanojia reviewed Dec 23, 2019
View reviewed changes
...aven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ResourceMojo.java Outdated
@@ -260,6 +262,10 @@
@Parameter(property = "jkube.resourceType")
private ResourceFileType resourceFileType = yaml;

// When resource generation is delegated to Dekorate, should fabric8 resources be merged with Dekorate's
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be jkube here?

rohanKanojia
rohanKanojia reviewed Dec 23, 2019
View reviewed changes
...aven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ResourceMojo.java Outdated
@@ -338,6 +344,15 @@ public void executeInternal() throws MojoExecutionException, MojoFailureExceptio
if (skipResource) {
return;
}
if (useDekorate(project) && mergeWithDekorate) {
log.info("Dekorate detected, merging fabric8 and Dekorate resources");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo,

rohanKanojia
rohanKanojia approved these changes Dec 23, 2019
View reviewed changes
Copy link
Member

@rohanKanojia rohanKanojia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@manusa manusa force-pushed the feature/dekorate-integration branch from a8acd90 to 4fc4243 Compare December 23, 2019 10:30
@manusa
Copy link
Member Author

manusa commented Jan 3, 2020 •
edited
Loading

Once fabric8io/fabric8-maven-plugin#1767 gets approved->merged:

  • Port additional changes

@manusa manusa force-pushed the feature/dekorate-integration branch from 4fc4243 to 22cb6ed Compare January 24, 2020 17:25
@manusa
Copy link
Member Author

manusa commented Jan 24, 2020

All requested changes in fabric8io/fabric8-maven-plugin#1767 have been ported.
PR is ready.

@rohanKanojia
Copy link
Member

Thanks, I approved it during previous review too 😆 . Shall we merge this then?

@manusa
feat: Configurable Dekorate integration
d38465f 
Signed-off-by: Marc Nuri <marc@marcnuri.com>
@manusa manusa force-pushed the feature/dekorate-integration branch from 22cb6ed to d38465f Compare January 28, 2020 16:00
@sonarcloud
Copy link

sonarcloud bot commented Jan 28, 2020

SonarCloud Quality Gate failed.

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
12.2% 12.2% Duplication

@manusa
Copy link
Member Author

manusa commented Jan 28, 2020

Thanks, I approved it during previous review too . Shall we merge this then?

Yes please, IT tests are green again after eclipse-jkube/jkube-integration-tests#9

@rohanKanojia rohanKanojia merged commit ef880c6 into eclipse-jkube:master Jan 28, 2020
@manusa manusa deleted the feature/dekorate-integration branch January 29, 2020 05:57
@manusa manusa mentioned this pull request Apr 9, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohanKanojia rohanKanojia rohanKanojia approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@manusa @rohanKanojia