fix (jkube-kit/resource/helm) : Remove classifier from Helm Chart tarball name (#1369) #2036
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
Eclipse JKube CI ReportStarted new GH workflow run for #2036 (2023-03-24T06:11:23Z) ⚙️ JKube E2E Tests (4508242444)
|
Codecov Report
@@ Coverage Diff @@
## master #2036 +/- ##
============================================
+ Coverage 55.73% 55.76% +0.02%
- Complexity 4284 4289 +5
============================================
Files 481 481
Lines 21211 21218 +7
Branches 2841 2841
============================================
+ Hits 11823 11833 +10
+ Misses 8177 8176 -1
+ Partials 1211 1209 -2
... and 1 file with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
|
E2E tests need to be updated |
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Feb 6, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Feb 6, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Feb 7, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
|
Relates to dekorateio/dekorate#1087 |
|
@manusa : dekorateio/dekorate#1087 seems to make classifier a configurable field with default value as EMPTY string. Shall I modify this PR to add a configurable field for the classifier as well? |
Yes, I think that would keep things consistent in case of an eventual merge + also allow for backwards compatibility in our side. |
rohanKanojia
force-pushed
the
pr/issue1369
branch
3 times, most recently
from
76048ba
to
0484adf
Compare
|
I checked using a Quarkus project. There is some difference in locations where jkube and dekorate generate helm charts: JKube: Dekorate: Do we want to jkube to change it's default locations to be same as dekorate? |
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Feb 27, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
… Helm Chart tarball name (eclipse-jkube#1369) + Add new field in HelmConfig with name tarFileClassifier + Change default location of Helm Chart tarball directory to output directory to avoid collission between K8s and OpenShift helm chart tarballs. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
+ Move Helm documentation out of maven/gradle plugins to JKube Kit + Modify default value of Helm Tarball Output Directory value to be same as Helm Output Directory Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
force-pushed
the
pr/issue1369
branch
from
0484adf
to
9eb7d9d
Compare
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Mar 23, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Mar 23, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
manusa
reviewed
Mar 23, 2023
| @@ -323,4 +324,11 @@ private static List<HelmParameter> collectParameters(HelmConfig helmConfig) { | |||
| }); | |||
| return parameters; | |||
| } | |||
|
|
|||
| private static String resolveHelmClassifier(HelmConfig helmConfig) { | |||
| if (StringUtils.isEmpty(helmConfig.getTarFileClassifier())) { | |||
There was a problem hiding this comment.
note for any subsequent PR, please use isBlank instead, this way we make sure a classifier such as is not considered.
manusa
reviewed
Mar 23, 2023
Comment on lines
50
to
51
| private static File helmK8sOutputDir; | ||
| private static File helmOpenShiftOutputDir; |
There was a problem hiding this comment.
why are these variables static??
|
@manusa : Helm chart was getting generated in Previously, In order to change the default This was causing problems with the case when there was more than one helm type(HelmType.KUBERNETES and HelmType.OPENSHIFT). I have moved tarballOutDir defaulting logic to HelmService so that we can use the helmType provided in that particular helm chart generation iteration. |
Signed-off-by: Marc Nuri <marc@marcnuri.com>
…tection logic to HelmService + Rather than setting default tarballOutputDir in HelmServiceUtil, we should leave it up to HelmService to automatically pick it up since it already has helm type information available. + Remove hardcoded value of tarballOutputDir from HelmServiceIT#setUp method Signed-off-by: Rohan Kumar <rohaan@redhat.com>
Signed-off-by: Marc Nuri <marc@marcnuri.com>
|
Kudos, SonarCloud Quality Gate passed! |
manusa
approved these changes
Mar 24, 2023
manusa
pushed a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Mar 24, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Mar 24, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
added a commit
to rohanKanojia/jkube-integration-tests
that referenced
this pull request
Mar 24, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
added a commit
to eclipse-jkube/jkube-integration-tests
that referenced
this pull request
Mar 24, 2023
Related to eclipse-jkube/jkube#1369 eclipse-jkube/jkube#2036 removes trailing classifier suffixes from generated Helm Archives. It also changes the default location where Helm Archive is generated. Update E2E tests to accomodate this change. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
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.
Description
Fixes #1369
directory to avoid collission between K8s and OpenShift helm chart
tarballs.
Breaking Changes:
k8s:helm/k8sHelmwould no longer contain trailing classifier by default. However, you can add a classifier usingjkube.helm.tarFileClassifierconfiguration field. For example, In previous releases a helm chart namedfoowith version0.0.1hadfoo-0.0.1-helm.tar.gzas archive name. From this release onwards, the name for equivalent archive file would befoo-0.0.1.tar.gzk8s:helm/k8sHelmhas been changed. In previous releases, it was (target/build). From this release onwards, Helm Chart archive would be generated in the same directory where Helm Chart is generated, defaulting to the following values:target/jkube/helm/${chartName}/kubernetesbuild/jkube/helm/${chartName}/kubernetestarget/jkube/helm/${chartName}/openshiftbuild/jkube/helm/${chartName}/openshiftSigned-off-by: Rohan Kumar rohaan@redhat.com
Type of change
test, version modification, documentation, etc.)
Checklist