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

Feat: Helm Chart Local Installation Support #1088

Merged
merged 5 commits into from
Sep 15, 2022

Conversation

daniel-hutao
Copy link
Member

@daniel-hutao daniel-hutao commented Sep 14, 2022

Pre-Checklist

Note: please complete ALL items in the following checklist.

  • I have read through the CONTRIBUTING.md documentation.
  • My code has the necessary comments and documentation (if needed).
  • I have added relevant tests

Description

New feat with helm chart local installation

Related Issues

#1084

New Behavior (screenshots if needed)

  • Apply without Internet

image

  • Config file was used
---
# core config
varFile: "" # If not empty, use the specified external variables config file
toolFile: "" # If not empty, use the specified external tools config file
pluginDir: "~/.devstream/plugins"
state: # state config, backend can be local or s3
  backend: local
  options:
    stateFile: devstream.state

---
tools:
# name of the tool
- name: jenkins
  # id of the tool instance
  instanceID: default
  # format: name.instanceID; If specified, dtm will make sure the dependency is applied first before handling this tool.
  dependsOn: [ ]
  # options for the plugin
  options:
    # Helm repo information
    repo:
      # name of the Helm repo
      name: jenkins
      # url of the Helm repo
      url: https://charts.jenkins.io
    # Helm chart information
    chart:
      # local path of the chart; if chartPath != "", repo.name and repo.url will be ignored. e.g. "foo.tgz", "./foo.tgz", "/tmp/foo.tgz"
      chartPath: "./jenkins-4.2.1.tgz"
      # name of the chart
      chartName: jenkins/jenkins
      # k8s namespace where jenkins will be installed
      namespace: jenkins
      # whether to wait for the release to be deployed or not
      wait: true
      # the time to wait for any individual Kubernetes operation (like Jobs for hooks). This defaults to 5m0s
      timeout: 5m
      # whether to perform a CRD upgrade during installation
      upgradeCRDs: true
      # custom configuration. You can refer to [Jenkins values.yaml](https://github.com/jenkinsci/helm-charts/blob/main/charts/jenkins/values.yaml)
      valuesYaml: |
        persistence:
          storageClass: ""
        serviceAccount:
          create: true
          name: jenkins
        controller:
          adminUser: "admin"
          adminPassword: "changeme"
          serviceType: NodePort
          nodePort: 32000

Signed-off-by: Daniel Hu <tao.hu@merico.dev>
Signed-off-by: Daniel Hu <tao.hu@merico.dev>
Signed-off-by: Daniel Hu <tao.hu@merico.dev>
@daniel-hutao daniel-hutao marked this pull request as ready for review September 14, 2022 11:20
@daniel-hutao daniel-hutao requested review from IronCore864 and a team as code owners September 14, 2022 11:20
pkg/util/helm/local.go Outdated Show resolved Hide resolved
pkg/util/helm/local.go Outdated Show resolved Hide resolved
pkg/util/helm/local.go Outdated Show resolved Hide resolved
pkg/util/helm/local.go Outdated Show resolved Hide resolved
pkg/util/helm/local.go Outdated Show resolved Hide resolved
pkg/util/helm/local.go Outdated Show resolved Hide resolved
Copy link
Member

@iyear iyear left a comment

Choose a reason for hiding this comment

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

LGTM 👏

Signed-off-by: Daniel Hu <tao.hu@merico.dev>
@daniel-hutao
Copy link
Member Author

@iyear I've updated. Thanks for your great feedback.

@aFlyBird0
Copy link
Member

I‘m reviewing, please do not merge until my review is finished.

@aFlyBird0 aFlyBird0 self-assigned this Sep 15, 2022
@aFlyBird0 aFlyBird0 self-requested a review September 15, 2022 02:26
internal/pkg/plugin/argocd/argocd.go Show resolved Hide resolved
pkg/util/helm/local.go Outdated Show resolved Hide resolved
pkg/util/helm/local.go Show resolved Hide resolved
Signed-off-by: Daniel Hu <tao.hu@merico.dev>
@daniel-hutao
Copy link
Member Author

daniel-hutao commented Sep 15, 2022

@aFlyBird0 Please take a look again. I've merge the copy function in the commit c28ef1b.

@aFlyBird0 aFlyBird0 removed their assignment Sep 15, 2022
@daniel-hutao daniel-hutao merged commit 25bf290 into devstream-io:main Sep 15, 2022
@daniel-hutao daniel-hutao deleted the feat-air-gapped branch September 15, 2022 04:46
@iyear iyear mentioned this pull request Sep 16, 2022
3 tasks
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.

3 participants