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.

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

WIP: Brings back the helm code #1100

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Conversation

iuliana
Copy link
Contributor

@iuliana iuliana commented May 18, 2020

Revert "Revert "This closes #830""
This reverts commit 4236ff2.

Added a few changes, played around with the version to avoid conflicts and added OSGI setup.

Duncan Grant and others added 2 commits May 18, 2020 16:56
pom.xml Outdated
@@ -105,7 +105,7 @@
<logback.version>1.2.3</logback.version>
<slf4j.version>1.7.25</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
<!-- Must match jclouds' version. From jclouds 1.9.3+ can be any version in the range [16-20) -->
<guava.version>18.0</guava.version>
<guava.version>19.0</guava.version>
Copy link
Contributor

Choose a reason for hiding this comment

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

comment about helm needing v19 minimum (if that is the case)

Copy link
Contributor Author

@iuliana iuliana May 25, 2020

Choose a reason for hiding this comment

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

Yeap, all dependency upgrades in the root pom were caued because Microbean Helm requires them. :(
I will add a comment.

pom.xml Outdated Show resolved Hide resolved
<!-- (4) -->
<!-- these are the main required bundles for these features above -->
<bundle>mvn:io.fabric8/zjsonpatch/0.3.0</bundle>
<bundle>mvn:io.fabric8/kubernetes-model/${kubernetes-client.version}</bundle>
<bundle>mvn:io.fabric8/kubernetes-client/${kubernetes-client.version}/jar/bundle</bundle>
<bundle>mvn:io.fabric8/openshift-client/${kubernetes-client.version}/jar/bundle</bundle>

<bundle dependency='true'>wrap:mvn:org.microbean/microbean-helm/2.12.4-SNAPSHOT/jar/$Bundle-SymbolicName=microbean-helm&amp;Bundle-Version=2.12.4-SNAPSHOT&amp;Import-Package=*;resolution:=mandatory</bundle>
Copy link
Contributor

Choose a reason for hiding this comment

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

comment that all these are needed for microbean

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

@ahgittin
Copy link
Contributor

Awesome stuff!

Hellish dependencies. But if you got it working, let's merge once comments are addressed.

Mainly it's comments to help us in future though there is one bit about cross-platform builds that needs to be checked.

In future it might be nicer to jarjar the odd helm deps in a separate project rather than pull them all in here via OSGi. But not worth the effort if you have it working.

One other question, do you have an Apache contributor license agreement @iuliana ?

services:
- type: org.apache.brooklyn.container.entity.kubernetes.KubernetesHelmChart
name: jenkins-helm
chartName: jenkins
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a way to load a chart embedded in a BOM? that would be handy to document here.

Copy link
Contributor Author

@iuliana iuliana May 25, 2020

Choose a reason for hiding this comment

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

Not sure yet, solving the dependency hell is still ongoing.

@iuliana
Copy link
Contributor Author

iuliana commented May 26, 2020

Putting a break on this because of the hellish dependencies.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants