-
Notifications
You must be signed in to change notification settings - Fork 52
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
iuliana
wants to merge
5
commits into
apache:master
Choose a base branch
from
iuliana:add-helm
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
638c44a
Brings back the helm code
424ac85
upgraded versions to support microbean-helm dependencies
iuliana a53ab4e
upgraded deps that were overriden from master
iuliana c03b7af
upgraded cxf dep
iuliana b9a3970
added comments and new OSGI microhelm bundle
iuliana File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
|
|
||
| # Kubernetes Location | ||
|
|
||
| Brooklyn Container Location has an extensive support for Kubernetes deployments | ||
| In particular, it supports | ||
|
|
||
| - KubernetesResource | ||
| - KubernetesHelmChart | ||
| - KubernetesContainer | ||
|
|
||
| ## Kubernets Helm Chart | ||
|
|
||
| Here's an example of an Helm based blueprint | ||
|
|
||
| ```YAML | ||
| location: | ||
| kubernetes: | ||
| endpoint: https://localhost:6443 | ||
| kubeconfig: /home/user/.kube/config | ||
| services: | ||
| - type: org.apache.brooklyn.container.entity.kubernetes.KubernetesHelmChart | ||
| name: jenkins-helm | ||
| chartName: jenkins | ||
| ``` | ||
|
|
||
| Notice, in this case, it is pointing at a local k8s cluster (created using Docker on Mac) and specify a `kubeconfig` | ||
| file for connection details. | ||
|
|
||
| The `KubernetesHelmChart` entity will install the latest version of the `chart` named `jenkins` from the Chart repository `stable` at `https://kubernetes-charts.storage.googleapis.com/` | ||
| You can install a specific version of the chart by using `chartVersion` config key. | ||
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
36 changes: 36 additions & 0 deletions
36
...er/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesHelmChart.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.brooklyn.container.entity.kubernetes; | ||
|
|
||
| import org.apache.brooklyn.api.entity.ImplementedBy; | ||
| import org.apache.brooklyn.config.ConfigKey; | ||
| import org.apache.brooklyn.core.config.ConfigKeys; | ||
| import org.apache.brooklyn.entity.software.base.SoftwareProcess; | ||
|
|
||
| @ImplementedBy(KubernetesHelmChartImpl.class) | ||
| public interface KubernetesHelmChart extends SoftwareProcess { | ||
|
|
||
| ConfigKey<String> CHART_NAME = ConfigKeys.builder(String.class) | ||
| .name("chartName") | ||
| .description("Helm Chart name") | ||
| .build(); | ||
|
|
||
| ConfigKey<String> CHART_VERSION = ConfigKeys.builder(String.class) | ||
| .name("chartVersion") | ||
| .description("Helm Chart version") | ||
| .build(); | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.