Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: databus23/helm-diff
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.8.0
Choose a base ref
...
head repository: databus23/helm-diff
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.8.1
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 4, 2023

  1. Add support for --insecure-skip-tls-verify (#462)

    I believe helm-diff should eventually support all the helm-template flags including connection-related ones, so that helm-diff can be used in place where helm-template or helm-upgrade-dry-run to provide diff/dry-run functionality to existing script/program/etc.
    
    This adds support for --insecure-skip-tls which is used to disable server verification on chart download.
    mumoshu authored Jun 4, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8e8f883 View commit details
  2. Copy the full SHA
    68318b3 View commit details
  3. Bump plugin version to 3.8.1

    mumoshu committed Jun 4, 2023
    Copy the full SHA
    629d13c View commit details
Showing with 7 additions and 1 deletion.
  1. +1 −0 Makefile
  2. +3 −0 cmd/helm3.go
  3. +2 −0 cmd/upgrade.go
  4. +1 −1 plugin.yaml
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@ docker-run-release:
mkdir -p docker-run-release-cache
# uid needs to be set to avoid "error obtaining VCS status: exit status 128"
docker run --user $(shell id -u) -it --rm -e GITHUB_TOKEN \
-v ${SSH_AUTH_SOCK}:/tmp/ssh-agent.sock -e SSH_AUTH_SOCK=/tmp/ssh-agent.sock \
-v $(shell pwd):$(pkg) \
-v $(shell pwd)/docker-run-release-cache:/.cache \
-w $(pkg) golang:1.19.8 make bootstrap release
3 changes: 3 additions & 0 deletions cmd/helm3.go
Original file line number Diff line number Diff line change
@@ -105,6 +105,9 @@ func (d *diffCmd) template(isUpgrade bool) ([]byte, error) {
for _, arg := range d.postRendererArgs {
flags = append(flags, "--post-renderer-args", arg)
}
if d.insecureSkipTLSVerify {
flags = append(flags, "--insecure-skip-tls-verify")
}
// Helm automatically enable --reuse-values when there's no --set, --set-string, --set-values, --set-file present.
// Let's simulate that in helm-diff.
// See https://medium.com/@kcatstack/understand-helm-upgrade-flags-reset-values-reuse-values-6e58ac8f127e
2 changes: 2 additions & 0 deletions cmd/upgrade.go
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@ type diffCmd struct {
includeTests bool
postRenderer string
postRendererArgs []string
insecureSkipTLSVerify bool
install bool
normalizeManifests bool
threeWayMerge bool
@@ -197,6 +198,7 @@ func newChartCommand() *cobra.Command {
f.BoolVar(&diff.dryRun, "dry-run", false, "disables cluster access and show diff as if it was install. Implies --install, --reset-values, and --disable-validation")
f.StringVar(&diff.postRenderer, "post-renderer", "", "the path to an executable to be used for post rendering. If it exists in $PATH, the binary will be used, otherwise it will try to look for the executable at the given path")
f.StringArrayVar(&diff.postRendererArgs, "post-renderer-args", []string{}, "an argument to the post-renderer (can specify multiple)")
f.BoolVar(&diff.insecureSkipTLSVerify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart download")
f.BoolVar(&diff.normalizeManifests, "normalize-manifests", false, "normalize manifests before running diff to exclude style differences from the output")

AddDiffOptions(f, &diff.Options)
2 changes: 1 addition & 1 deletion plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "diff"
# Version is the version of Helm plus the number of official builds for this
# plugin
version: "3.8.0"
version: "3.8.1"
usage: "Preview helm upgrade changes as a diff"
description: "Preview helm upgrade changes as a diff"
useTunnel: true