diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 69de4fba..b4390a36 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,7 @@ jobs: # we will mark this combination as failable, # and instruct users to upgrade helm and helm-secrets at once. plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.10 + plugin-diff-version: 3.9.11 extra-helmfile-flags: '' v1mode: '' - helm-version: v3.16.1 @@ -80,14 +80,14 @@ jobs: - helm-version: v3.16.1 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.10 + plugin-diff-version: 3.9.11 extra-helmfile-flags: '' v1mode: '' # Helmfile v1 - helm-version: v3.16.1 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.10 + plugin-diff-version: 3.9.11 extra-helmfile-flags: '' v1mode: 'true' # In case you need to test some optional helmfile features, @@ -95,7 +95,7 @@ jobs: - helm-version: v3.16.1 kustomize-version: v5.4.3 plugin-secrets-version: 4.6.0 - plugin-diff-version: 3.9.10 + plugin-diff-version: 3.9.11 extra-helmfile-flags: '--enable-live-output' v1mode: '' steps: diff --git a/Dockerfile b/Dockerfile index 3d84e1f0..b157780a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,7 @@ RUN set -x && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age-keygen --version)" = "${AGE_VERSION}" ] -RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.10 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.11 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.2 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ diff --git a/Dockerfile.debian-stable-slim b/Dockerfile.debian-stable-slim index cbe6f86d..dce57e5e 100644 --- a/Dockerfile.debian-stable-slim +++ b/Dockerfile.debian-stable-slim @@ -99,7 +99,7 @@ RUN set -x && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age-keygen --version)" = "${AGE_VERSION}" ] -RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.10 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.11 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.2 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 13bdc26d..55de9269 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -99,7 +99,7 @@ RUN set -x && \ [ "$(age --version)" = "${AGE_VERSION}" ] && \ [ "$(age-keygen --version)" = "${AGE_VERSION}" ] -RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.10 && \ +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.11 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.6.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.16.2 && \ helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.16.0 && \ diff --git a/go.mod b/go.mod index 1e6ea8e0..5995e30f 100644 --- a/go.mod +++ b/go.mod @@ -184,7 +184,6 @@ require ( github.com/docker/go-metrics v0.0.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/evanphx/json-patch v5.9.0+incompatible // indirect github.com/extism/go-sdk v1.3.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect @@ -233,7 +232,6 @@ require ( github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/moby/locker v1.0.1 // indirect diff --git a/go.sum b/go.sum index 280b3700..78e18694 100644 --- a/go.sum +++ b/go.sum @@ -443,8 +443,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= -github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/extism/go-sdk v1.3.1 h1:eVpuv36b67Km/tAb7Cq6msHEW8kkdFgpZO/7fCwjuoE= github.com/extism/go-sdk v1.3.1/go.mod h1:tPMWfCSOThie3LSTSZKbrQjRm2oAXxUUjSE4HJWjYQM= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -776,8 +774,6 @@ github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= diff --git a/pkg/app/init.go b/pkg/app/init.go index 8bf16a5b..1cdfaad2 100644 --- a/pkg/app/init.go +++ b/pkg/app/init.go @@ -19,7 +19,7 @@ import ( const ( HelmRequiredVersion = "v3.15.4" HelmRecommendedVersion = "v3.16.1" - HelmDiffRecommendedVersion = "v3.9.10" + HelmDiffRecommendedVersion = "v3.9.11" HelmSecretsRecommendedVersion = "v4.6.0" HelmGitRecommendedVersion = "v0.15.1" HelmS3RecommendedVersion = "v0.16.0" diff --git a/test/integration/run.sh b/test/integration/run.sh index 0c30d07c..1b163a31 100755 --- a/test/integration/run.sh +++ b/test/integration/run.sh @@ -27,7 +27,7 @@ export HELM_DATA_HOME="${helm_dir}/data" export HELM_HOME="${HELM_DATA_HOME}" export HELM_PLUGINS="${HELM_DATA_HOME}/plugins" export HELM_CONFIG_HOME="${helm_dir}/config" -HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.9.10}" +HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.9.11}" HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.0}" export GNUPGHOME="${PWD}/${dir}/.gnupg" export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700"