From 0e78f0e4a7be89589a24ba217888d06b733f27c2 Mon Sep 17 00:00:00 2001 From: Shihab Hasan Date: Wed, 8 Jan 2025 12:38:11 -0600 Subject: [PATCH 1/5] more helm functions --- go.mod | 2 +- go.sum | 13 ++-- pkg/helm/helm.go | 160 ++++++++++++++++++++++++++++++++++++++++++ pkg/helm/helm_test.go | 24 ++++++- 4 files changed, 189 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 2188b13..fa8be0e 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.23.0 require ( github.com/google/uuid v1.6.0 + github.com/gorilla/websocket v1.5.0 github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0 github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.27.0 @@ -68,7 +69,6 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/gorilla/mux v1.8.0 // indirect - github.com/gorilla/websocket v1.5.0 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect diff --git a/go.sum b/go.sum index 29f9145..4e753bb 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,7 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= @@ -412,8 +411,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -530,15 +529,13 @@ k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2S k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY= -k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg= +k8s.io/apiserver v0.32.0 h1:VJ89ZvQZ8p1sLeiWdRJpRD6oLozNZD2+qVSLi+ft5Qs= k8s.io/apiserver v0.32.0/go.mod h1:HFh+dM1/BE/Hm4bS4nTXHVfN6Z6tFIZPi649n83b4Ag= k8s.io/cli-runtime v0.31.3 h1:fEQD9Xokir78y7pVK/fCJN090/iYNrLHpFbGU4ul9TI= k8s.io/cli-runtime v0.31.3/go.mod h1:Q2jkyTpl+f6AtodQvgDI8io3jrfr+Z0LyQBPJJ2Btq8= k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= -k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ= -k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU= +k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU= k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index 82f4d79..5c10885 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -9,6 +9,7 @@ import ( "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/repo" "os" + "path/filepath" "strings" ) @@ -218,6 +219,7 @@ func (h *HelmClient) RemoveRepo(name string) error { return repositories.WriteFile(repoFile, 0644) } +// ListChartsInRepo list all charts and versions of a repo func (h *HelmClient) ListChartsInRepo(repoName string) (map[string]repo.ChartVersions, error) { repoFile := h.settings.RepositoryConfig @@ -262,6 +264,125 @@ func (h *HelmClient) ListChartsInRepo(repoName string) (map[string]repo.ChartVer return indexFile.Entries, nil } +// GetChartValues fetches the values of a chart +func (h *HelmClient) GetChartValues(repoName, chartName, chartVersion string) (map[string]interface{}, error) { + // Load the repository configuration + repoFile := h.settings.RepositoryConfig + repositories, err := repo.LoadFile(repoFile) + if err != nil { + return nil, fmt.Errorf("failed to load repositories file: %w", err) + } + + // Find the specified repository + var foundEntry *repo.Entry + for _, entry := range repositories.Repositories { + if entry.Name == repoName { + foundEntry = entry + break + } + } + + if foundEntry == nil { + return nil, fmt.Errorf("repository %q not found", repoName) + } + + // Initialize the repository + chartRepo, err := repo.NewChartRepository(foundEntry, getter.All(h.settings)) + if err != nil { + return nil, fmt.Errorf("failed to create chart repository: %w", err) + } + + // Download the index file to locate the chart + tempDir, err := os.MkdirTemp("", "helm-repo") + if err != nil { + return nil, fmt.Errorf("failed to create temporary directory: %w", err) + } + defer os.RemoveAll(tempDir) + + var indexFilePath string + if indexFilePath, err = chartRepo.DownloadIndexFile(); err != nil { + return nil, fmt.Errorf("failed to download index file: %w", err) + } + + indexFile, err := repo.LoadIndexFile(indexFilePath) + if err != nil { + return nil, fmt.Errorf("failed to load index file: %w", err) + } + + // Find the chart version in the index + chartVersions, exists := indexFile.Entries[chartName] + if !exists { + return nil, fmt.Errorf("chart %q not found in repository %q", chartName, repoName) + } + + var chartURL string + for _, version := range chartVersions { + if version.Version == chartVersion { + chartURL = version.URLs[0] + break + } + } + + if chartURL == "" { + return nil, fmt.Errorf("chart %q with version %q not found in repository %q", chartName, chartVersion, repoName) + } + + // Download the chart archive + chartPath := filepath.Join(tempDir, "chart.tgz") + chartURL, err = repo.ResolveReferenceURL(foundEntry.URL, chartURL) + if err != nil { + return nil, fmt.Errorf("failed to resolve chart url: %w", err) + } + + // Use Helm's getter to download the chart + err = h.DownloadChart(chartURL, chartPath) + if err != nil { + return nil, fmt.Errorf("failed to download chart: %w", err) + } + + // Defer cleanup to delete the file after use + defer func() { + if err := os.Remove(chartPath); err != nil { + fmt.Printf("Failed to delete downloaded chart: %v\n", err) + } + }() + + // Load the chart + chart, err := loader.Load(chartPath) + if err != nil { + return nil, fmt.Errorf("failed to load chart: %w", err) + } + + // Return the chart's default values + return chart.Values, nil +} + +// DownloadChart downloads a Helm chart from a given URL and saves it to a specified path +func (h *HelmClient) DownloadChart(chartURL, chartPath string) error { + // Get the getter providers + getters := getter.All(h.settings) + + // Resolve the appropriate getter for the URL (e.g., http/https/file) + provider, err := getters.ByScheme("http") + if err != nil { + return fmt.Errorf("failed to get provider: %w", err) + } + + // Download the chart + data, err := provider.Get(chartURL) + if err != nil { + return fmt.Errorf("failed to download chart: %w", err) + } + + // Save the downloaded chart to the local path + err = os.WriteFile(chartPath, data.Bytes(), 0644) + if err != nil { + return fmt.Errorf("failed to write chart file: %w", err) + } + + return nil +} + // SearchChart searches for a chart in a Helm repository by name func (h *HelmClient) SearchChart(repoName, chartName string) ([]*repo.ChartVersion, error) { repoFile := h.settings.RepositoryConfig @@ -333,6 +454,45 @@ func (h *HelmClient) ListRevisions(releaseName string) ([]*release.Release, erro return revisions, nil } +// GetCurrentAppliedValues fetches the applied values of current revision +func (h *HelmClient) GetCurrentAppliedValues(releaseName string) (map[string]interface{}, error) { + // Create a new Get action for fetching the release details + getAction := action.NewGet(h.config) + + // Fetch the current release details + releaseDetails, err := getAction.Run(releaseName) + if err != nil { + return nil, fmt.Errorf("failed to get release details for %s: %w", releaseName, err) + } + + // Extract the applied values from the release details + appliedValues := releaseDetails.Config + + return appliedValues, nil +} + +// GetAppliedValues fetches the applied values of a specific revision +func (h *HelmClient) GetAppliedValues(releaseName string, revision int) (map[string]interface{}, error) { + // Create a new Get action for fetching release details + getAction := action.NewGet(h.config) + + // Fetch the release details for the specific revision + releaseDetails, err := getAction.Run(releaseName) + if err != nil { + return nil, fmt.Errorf("failed to get release details for %s: %w", releaseName, err) + } + + // Check if the requested revision matches + if revision > 0 && releaseDetails.Version != revision { + return nil, fmt.Errorf("release %s is not at revision %d", releaseName, revision) + } + + // Extract the applied values + appliedValues := releaseDetails.Config + + return appliedValues, nil +} + // RollbackRelease rolls back a release to a specified revision func (h *HelmClient) RollbackRelease(releaseName string, revision int) error { client := action.NewRollback(h.config) diff --git a/pkg/helm/helm_test.go b/pkg/helm/helm_test.go index 6b1080c..de6e705 100644 --- a/pkg/helm/helm_test.go +++ b/pkg/helm/helm_test.go @@ -43,6 +43,12 @@ func TestHelm(t *testing.T) { assert.NotEmpty(t, charts) }) + t.Run("get chart values", func(t *testing.T) { + chartValues, err := helmClient.GetChartValues("nginx-stable", "nginx-ingress", "2.0.0") + assert.NoError(t, err) + assert.NotEmpty(t, chartValues) + }) + t.Run("install chart", func(t *testing.T) { release, err := helmClient.InstallOrUpgradeChart( "nginx-stable", // Repository name @@ -50,12 +56,28 @@ func TestHelm(t *testing.T) { "2.0.0", // Chart version "kni", // Release name "default", // Namespace - nil, // Values map + map[string]interface{}{ + "controller": map[string]interface{}{ + "replicaCount": 2, + }, + }, // Values map ) assert.NoError(t, err) assert.NotNil(t, release) }) + t.Run("get applied values of current revision", func(t *testing.T) { + chartValues, err := helmClient.GetCurrentAppliedValues("kni") + assert.NoError(t, err) + assert.NotEmpty(t, chartValues) + }) + + t.Run("get applied values of a specific revision", func(t *testing.T) { + chartValues, err := helmClient.GetAppliedValues("kni", 1) + assert.NoError(t, err) + assert.NotEmpty(t, chartValues) + }) + t.Run("list releases - 1", func(t *testing.T) { releases, err := helmClient.ListReleases(false) assert.NoError(t, err) From d64204aeb981ed9768f98d6552d738d8a91b67b4 Mon Sep 17 00:00:00 2001 From: Shihab Hasan Date: Wed, 8 Jan 2025 12:50:56 -0600 Subject: [PATCH 2/5] more helm functions --- pkg/helm/helm.go | 45 +++++++++++++++++++++++++++++++++++++++++++ pkg/helm/helm_test.go | 12 ++++++++++++ 2 files changed, 57 insertions(+) diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index 5c10885..a32016b 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -454,6 +454,51 @@ func (h *HelmClient) ListRevisions(releaseName string) ([]*release.Release, erro return revisions, nil } +// GetCurrentRevisionDetails returns the details of current revision +func (h *HelmClient) GetCurrentRevisionDetails(releaseName string) (*release.Release, error) { + // Create a new Get action for fetching release details + getAction := action.NewGet(h.config) + + // Fetch the current (latest) release details + releaseDetails, err := getAction.Run(releaseName) + if err != nil { + return nil, fmt.Errorf("failed to get current release details for %s: %w", releaseName, err) + } + + // Return the details of the current (latest) revision + return releaseDetails, nil +} + +// GetRevisionDetails returns the details of a revision +func (h *HelmClient) GetRevisionDetails(releaseName string, revision int) (*release.Release, error) { + // Create a new History action for fetching release history + historyAction := action.NewHistory(h.config) + historyAction.Max = 0 // Retrieve all revisions (unlimited) + + // Fetch all the revisions for the given release + revisions, err := historyAction.Run(releaseName) + if err != nil { + return nil, fmt.Errorf("failed to get history for release %s: %w", releaseName, err) + } + + // Iterate through the revisions to find the requested revision + var revisionDetails *release.Release + for _, r := range revisions { + if r.Version == revision { + revisionDetails = r + break + } + } + + // If the specified revision is not found, return an error + if revisionDetails == nil { + return nil, fmt.Errorf("revision %d not found for release %s", revision, releaseName) + } + + // Return the details of the specified revision + return revisionDetails, nil +} + // GetCurrentAppliedValues fetches the applied values of current revision func (h *HelmClient) GetCurrentAppliedValues(releaseName string) (map[string]interface{}, error) { // Create a new Get action for fetching the release details diff --git a/pkg/helm/helm_test.go b/pkg/helm/helm_test.go index de6e705..a99c1d7 100644 --- a/pkg/helm/helm_test.go +++ b/pkg/helm/helm_test.go @@ -96,6 +96,18 @@ func TestHelm(t *testing.T) { assert.NotEmpty(t, revisions) }) + t.Run("get current revision details", func(t *testing.T) { + revision, err := helmClient.GetCurrentRevisionDetails("kni") + assert.NoError(t, err) + assert.NotEmpty(t, revision) + }) + + t.Run("get a specific revision details", func(t *testing.T) { + revision, err := helmClient.GetRevisionDetails("kni", 1) + assert.NoError(t, err) + assert.NotEmpty(t, revision) + }) + t.Run("uninstall chart", func(t *testing.T) { resp, err := helmClient.UninstallChart("kni") assert.NoError(t, err) From 7d9946dc9a2a3dc0c6cafcab8e5a4f356162b8a8 Mon Sep 17 00:00:00 2001 From: Shihab Hasan Date: Tue, 14 Jan 2025 17:25:18 -0600 Subject: [PATCH 3/5] test helm chart --- helm/Charts/nginx/.helmignore | 23 ++++ helm/Charts/nginx/Chart.yaml | 24 ++++ helm/Charts/nginx/templates/NOTES.txt | 22 ++++ helm/Charts/nginx/templates/_helpers.tpl | 62 +++++++++ helm/Charts/nginx/templates/deployment.yaml | 68 ++++++++++ helm/Charts/nginx/templates/hpa.yaml | 32 +++++ helm/Charts/nginx/templates/ingress.yaml | 43 ++++++ helm/Charts/nginx/templates/service.yaml | 15 +++ .../nginx/templates/serviceaccount.yaml | 13 ++ .../templates/tests/test-connection.yaml | 15 +++ helm/Charts/nginx/values.yaml | 123 ++++++++++++++++++ 11 files changed, 440 insertions(+) create mode 100644 helm/Charts/nginx/.helmignore create mode 100644 helm/Charts/nginx/Chart.yaml create mode 100644 helm/Charts/nginx/templates/NOTES.txt create mode 100644 helm/Charts/nginx/templates/_helpers.tpl create mode 100644 helm/Charts/nginx/templates/deployment.yaml create mode 100644 helm/Charts/nginx/templates/hpa.yaml create mode 100644 helm/Charts/nginx/templates/ingress.yaml create mode 100644 helm/Charts/nginx/templates/service.yaml create mode 100644 helm/Charts/nginx/templates/serviceaccount.yaml create mode 100644 helm/Charts/nginx/templates/tests/test-connection.yaml create mode 100644 helm/Charts/nginx/values.yaml diff --git a/helm/Charts/nginx/.helmignore b/helm/Charts/nginx/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/helm/Charts/nginx/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/helm/Charts/nginx/Chart.yaml b/helm/Charts/nginx/Chart.yaml new file mode 100644 index 0000000..3464a39 --- /dev/null +++ b/helm/Charts/nginx/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: nginx +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/helm/Charts/nginx/templates/NOTES.txt b/helm/Charts/nginx/templates/NOTES.txt new file mode 100644 index 0000000..b085244 --- /dev/null +++ b/helm/Charts/nginx/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "nginx.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "nginx.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "nginx.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "nginx.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/helm/Charts/nginx/templates/_helpers.tpl b/helm/Charts/nginx/templates/_helpers.tpl new file mode 100644 index 0000000..ad9f432 --- /dev/null +++ b/helm/Charts/nginx/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "nginx.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "nginx.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "nginx.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "nginx.labels" -}} +helm.sh/chart: {{ include "nginx.chart" . }} +{{ include "nginx.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "nginx.selectorLabels" -}} +app.kubernetes.io/name: {{ include "nginx.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "nginx.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "nginx.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/helm/Charts/nginx/templates/deployment.yaml b/helm/Charts/nginx/templates/deployment.yaml new file mode 100644 index 0000000..06323df --- /dev/null +++ b/helm/Charts/nginx/templates/deployment.yaml @@ -0,0 +1,68 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "nginx.fullname" . }} + labels: + {{- include "nginx.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "nginx.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "nginx.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "nginx.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + {{- toYaml .Values.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.readinessProbe | nindent 12 }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/helm/Charts/nginx/templates/hpa.yaml b/helm/Charts/nginx/templates/hpa.yaml new file mode 100644 index 0000000..b664f71 --- /dev/null +++ b/helm/Charts/nginx/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "nginx.fullname" . }} + labels: + {{- include "nginx.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "nginx.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/helm/Charts/nginx/templates/ingress.yaml b/helm/Charts/nginx/templates/ingress.yaml new file mode 100644 index 0000000..4641223 --- /dev/null +++ b/helm/Charts/nginx/templates/ingress.yaml @@ -0,0 +1,43 @@ +{{- if .Values.ingress.enabled -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "nginx.fullname" . }} + labels: + {{- include "nginx.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- with .Values.ingress.className }} + ingressClassName: {{ . }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- with .pathType }} + pathType: {{ . }} + {{- end }} + backend: + service: + name: {{ include "nginx.fullname" $ }} + port: + number: {{ $.Values.service.port }} + {{- end }} + {{- end }} +{{- end }} diff --git a/helm/Charts/nginx/templates/service.yaml b/helm/Charts/nginx/templates/service.yaml new file mode 100644 index 0000000..7183073 --- /dev/null +++ b/helm/Charts/nginx/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "nginx.fullname" . }} + labels: + {{- include "nginx.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "nginx.selectorLabels" . | nindent 4 }} diff --git a/helm/Charts/nginx/templates/serviceaccount.yaml b/helm/Charts/nginx/templates/serviceaccount.yaml new file mode 100644 index 0000000..02c08bb --- /dev/null +++ b/helm/Charts/nginx/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "nginx.serviceAccountName" . }} + labels: + {{- include "nginx.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/helm/Charts/nginx/templates/tests/test-connection.yaml b/helm/Charts/nginx/templates/tests/test-connection.yaml new file mode 100644 index 0000000..5879b4f --- /dev/null +++ b/helm/Charts/nginx/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "nginx.fullname" . }}-test-connection" + labels: + {{- include "nginx.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "nginx.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/helm/Charts/nginx/values.yaml b/helm/Charts/nginx/values.yaml new file mode 100644 index 0000000..63ee7a2 --- /dev/null +++ b/helm/Charts/nginx/values.yaml @@ -0,0 +1,123 @@ +# Default values for nginx. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ +replicaCount: 1 + +# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ +image: + repository: nginx + # This sets the pull policy for images. + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "1.27.3" + +# This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ +imagePullSecrets: [] +# This is to override the chart name. +nameOverride: "" +fullnameOverride: "" + +#This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/ +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +# This is for setting Kubernetes Annotations to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +podAnnotations: {} +# This is for setting Kubernetes Labels to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/ +service: + # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types + type: ClusterIP + # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports + port: 80 + +# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/ +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ +livenessProbe: + httpGet: + path: / + port: http +readinessProbe: + httpGet: + path: / + port: http + +#This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/ +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} From 2aae11745c6c042959aff56e588ad84774bf30fe Mon Sep 17 00:00:00 2001 From: Shihab Hasan Date: Tue, 14 Jan 2025 22:49:18 -0600 Subject: [PATCH 4/5] test helm chart --- go.mod | 2 +- pkg/helm/helm.go | 153 +++++++++++++++++++++++++++++++++++++++++- pkg/helm/helm_test.go | 34 ++++++++++ 3 files changed, 186 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fa8be0e..72005b9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/krack8/lighthouse -go 1.23.0 +go 1.23.4 require ( github.com/google/uuid v1.6.0 diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index a32016b..afd483e 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -8,14 +8,17 @@ import ( "helm.sh/helm/v3/pkg/getter" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/repo" + "k8s.io/client-go/kubernetes" "os" + "os/exec" "path/filepath" "strings" ) type HelmClient struct { - settings *cli.EnvSettings - config *action.Configuration + settings *cli.EnvSettings + config *action.Configuration + kubeClient *kubernetes.Clientset } func NewHelmClient(namespace string) (*HelmClient, error) { @@ -545,6 +548,152 @@ func (h *HelmClient) RollbackRelease(releaseName string, revision int) error { return client.Run(releaseName) } +func (h *HelmClient) AddGitRepo(name, gitURL, username, password string) error { + // Clone the Git repository + tempDir, err := os.MkdirTemp("", "helm-git-repo") + if err != nil { + return fmt.Errorf("failed to create temporary directory: %w", err) + } + defer os.RemoveAll(tempDir) // Cleanup after use + + gitCloneCmd := []string{"clone", gitURL, tempDir} + if username != "" && password != "" { + gitURL = fmt.Sprintf("https://%s:%s@%s", username, password, gitURL[8:]) + gitCloneCmd = []string{"clone", gitURL, tempDir} + } + + cmd := exec.Command("git", gitCloneCmd...) + if output, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("failed to clone Git repository: %w\nOutput: %s", err, string(output)) + } + + // Find the Chart.yaml to verify it's a valid chart repo + chartPath := filepath.Join(tempDir, "Chart.yaml") + if _, err := os.Stat(chartPath); os.IsNotExist(err) { + return fmt.Errorf("no Chart.yaml found in the repository") + } + + // Add the repo to the Helm repository config + repoFile := h.settings.RepositoryConfig + repositories, err := repo.LoadFile(repoFile) + if err != nil { + return fmt.Errorf("failed to load repository file: %w", err) + } + + entry := &repo.Entry{ + Name: name, + URL: tempDir, // Local path acts as the repo + } + + repositories.Update(entry) + if err := repositories.WriteFile(repoFile, 0644); err != nil { + return fmt.Errorf("failed to write repository file: %w", err) + } + + return nil +} + +func CloneGitRepo(name, gitURL, revision, username, password string) (*string, error) { + tempDir, err := os.MkdirTemp("", "hgr-"+name) + if err != nil { + return nil, fmt.Errorf("failed to create temporary directory: %w", err) + } + + // Clone the Git repository + if username != "" && password != "" { + gitURL = fmt.Sprintf("https://%s:%s@%s", username, password, gitURL[8:]) + } + + // Clone the Git repository + cloneCmd := exec.Command("git", "clone", "--branch", revision, "--single-branch", gitURL, tempDir) + + output, err := cloneCmd.CombinedOutput() + if err != nil { + return nil, fmt.Errorf("failed to clone Git repository: %w\nOutput: %s", err, string(output)) + } + + return &tempDir, nil +} + +func (h *HelmClient) AddGitRepoAsHelmRepo(name, gitURL, revision, subPath, username, password string) error { + tempDir, err := CloneGitRepo(name, gitURL, revision, username, password) + if err != nil { + return fmt.Errorf("failed to create temporary directory: %w", err) + } + + // clean up + defer os.RemoveAll(*tempDir) + + // Verify the subpath exists + chartRootPath := filepath.Join(*tempDir, subPath) + if _, err := os.Stat(chartRootPath); os.IsNotExist(err) { + return fmt.Errorf("subpath %q does not exist in the Git repository", subPath) + } + + // Find the Chart.yaml to verify it's a valid chart repo + /*chartPath := filepath.Join(chartRootPath, "Chart.yaml") + if _, err := os.Stat(chartPath); os.IsNotExist(err) { + return fmt.Errorf("no Chart.yaml found in the chart path") + }*/ + + // Add the subpath directory as a Helm repository + repoFile := h.settings.RepositoryConfig + repositories, err := repo.LoadFile(repoFile) + if err != nil { + return fmt.Errorf("failed to load repositories file: %w", err) + } + + entry := &repo.Entry{ + Name: name, + URL: chartRootPath, + } + + repositories.Update(entry) + if err := repositories.WriteFile(repoFile, 0644); err != nil { + return fmt.Errorf("failed to write repositories file: %w", err) + } + + return nil +} + +func (h *HelmClient) CreateApplication(repoName, chartPath, releaseName string, namespace string, values map[string]interface{}) (*release.Release, error) { + client := action.NewInstall(h.config) + client.ReleaseName = releaseName + client.Namespace = namespace + + // Load the chart from the specific path + fullChartPath := filepath.Join(h.settings.RepositoryConfig, repoName, chartPath) + chart, err := loader.Load(fullChartPath) + if err != nil { + return nil, fmt.Errorf("failed to load chart from path %q: %w", fullChartPath, err) + } + + // Install or upgrade the chart + return client.Run(chart, values) +} + +func (h *HelmClient) SyncApplication(repoName, chartPath, releaseName string, namespace string, values map[string]interface{}) (*release.Release, error) { + client := action.NewUpgrade(h.config) + client.Namespace = namespace + + // Pull the latest changes from the Git repository + tempDir := filepath.Join(h.settings.RepositoryConfig, repoName) + cmd := exec.Command("git", "-C", tempDir, "pull") + if output, err := cmd.CombinedOutput(); err != nil { + return nil, fmt.Errorf("failed to sync Git repository: %w\nOutput: %s", err, string(output)) + } + + // Load the chart + fullChartPath := filepath.Join(tempDir, chartPath) + chart, err := loader.Load(fullChartPath) + if err != nil { + return nil, fmt.Errorf("failed to load chart from path %q: %w", fullChartPath, err) + } + + // Upgrade the release with the latest chart and values + return client.Run(releaseName, chart, values) +} + func debugLog(format string, v ...interface{}) { fmt.Printf(format, v...) } diff --git a/pkg/helm/helm_test.go b/pkg/helm/helm_test.go index a99c1d7..77a0bc6 100644 --- a/pkg/helm/helm_test.go +++ b/pkg/helm/helm_test.go @@ -3,6 +3,7 @@ package helm_test import ( "github.com/krack8/lighthouse/pkg/helm" "github.com/stretchr/testify/assert" + "os" "testing" ) @@ -125,4 +126,37 @@ func TestHelm(t *testing.T) { assert.NoError(t, err) }) + t.Run("git clone", func(t *testing.T) { + repoClonePath, err := helm.CloneGitRepo("lighthouse", "https://github.com/krack8/lighthouse.git", "main", "", "") + assert.NoError(t, err) + assert.NotNil(t, repoClonePath) + + _, err = os.Stat(*repoClonePath) + assert.NoError(t, err) + + if repoClonePath != nil { + err = os.RemoveAll(*repoClonePath) + assert.NoError(t, err) + } + }) + + t.Run("add git repo as helm repo", func(t *testing.T) { + err := helmClient.AddGitRepoAsHelmRepo("lighthouse-nginx", "https://github.com/krack8/lighthouse.git", "helm-functions", "helm/Charts/nginx", "", "") + assert.NoError(t, err) + }) + + t.Run("create application from git helm repo", func(t *testing.T) { + err := helmClient.AddGitRepoAsHelmRepo("lighthouse-nginx", "https://github.com/krack8/lighthouse.git", "helm-functions", "helm", "", "") + assert.NoError(t, err) + + release, err := helmClient.CreateApplication("lighthouse-nginx", "nginx", "lighthouse-nginx", "default", map[string]interface{}{"replicaCount": 3}) + assert.NoError(t, err) + assert.NotNil(t, release) + }) + + /*t.Run("uninstall application", func(t *testing.T) { + resp, err := helmClient.UninstallChart("lighthouse-nginx") + assert.NoError(t, err) + assert.NotNil(t, resp) + })*/ } From 24bb964a938ce0c4bdcd30357beaa9e5bc63846a Mon Sep 17 00:00:00 2001 From: Shihab Hasan Date: Tue, 14 Jan 2025 23:24:28 -0600 Subject: [PATCH 5/5] test helm chart --- pkg/helm/helm.go | 60 +++++++++++++++++++++++++++++++++++-------- pkg/helm/helm_test.go | 29 +++++++++------------ 2 files changed, 62 insertions(+), 27 deletions(-) diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index afd483e..a792853 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -615,19 +615,19 @@ func CloneGitRepo(name, gitURL, revision, username, password string) (*string, e return &tempDir, nil } -func (h *HelmClient) AddGitRepoAsHelmRepo(name, gitURL, revision, subPath, username, password string) error { - tempDir, err := CloneGitRepo(name, gitURL, revision, username, password) +func (h *HelmClient) AddGitRepoAsHelmRepo(name, gitURL, revision, subPath, username, password string) (*string, error) { + gitCloneDir, err := CloneGitRepo(name, gitURL, revision, username, password) if err != nil { - return fmt.Errorf("failed to create temporary directory: %w", err) + return nil, fmt.Errorf("failed to create temporary directory: %w", err) } // clean up - defer os.RemoveAll(*tempDir) + //defer os.RemoveAll(*tempDir) // Verify the subpath exists - chartRootPath := filepath.Join(*tempDir, subPath) + chartRootPath := filepath.Join(*gitCloneDir, subPath) if _, err := os.Stat(chartRootPath); os.IsNotExist(err) { - return fmt.Errorf("subpath %q does not exist in the Git repository", subPath) + return nil, fmt.Errorf("subpath %q does not exist in the Git repository", subPath) } // Find the Chart.yaml to verify it's a valid chart repo @@ -640,7 +640,7 @@ func (h *HelmClient) AddGitRepoAsHelmRepo(name, gitURL, revision, subPath, usern repoFile := h.settings.RepositoryConfig repositories, err := repo.LoadFile(repoFile) if err != nil { - return fmt.Errorf("failed to load repositories file: %w", err) + return nil, fmt.Errorf("failed to load repositories file: %w", err) } entry := &repo.Entry{ @@ -650,10 +650,10 @@ func (h *HelmClient) AddGitRepoAsHelmRepo(name, gitURL, revision, subPath, usern repositories.Update(entry) if err := repositories.WriteFile(repoFile, 0644); err != nil { - return fmt.Errorf("failed to write repositories file: %w", err) + return nil, fmt.Errorf("failed to write repositories file: %w", err) } - return nil + return gitCloneDir, nil } func (h *HelmClient) CreateApplication(repoName, chartPath, releaseName string, namespace string, values map[string]interface{}) (*release.Release, error) { @@ -661,8 +661,28 @@ func (h *HelmClient) CreateApplication(repoName, chartPath, releaseName string, client.ReleaseName = releaseName client.Namespace = namespace + // Load the repository configuration + repoFile := h.settings.RepositoryConfig + repositories, err := repo.LoadFile(repoFile) + if err != nil { + return nil, fmt.Errorf("failed to load repositories file: %w", err) + } + + // Find the repository entry + var foundEntry *repo.Entry + for _, entry := range repositories.Repositories { + if entry.Name == repoName { + foundEntry = entry + break + } + } + + if foundEntry == nil { + return nil, fmt.Errorf("repository %q not found", repoName) + } + // Load the chart from the specific path - fullChartPath := filepath.Join(h.settings.RepositoryConfig, repoName, chartPath) + fullChartPath := filepath.Join(foundEntry.URL, chartPath) chart, err := loader.Load(fullChartPath) if err != nil { return nil, fmt.Errorf("failed to load chart from path %q: %w", fullChartPath, err) @@ -672,6 +692,26 @@ func (h *HelmClient) CreateApplication(repoName, chartPath, releaseName string, return client.Run(chart, values) } +func (h *HelmClient) InstallLocalChart(chartDir, releaseName string, namespace string, values map[string]interface{}) (*release.Release, error) { + client := action.NewInstall(h.config) + client.ReleaseName = releaseName + client.Namespace = namespace + + chart, err := loader.Load(chartDir) + if err != nil { + return nil, fmt.Errorf("failed to load chart from path %q: %w", chartDir, err) + } + + // Install or upgrade the chart + // Run the install action + rls, err := client.Run(chart, values) + if err != nil { + return nil, fmt.Errorf("failed to install chart: %w", err) + } + + return rls, nil +} + func (h *HelmClient) SyncApplication(repoName, chartPath, releaseName string, namespace string, values map[string]interface{}) (*release.Release, error) { client := action.NewUpgrade(h.config) client.Namespace = namespace diff --git a/pkg/helm/helm_test.go b/pkg/helm/helm_test.go index 77a0bc6..5680b68 100644 --- a/pkg/helm/helm_test.go +++ b/pkg/helm/helm_test.go @@ -4,6 +4,7 @@ import ( "github.com/krack8/lighthouse/pkg/helm" "github.com/stretchr/testify/assert" "os" + "path/filepath" "testing" ) @@ -126,13 +127,21 @@ func TestHelm(t *testing.T) { assert.NoError(t, err) }) + var repoClonePath *string t.Run("git clone", func(t *testing.T) { - repoClonePath, err := helm.CloneGitRepo("lighthouse", "https://github.com/krack8/lighthouse.git", "main", "", "") + repoClonePath, err = helm.CloneGitRepo("lighthouse", "https://github.com/krack8/lighthouse.git", "helm-functions", "", "") assert.NoError(t, err) assert.NotNil(t, repoClonePath) _, err = os.Stat(*repoClonePath) assert.NoError(t, err) + }) + + t.Run("install local chart", func(t *testing.T) { + fullChartPath := filepath.Join(*repoClonePath, "/helm/Charts/nginx") + release, err := helmClient.InstallLocalChart(fullChartPath, "lighthouse-nginx", "default", map[string]interface{}{"replicaCount": 3}) + assert.NoError(t, err) + assert.NotNil(t, release) if repoClonePath != nil { err = os.RemoveAll(*repoClonePath) @@ -140,23 +149,9 @@ func TestHelm(t *testing.T) { } }) - t.Run("add git repo as helm repo", func(t *testing.T) { - err := helmClient.AddGitRepoAsHelmRepo("lighthouse-nginx", "https://github.com/krack8/lighthouse.git", "helm-functions", "helm/Charts/nginx", "", "") - assert.NoError(t, err) - }) - - t.Run("create application from git helm repo", func(t *testing.T) { - err := helmClient.AddGitRepoAsHelmRepo("lighthouse-nginx", "https://github.com/krack8/lighthouse.git", "helm-functions", "helm", "", "") - assert.NoError(t, err) - - release, err := helmClient.CreateApplication("lighthouse-nginx", "nginx", "lighthouse-nginx", "default", map[string]interface{}{"replicaCount": 3}) - assert.NoError(t, err) - assert.NotNil(t, release) - }) - - /*t.Run("uninstall application", func(t *testing.T) { + t.Run("uninstall chart - 2", func(t *testing.T) { resp, err := helmClient.UninstallChart("lighthouse-nginx") assert.NoError(t, err) assert.NotNil(t, resp) - })*/ + }) }