Publish to helm registry #91
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
Binary file not shown.
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 |
|---|---|---|
|
|
@@ -21,35 +21,39 @@ var ( | |
| // not have the `PLUGIN_` prefix. | ||
| type Config struct { | ||
| // Configuration for drone-helm itself | ||
| Command string `envconfig:"mode"` // Helm command to run | ||
| DroneEvent string `envconfig:"drone_build_event"` // Drone event that invoked this plugin. | ||
| UpdateDependencies bool `split_words:"true"` // [Deprecated] Call `helm dependency update` before the main command (deprecated, use dependencies_action: update instead) | ||
| DependenciesAction string `split_words:"true"` // Call `helm dependency build` or `helm dependency update` before the main command | ||
| AddRepos []string `split_words:"true"` // Call `helm repo add` before the main command | ||
| RepoCertificate string `envconfig:"repo_certificate"` // The Helm chart repository's self-signed certificate (must be base64-encoded) | ||
| RepoCACertificate string `envconfig:"repo_ca_certificate"` // The Helm chart repository CA's self-signed certificate (must be base64-encoded) | ||
| Debug bool `` // Generate debug output and pass --debug to all helm commands | ||
| Values string `` // Argument to pass to --set in applicable helm commands | ||
| StringValues string `split_words:"true"` // Argument to pass to --set-string in applicable helm commands | ||
| ValuesFiles []string `split_words:"true"` // Arguments to pass to --values in applicable helm commands | ||
| Namespace string `` // Kubernetes namespace for all helm commands | ||
| KubeToken string `split_words:"true"` // Kubernetes authentication token to put in .kube/config | ||
| SkipTLSVerify bool `envconfig:"skip_tls_verify"` // Put insecure-skip-tls-verify in .kube/config | ||
| Certificate string `envconfig:"kube_certificate"` // The Kubernetes cluster CA's self-signed certificate (must be base64-encoded) | ||
| APIServer string `envconfig:"kube_api_server"` // The Kubernetes cluster's API endpoint | ||
| ServiceAccount string `envconfig:"kube_service_account"` // Account to use for connecting to the Kubernetes cluster | ||
| ChartVersion string `split_words:"true"` // Specific chart version to use in `helm upgrade` | ||
| DryRun bool `split_words:"true"` // Pass --dry-run to applicable helm commands | ||
| Wait bool `envconfig:"wait_for_upgrade"` // Pass --wait to applicable helm commands | ||
| ReuseValues bool `split_words:"true"` // Pass --reuse-values to `helm upgrade` | ||
| KeepHistory bool `split_words:"true"` // Pass --keep-history to `helm uninstall` | ||
| Timeout string `` // Argument to pass to --timeout in applicable helm commands | ||
| Chart string `` // Chart argument to use in applicable helm commands | ||
| Release string `` // Release argument to use in applicable helm commands | ||
| Force bool `envconfig:"force_upgrade"` // Pass --force to applicable helm commands | ||
| AtomicUpgrade bool `split_words:"true"` // Pass --atomic to `helm upgrade` | ||
| CleanupOnFail bool `envconfig:"cleanup_failed_upgrade"` // Pass --cleanup-on-fail to `helm upgrade` | ||
| LintStrictly bool `split_words:"true"` // Pass --strict to `helm lint` | ||
| RegistryURL string `envconfig:"registry_url"` // Helm Registry URL | ||
| RegistryLoginUserID string `envconfig:"registry_login_user_id"` // Helm Registry login user ID | ||
| RegistryLoginPassword string `envconfig:"registry_login_password"` // Helm Registry login password | ||
| RegistryRepoName string `envconfig:"registry_repo_name"` // Helm Registry repository name | ||
|
|
||
| Stdout io.Writer `ignored:"true"` | ||
| Stderr io.Writer `ignored:"true"` | ||
|
|
@@ -67,14 +71,18 @@ func NewConfig(stdout, stderr io.Writer) (*Config, error) { | |
| } | ||
|
|
||
| cfg := Config{ | ||
| Command: aliases.Command, | ||
| AddRepos: aliases.AddRepos, | ||
| APIServer: aliases.APIServer, | ||
| ServiceAccount: aliases.ServiceAccount, | ||
| Wait: aliases.Wait, | ||
| Force: aliases.Force, | ||
| KubeToken: aliases.KubeToken, | ||
| Certificate: aliases.Certificate, | ||
| RegistryURL: aliases.RegistryURL, | ||
| RegistryLoginUserID: aliases.RegistryLoginUserID, | ||
| RegistryLoginPassword: aliases.RegistryLoginPassword, | ||
| RegistryRepoName: aliases.RegistryRepoName, | ||
|
|
||
| Stdout: stdout, | ||
| Stderr: stderr, | ||
|
|
@@ -145,12 +153,16 @@ func (cfg *Config) deprecationWarn() { | |
| } | ||
|
|
||
| type settingAliases struct { | ||
| Command string `envconfig:"helm_command"` | ||
| AddRepos []string `envconfig:"helm_repos"` | ||
| APIServer string `envconfig:"api_server"` | ||
| ServiceAccount string `split_words:"true"` | ||
| Wait bool `` | ||
| Force bool `` | ||
| KubeToken string `envconfig:"kubernetes_token"` | ||
| Certificate string `envconfig:"kubernetes_certificate"` | ||
| RegistryURL string `envconfig:"registry_url"` | ||
| RegistryLoginUserID string `envconfig:"registry_login_user_id"` | ||
| RegistryLoginPassword string `envconfig:"registry_login_password"` | ||
| RegistryRepoName string `envconfig:"registry_repo_name"` | ||
|
There was a problem hiding this comment. Newly-added settings don't need entries in |
||
| } | ||
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 | ||
|---|---|---|---|---|
|
|
@@ -3,9 +3,10 @@ package helm | |||
| import ( | ||||
| "errors" | ||||
| "fmt" | ||||
| "os" | ||||
|
|
||||
| "github.com/pelotech/drone-helm3/internal/env" | ||||
| "github.com/pelotech/drone-helm3/internal/run" | ||||
| ) | ||||
|
|
||||
| const ( | ||||
|
|
@@ -61,6 +62,8 @@ func determineSteps(cfg env.Config) *func(env.Config) []Step { | |||
| return &uninstall | ||||
| case "lint": | ||||
| return &lint | ||||
| case "publish": | ||||
| return &publish | ||||
| case "help": | ||||
| return &help | ||||
| default: | ||||
|
|
@@ -136,3 +139,16 @@ var lint = func(cfg env.Config) []Step { | |||
| var help = func(cfg env.Config) []Step { | ||||
| return []Step{run.NewHelp(cfg)} | ||||
| } | ||||
|
|
||||
| var publish = func(cfg env.Config) []Step { | ||||
| fmt.Println("inside publish") | ||||
|
There was a problem hiding this comment. There's some leftover debug logging here
Suggested change
|
||||
| var steps []Step | ||||
|
|
||||
| os.Setenv("HELM_EXPERIMENTAL_OCI", "1") | ||||
|
There was a problem hiding this comment. Rather than a bare environ := os.Environ()
environ = append(environ, "HELM_EXPERIMENTAL_OCI=1")
reg.cmd.Env(environ)Changing the environment mid-execution doesn't always cause problems, but when problems do arise it's a headache trying to track them down. |
||||
|
|
||||
| steps = append(steps, run.NewRegistry("login", cfg)) | ||||
| steps = append(steps, run.NewChart("save", cfg)) | ||||
| steps = append(steps, run.NewChart("push", cfg)) | ||||
| steps = append(steps, run.NewRegistry("logout", cfg)) | ||||
| return steps | ||||
| } | ||||
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,63 @@ | ||||||||||||||||||||||||
| package run | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| import ( | ||||||||||||||||||||||||
| "fmt" | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| "github.com/pelotech/drone-helm3/internal/env" | ||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| // Chart is an execution step that calls `helm chart` when executed. | ||||||||||||||||||||||||
| type Chart struct { | ||||||||||||||||||||||||
| *config | ||||||||||||||||||||||||
| chartPath string | ||||||||||||||||||||||||
| registryURL string | ||||||||||||||||||||||||
| registryRepoName string | ||||||||||||||||||||||||
| chartVersion string | ||||||||||||||||||||||||
| subCommand string | ||||||||||||||||||||||||
| cmd cmd | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| // NewChart creates a Chart using fields from the given Config. No validation is performed at this time. | ||||||||||||||||||||||||
| func NewChart(subCommand string, cfg env.Config) *Chart { | ||||||||||||||||||||||||
| return &Chart{ | ||||||||||||||||||||||||
| config: newConfig(cfg), | ||||||||||||||||||||||||
| chartPath: cfg.Chart, | ||||||||||||||||||||||||
| registryURL: cfg.RegistryURL, | ||||||||||||||||||||||||
| registryRepoName: cfg.RegistryRepoName, | ||||||||||||||||||||||||
| chartVersion: cfg.ChartVersion, | ||||||||||||||||||||||||
| subCommand: subCommand, | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| // Execute executes the `helm chart` command. | ||||||||||||||||||||||||
| func (reg *Chart) Execute() error { | ||||||||||||||||||||||||
| return reg.cmd.Run() | ||||||||||||||||||||||||
|
Comment on lines
+33
to
+34
There was a problem hiding this comment. Minor: there's a bit of copy-paste left over here (and the same thing in Prepare)
Suggested change
|
||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| // Prepare gets the Chart ready to execute. | ||||||||||||||||||||||||
| func (reg *Chart) Prepare() error { | ||||||||||||||||||||||||
|
There was a problem hiding this comment.
Suggested change
A test for those cases would also be nice, though not completely necessary. |
||||||||||||||||||||||||
| args := []string{} | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| args = append(args, "chart") | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| if reg.subCommand == "save" { | ||||||||||||||||||||||||
| args = append(args, "save") | ||||||||||||||||||||||||
| args = append(args, reg.chartPath) | ||||||||||||||||||||||||
|
There was a problem hiding this comment. Does this need to check for an empty chartPath? I haven't checked how
Suggested change
|
||||||||||||||||||||||||
| cmd := fmt.Sprintf("%s/%s:%s", reg.registryURL, reg.registryRepoName, reg.chartVersion) | ||||||||||||||||||||||||
| args = append(args, cmd) | ||||||||||||||||||||||||
| } else if reg.subCommand == "push" { | ||||||||||||||||||||||||
| args = append(args, "push") | ||||||||||||||||||||||||
| cmd := fmt.Sprintf("%s/%s:%s", reg.registryURL, reg.registryRepoName, reg.chartVersion) | ||||||||||||||||||||||||
| args = append(args, cmd) | ||||||||||||||||||||||||
|
Comment on lines
+50
to
+51
There was a problem hiding this comment. These two lines are the same as their counterparts in |
||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| reg.cmd = command(helmBin, args...) | ||||||||||||||||||||||||
| reg.cmd.Stdout(reg.stdout) | ||||||||||||||||||||||||
| reg.cmd.Stderr(reg.stderr) | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| if reg.debug { | ||||||||||||||||||||||||
| fmt.Fprintf(reg.stderr, "Generated command: '%s'\n", reg.cmd.String()) | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| return nil | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
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.
A couple of nitpicks here:
registry_repo_nameandchart_versiondon't need to come from secrets, thesettingsblock is a more appropriate spot for them.