Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chart-testing for openSUSE:Factory
checked in at 2022-07-28 20:58:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chart-testing (Old)
and /work/SRC/openSUSE:Factory/.chart-testing.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chart-testing"
Thu Jul 28 20:58:37 2022 rev:2 rq:991389 version:3.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/chart-testing/chart-testing.changes
2022-05-31 15:48:40.736039873 +0200
+++ /work/SRC/openSUSE:Factory/.chart-testing.new.1533/chart-testing.changes
2022-07-28 20:58:55.279615986 +0200
@@ -1,0 +2,25 @@
+Wed Jul 27 12:51:17 UTC 2022 - ka...@b1-systems.de
+
+- Update to version 3.7.0:
+ * Updates to prepare next release (#457)
+ * Bump sigstore/cosign-installer from 2.4.1 to 2.5.0 (#456)
+ * Set a request timeout on kubectl commands (#360)
+ * Fix integration tests for upgrade flag (#446)
+ * Bump sigstore/cosign-installer from 2.4.0 to 2.4.1 (#452)
+ * Bump github.com/stretchr/testify from 1.7.5 to 1.8.0 (#451)
+ * Bump github.com/spf13/cobra from 1.4.0 to 1.5.0 (#449)
+ * Bump actions/setup-go from 3.2.0 to 3.2.1 (#454)
+ * Bump github.com/stretchr/testify from 1.7.4 to 1.7.5 (#450)
+ * Bump github.com/stretchr/testify from 1.7.2 to 1.7.4 (#448)
+ * fixes for kind config (#438)
+ * Bump sigstore/cosign-installer from 2.3.0 to 2.4.0 (#447)
+ * Bump github.com/stretchr/testify from 1.7.1 to 1.7.2 (#443)
+ * Bump github.com/spf13/viper from 1.11.0 to 1.12.0 (#441)
+ * Bump actions/checkout from 3.0.1 to 3.0.2 (#430)
+ * Bump docker/setup-buildx-action from 1.6.0 to 2 (#437)
+ * Bump docker/login-action from 1.14.1 to 2 (#436)
+ * Bump docker/setup-qemu-action from 1.2.0 to 2 (#435)
+ * Bump actions/setup-go from 3.0.0 to 3.2.0 (#442)
+ * feat(upgrade): it should upgrade to new version instead of the old one
(#434)
+
+-------------------------------------------------------------------
Old:
----
chart-testing-3.6.0.tar.gz
New:
----
chart-testing-3.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chart-testing.spec ++++++
--- /var/tmp/diff_new_pack.AkuIcN/_old 2022-07-28 20:58:55.875617664 +0200
+++ /var/tmp/diff_new_pack.AkuIcN/_new 2022-07-28 20:58:55.883617687 +0200
@@ -1,7 +1,7 @@
#
# spec file for package chart-testing
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%define name_of_binary ct
Name: chart-testing
-Version: 3.6.0
+Version: 3.7.0
Release: 0
Summary: CLI tool for linting and testing Helm charts
Group: Development/Languages/Other
@@ -54,7 +54,6 @@
install -D -m 0644 etc/chart_schema.yaml %{buildroot}/%{_docdir}/%{name}/
install -D -m 0644 etc/lintconf.yaml %{buildroot}/%{_docdir}/%{name}/
-
%files
%doc README.md
%doc %{_docdir}/%{name}/chart_schema.yaml
++++++ _service ++++++
--- /var/tmp/diff_new_pack.AkuIcN/_old 2022-07-28 20:58:55.923617799 +0200
+++ /var/tmp/diff_new_pack.AkuIcN/_new 2022-07-28 20:58:55.943617855 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/helm/chart-testing</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v3.6.0</param>
+ <param name="revision">v3.7.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
@@ -16,7 +16,7 @@
<param name="compression">gz</param>
</service>
<service name="go_modules" mode="disabled">
- <param name="archive">chart-testing-3.6.0.tar.gz</param>
+ <param name="archive">chart-testing-3.7.0.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.AkuIcN/_old 2022-07-28 20:58:55.963617912 +0200
+++ /var/tmp/diff_new_pack.AkuIcN/_new 2022-07-28 20:58:55.967617923 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/helm/chart-testing</param>
- <param
name="changesrevision">49167c48fd3180c183290f5be178f7aa28ff1c49</param></service></servicedata>
+ <param
name="changesrevision">1d3feac8e5ca55ccf11521ff297ccee7f09aa749</param></service></servicedata>
(No newline at EOF)
++++++ chart-testing-3.6.0.tar.gz -> chart-testing-3.7.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/.github/dependabot.yml
new/chart-testing-3.7.0/.github/dependabot.yml
--- old/chart-testing-3.6.0/.github/dependabot.yml 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/.github/dependabot.yml 2022-07-27
11:56:37.000000000 +0200
@@ -10,3 +10,7 @@
schedule:
interval: weekly
open-pull-requests-limit: 10
+- package-ecosystem: "docker"
+ directory: "/"
+ schedule:
+ interval: weekly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/.github/workflows/ci.yaml
new/chart-testing-3.7.0/.github/workflows/ci.yaml
--- old/chart-testing-3.6.0/.github/workflows/ci.yaml 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/.github/workflows/ci.yaml 2022-07-27
11:56:37.000000000 +0200
@@ -12,7 +12,7 @@
steps:
- name: checkout
- uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 #
v3.0.1
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #
v3.0.1
with:
fetch-depth: 0
@@ -20,14 +20,14 @@
uses:
ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 # v1.1.0
- name: Setup go
- uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab #
v2.2.0
+ uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a #
v2.2.0
with:
go-version: '1.18'
check-latest: true
- uses: azure/setup-helm@18bc76811624f360dbd7f18c2d4ecb32c7b87bab # v1.1
with:
- version: v3.9.0
+ version: v3.9.2
- name: Install GoReleaser
uses:
goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # v3.0.0
@@ -35,7 +35,7 @@
install-only: true
- name: Install cosign
- uses:
sigstore/cosign-installer@536b37ec5d5b543420bdfd9b744c5965bd4d8730 # v2.3.0
+ uses:
sigstore/cosign-installer@09a077b27eb1310dcfb21981bee195b30ce09de0 # v2.4.0
- name: Install syft
uses:
anchore/sbom-action/download-syft@bb716408e75840bbb01e839347cd213767269d4a #
v0.11.0
@@ -64,10 +64,10 @@
git diff --exit-code
- name: Set up QEMU
- uses:
docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 # v1.2.0
+ uses:
docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 # v1.2.0
- name: Set up Docker Buildx
- uses:
docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25 # v1.6.0
+ uses:
docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # v1.6.0
- name: Build
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/.github/workflows/release.yaml
new/chart-testing-3.7.0/.github/workflows/release.yaml
--- old/chart-testing-3.6.0/.github/workflows/release.yaml 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/.github/workflows/release.yaml 2022-07-27
11:56:37.000000000 +0200
@@ -17,7 +17,7 @@
steps:
- name: checkout
- uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 #
v3.0.1
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #
v3.0.1
with:
fetch-depth: 0
@@ -25,7 +25,7 @@
uses:
ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9 # v1.1.0
- name: Setup go
- uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab #
v2.2.0
+ uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a #
v2.2.0
with:
go-version: '1.18'
check-latest: true
@@ -36,7 +36,7 @@
install-only: true
- name: Install cosign
- uses:
sigstore/cosign-installer@536b37ec5d5b543420bdfd9b744c5965bd4d8730 # v2.3.0
+ uses:
sigstore/cosign-installer@09a077b27eb1310dcfb21981bee195b30ce09de0 # v2.4.0
- name: Install syft
uses:
anchore/sbom-action/download-syft@bb716408e75840bbb01e839347cd213767269d4a #
v0.11.0
@@ -53,13 +53,13 @@
git diff --exit-code
- name: Set up QEMU
- uses:
docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 # v1.2.0
+ uses:
docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 # v1.2.0
- name: Set up Docker Buildx
- uses:
docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25 # v1.6.0
+ uses:
docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # v1.6.0
- name: Login to registry
- uses: docker/login-action@dd4fa0671be5250ee6f50aedf4cb05514abda2c7 #
v1.14.1
+ uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b #
v1.14.1
with:
registry: quay.io
username: ${{ secrets.DOCKER_USERNAME }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/Dockerfile
new/chart-testing-3.7.0/Dockerfile
--- old/chart-testing-3.6.0/Dockerfile 2022-05-27 14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/Dockerfile 2022-07-27 11:56:37.000000000 +0200
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.16
RUN apk --no-cache add \
bash \
@@ -23,14 +23,14 @@
ARG TARGETPLATFORM
# Install kubectl
-ARG kubectl_version=v1.23.6
+ARG kubectl_version=v1.24.3
LABEL kubectl_version=$kubectl_version
RUN curl -LO
"https://storage.googleapis.com/kubernetes-release/release/$kubectl_version/bin/$TARGETPLATFORM/kubectl";
&& \
chmod +x kubectl && \
mv kubectl /usr/local/bin/
# Install Helm
-ARG helm_version=v3.9.0
+ARG helm_version=v3.9.2
LABEL helm_version=$helm_version
RUN targetArch=$(echo $TARGETPLATFORM | cut -f2 -d '/') \
&& if [ ${targetArch} = "amd64" ]; then \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/examples/kind/test/e2e-kind.sh
new/chart-testing-3.7.0/examples/kind/test/e2e-kind.sh
--- old/chart-testing-3.6.0/examples/kind/test/e2e-kind.sh 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/examples/kind/test/e2e-kind.sh 2022-07-27
11:56:37.000000000 +0200
@@ -41,7 +41,8 @@
kind create cluster --name "$CLUSTER_NAME" --config test/kind-config.yaml
--image "kindest/node:$K8S_VERSION" --wait 60s
echo 'Copying kubeconfig to container...'
- docker cp /root/.kube/config ct:/root/.kube/config
+ docker_exec mkdir /root/.kube
+ docker cp /root/.kube/kind-config ct:/root/.kube/config
docker_exec kubectl cluster-info
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/examples/kind/test/kind-config.yaml
new/chart-testing-3.7.0/examples/kind/test/kind-config.yaml
--- old/chart-testing-3.6.0/examples/kind/test/kind-config.yaml 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/examples/kind/test/kind-config.yaml 2022-07-27
11:56:37.000000000 +0200
@@ -1,5 +1,5 @@
kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha3
+apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
- role: worker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/go.mod
new/chart-testing-3.7.0/go.mod
--- old/chart-testing-3.6.0/go.mod 2022-05-27 14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/go.mod 2022-07-27 11:56:37.000000000 +0200
@@ -10,37 +10,36 @@
github.com/mattn/go-shellwords v1.0.12
github.com/mitchellh/go-homedir v1.1.0
github.com/pkg/errors v0.9.1
- github.com/spf13/cobra v1.4.0
+ github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
- github.com/spf13/viper v1.11.0
- github.com/stretchr/testify v1.7.1
+ github.com/spf13/viper v1.12.0
+ github.com/stretchr/testify v1.8.0
gopkg.in/yaml.v2 v2.4.0
)
require (
- github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/fsnotify/fsnotify v1.5.1 // indirect
+ github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
- github.com/kr/pretty v0.3.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
- github.com/mitchellh/mapstructure v1.4.3 // indirect
- github.com/pelletier/go-toml v1.9.4 // indirect
- github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
+ github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/pelletier/go-toml v1.9.5 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
- github.com/spf13/afero v1.8.2 // indirect
- github.com/spf13/cast v1.4.1 // indirect
+ github.com/spf13/afero v1.9.2 // indirect
+ github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
- github.com/stretchr/objx v0.3.0 // indirect
- github.com/subosito/gotenv v1.2.0 // indirect
- golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+ github.com/stretchr/objx v0.4.0 // indirect
+ github.com/subosito/gotenv v1.4.0 // indirect
+ golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 // indirect
golang.org/x/text v0.3.7 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
- gopkg.in/ini.v1 v1.66.4 // indirect
- gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ gopkg.in/ini.v1 v1.66.6 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/go.sum
new/chart-testing-3.7.0/go.sum
--- old/chart-testing-3.6.0/go.sum 2022-05-27 14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/go.sum 2022-07-27 11:56:37.000000000 +0200
@@ -50,9 +50,8 @@
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod
h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod
h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod
h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cpuguy83/go-md2man/v2 v2.0.1
h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod
h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cpuguy83/go-md2man/v2 v2.0.2
h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -63,8 +62,9 @@
github.com/envoyproxy/go-control-plane
v0.9.9-0.20201210154907-fd9021fe5dad/go.mod
h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod
h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fsnotify/fsnotify v1.5.1
h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
-github.com/fsnotify/fsnotify v1.5.1/go.mod
h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/frankban/quicktest v1.14.3
h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/fsnotify/fsnotify v1.5.4
h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
+github.com/fsnotify/fsnotify v1.5.4/go.mod
h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod
h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod
h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod
h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -104,6 +104,7 @@
github.com/google/go-cmp v0.5.1/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.2/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/martian v2.1.0+incompatible/go.mod
h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod
h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.1.0/go.mod
h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -149,11 +150,9 @@
github.com/kr/pretty v0.1.0/go.mod
h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod
h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod
h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod
h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod
h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/magiconair/properties v1.8.6
h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
github.com/magiconair/properties v1.8.6/go.mod
h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/mattn/go-colorable v0.1.12
h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
@@ -162,12 +161,12 @@
github.com/mattn/go-shellwords v1.0.12/go.mod
h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
github.com/mitchellh/go-homedir v1.1.0
h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod
h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v1.4.3
h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.4.3/go.mod
h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/pelletier/go-toml v1.9.4
h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
-github.com/pelletier/go-toml v1.9.4/go.mod
h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.0-beta.8
h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0=
-github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod
h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/mitchellh/mapstructure v1.5.0
h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod
h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/pelletier/go-toml v1.9.5
h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml v1.9.5/go.mod
h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml/v2 v2.0.2
h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
+github.com/pelletier/go-toml/v2 v2.0.2/go.mod
h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod
h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod
h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -176,35 +175,35 @@
github.com/pmezard/go-difflib v1.0.0/go.mod
h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod
h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/rogpeppe/go-internal v1.3.0/go.mod
h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod
h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.8.0
h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
github.com/rogpeppe/go-internal v1.8.0/go.mod
h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
github.com/russross/blackfriday/v2 v2.1.0
h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod
h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
-github.com/spf13/afero v1.8.2/go.mod
h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
-github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
-github.com/spf13/cast v1.4.1/go.mod
h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
-github.com/spf13/cobra v1.4.0/go.mod
h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
+github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
+github.com/spf13/afero v1.9.2/go.mod
h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
+github.com/spf13/cast v1.5.0/go.mod
h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
+github.com/spf13/cobra v1.5.0/go.mod
h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
github.com/spf13/jwalterweatherman v1.1.0
h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
github.com/spf13/jwalterweatherman v1.1.0/go.mod
h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod
h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44=
-github.com/spf13/viper v1.11.0/go.mod
h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk=
+github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
+github.com/spf13/viper v1.12.0/go.mod
h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
github.com/stretchr/objx v0.1.0/go.mod
h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As=
-github.com/stretchr/objx v0.3.0/go.mod
h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
+github.com/stretchr/objx v0.4.0/go.mod
h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.2.2/go.mod
h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod
h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod
h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod
h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1
h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
github.com/stretchr/testify v1.7.1/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.2.0
h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
-github.com/subosito/gotenv v1.2.0/go.mod
h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/stretchr/testify v1.7.2/go.mod
h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.8.0
h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod
h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/subosito/gotenv v1.4.0
h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs=
+github.com/subosito/gotenv v1.4.0/go.mod
h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo=
github.com/yuin/goldmark v1.1.25/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -339,9 +338,9 @@
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220727055044-e65921a090b8
h1:dyU22nBWzrmTQxtNrr4dzVOvaw35nUYE279vF9UmsI8=
+golang.org/x/sys v0.0.0-20220727055044-e65921a090b8/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod
h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -498,14 +497,14 @@
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod
h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
-gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
+gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/chart/chart.go
new/chart-testing-3.7.0/pkg/chart/chart.go
--- old/chart-testing-3.6.0/pkg/chart/chart.go 2022-05-27 14:52:08.000000000
+0200
+++ new/chart-testing-3.7.0/pkg/chart/chart.go 2022-07-27 11:56:37.000000000
+0200
@@ -263,7 +263,7 @@
config: config,
helm: tool.NewHelm(procExec, extraArgs,
strings.Fields(extraSetArgs)),
git: tool.NewGit(procExec),
- kubectl: tool.NewKubectl(procExec),
+ kubectl: tool.NewKubectl(procExec,
config.KubectlTimeout),
linter: tool.NewLinter(procExec),
cmdExecutor: tool.NewCmdTemplateExecutor(procExec),
accountValidator: tool.AccountValidator{},
@@ -628,7 +628,7 @@
return nil
}
- if err := t.helm.Upgrade(oldChart.Path(), namespace,
release); err != nil {
+ if err := t.helm.Upgrade(newChart.Path(), namespace,
release); err != nil {
return err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/chart/chart_test.go
new/chart-testing-3.7.0/pkg/chart/chart_test.go
--- old/chart-testing-3.6.0/pkg/chart/chart_test.go 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/pkg/chart/chart_test.go 2022-07-27
11:56:37.000000000 +0200
@@ -184,13 +184,15 @@
"test_charts/bar",
"test_charts/must-pass-upgrade-install",
"test_charts/mutating-deployment-selector",
+ "test_charts/simple-deployment",
+ "test_charts/simple-deployment-different-selector",
"test_charts/mutating-sfs-volumeclaim",
"test_chart_at_root",
}
for _, chart := range actual {
assert.Contains(t, expected, chart)
}
- assert.Len(t, actual, 6)
+ assert.Len(t, actual, 8)
assert.Nil(t, err)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/chart/integration_test.go
new/chart-testing-3.7.0/pkg/chart/integration_test.go
--- old/chart-testing-3.6.0/pkg/chart/integration_test.go 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/pkg/chart/integration_test.go 2022-07-27
11:56:37.000000000 +0200
@@ -21,6 +21,7 @@
"fmt"
"strings"
"testing"
+ "time"
"github.com/helm/chart-testing/v3/pkg/config"
"github.com/helm/chart-testing/v3/pkg/exec"
@@ -41,7 +42,7 @@
accountValidator: fakeAccountValidator{},
linter: fakeMockLinter,
helm: tool.NewHelm(procExec, extraArgs,
strings.Fields(extraSetArgs)),
- kubectl: tool.NewKubectl(procExec),
+ kubectl: tool.NewKubectl(procExec, 30*time.Second),
}
}
@@ -141,6 +142,12 @@
"test_charts/mutating-sfs-volumeclaim",
processError,
},
+ {
+ "change immutable deployment.spec.selector.matchLabels
field",
+ "test_charts/simple-deployment",
+ "test_charts/simple-deployment-different-selector",
+ processError,
+ },
}
for _, tc := range cases {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/mutating-deployment-selector/templates/deployment.yaml
new/chart-testing-3.7.0/pkg/chart/test_charts/mutating-deployment-selector/templates/deployment.yaml
---
old/chart-testing-3.6.0/pkg/chart/test_charts/mutating-deployment-selector/templates/deployment.yaml
2022-05-27 14:52:08.000000000 +0200
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/mutating-deployment-selector/templates/deployment.yaml
2022-07-27 11:56:37.000000000 +0200
@@ -12,6 +12,11 @@
revision: {{ .Release.Revision | quote }}
spec:
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "nginx.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ revision: {{ .Release.Revision | quote }}
template:
metadata:
labels:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/Chart.yaml
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/Chart.yaml
--- old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/Chart.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/Chart.yaml
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: nginx
+version: 0.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/README.md
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/README.md
--- old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/README.md
1970-01-01 01:00:00.000000000 +0100
+++ new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/README.md
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,4 @@
+Simple chart with a Deployment.
+
+The integration test will install first simple-deployment and then try to
upgrade
+to simple-deployment-different-selector failing as expected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/templates/_helpers.tpl
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/templates/_helpers.tpl
---
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/templates/_helpers.tpl
1970-01-01 01:00:00.000000000 +0100
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/templates/_helpers.tpl
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+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 -}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/templates/deployment.yaml
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/templates/deployment.yaml
---
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/templates/deployment.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/templates/deployment.yaml
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,29 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ include "nginx.fullname" . }}
+ labels:
+ app.kubernetes.io/name: {{ include "nginx.name" . }}
+ helm.sh/chart: {{ include "nginx.chart" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "nginx.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/name: {{ include "nginx.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: http
+ containerPort: 80
+ protocol: TCP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/values.yaml
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/values.yaml
--- old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment/values.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment/values.yaml
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,11 @@
+# Default values for nginx.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+image:
+ repository: nginx
+ tag: stable
+ pullPolicy: IfNotPresent
+
+nameOverride: ""
+fullnameOverride: ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/Chart.yaml
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/Chart.yaml
---
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/Chart.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/Chart.yaml
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: nginx
+version: 0.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/README.md
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/README.md
---
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/README.md
1970-01-01 01:00:00.000000000 +0100
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/README.md
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,4 @@
+Simple chart with a Deployment having a different selector.
+
+The integration test will install first simple-deployment and then try to
upgrade
+to simple-deployment-different-selector failing as expected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/_helpers.tpl
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/_helpers.tpl
---
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/_helpers.tpl
1970-01-01 01:00:00.000000000 +0100
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/_helpers.tpl
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+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 -}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/deployment.yaml
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/deployment.yaml
---
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/deployment.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/templates/deployment.yaml
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,31 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ include "nginx.fullname" . }}
+ labels:
+ app.kubernetes.io/name: {{ include "nginx.name" . }}
+ helm.sh/chart: {{ include "nginx.chart" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "nginx.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ extra: label
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/name: {{ include "nginx.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ extra: label
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: http
+ containerPort: 80
+ protocol: TCP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/values.yaml
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/values.yaml
---
old/chart-testing-3.6.0/pkg/chart/test_charts/simple-deployment-different-selector/values.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/chart-testing-3.7.0/pkg/chart/test_charts/simple-deployment-different-selector/values.yaml
2022-07-27 11:56:37.000000000 +0200
@@ -0,0 +1,11 @@
+# Default values for nginx.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+image:
+ repository: nginx
+ tag: stable
+ pullPolicy: IfNotPresent
+
+nameOverride: ""
+fullnameOverride: ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/config/config.go
new/chart-testing-3.7.0/pkg/config/config.go
--- old/chart-testing-3.6.0/pkg/config/config.go 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/pkg/config/config.go 2022-07-27
11:56:37.000000000 +0200
@@ -20,6 +20,7 @@
"path/filepath"
"reflect"
"strings"
+ "time"
"github.com/mitchellh/go-homedir"
@@ -41,36 +42,39 @@
)
type Configuration struct {
- Remote string `mapstructure:"remote"`
- TargetBranch string `mapstructure:"target-branch"`
- Since string `mapstructure:"since"`
- BuildId string `mapstructure:"build-id"`
- LintConf string `mapstructure:"lint-conf"`
- ChartYamlSchema string `mapstructure:"chart-yaml-schema"`
- ValidateMaintainers bool `mapstructure:"validate-maintainers"`
- ValidateChartSchema bool `mapstructure:"validate-chart-schema"`
- ValidateYaml bool `mapstructure:"validate-yaml"`
- AdditionalCommands []string `mapstructure:"additional-commands"`
- CheckVersionIncrement bool
`mapstructure:"check-version-increment"`
- ProcessAllCharts bool `mapstructure:"all"`
- Charts []string `mapstructure:"charts"`
- ChartRepos []string `mapstructure:"chart-repos"`
- ChartDirs []string `mapstructure:"chart-dirs"`
- ExcludedCharts []string `mapstructure:"excluded-charts"`
- HelmExtraArgs string `mapstructure:"helm-extra-args"`
- HelmRepoExtraArgs []string `mapstructure:"helm-repo-extra-args"`
- HelmDependencyExtraArgs []string
`mapstructure:"helm-dependency-extra-args"`
- Debug bool `mapstructure:"debug"`
- Upgrade bool `mapstructure:"upgrade"`
- SkipMissingValues bool `mapstructure:"skip-missing-values"`
- Namespace string `mapstructure:"namespace"`
- ReleaseLabel string `mapstructure:"release-label"`
- ExcludeDeprecated bool `mapstructure:"exclude-deprecated"`
+ Remote string `mapstructure:"remote"`
+ TargetBranch string `mapstructure:"target-branch"`
+ Since string `mapstructure:"since"`
+ BuildId string `mapstructure:"build-id"`
+ LintConf string `mapstructure:"lint-conf"`
+ ChartYamlSchema string `mapstructure:"chart-yaml-schema"`
+ ValidateMaintainers bool
`mapstructure:"validate-maintainers"`
+ ValidateChartSchema bool
`mapstructure:"validate-chart-schema"`
+ ValidateYaml bool `mapstructure:"validate-yaml"`
+ AdditionalCommands []string
`mapstructure:"additional-commands"`
+ CheckVersionIncrement bool
`mapstructure:"check-version-increment"`
+ ProcessAllCharts bool `mapstructure:"all"`
+ Charts []string `mapstructure:"charts"`
+ ChartRepos []string `mapstructure:"chart-repos"`
+ ChartDirs []string `mapstructure:"chart-dirs"`
+ ExcludedCharts []string `mapstructure:"excluded-charts"`
+ HelmExtraArgs string `mapstructure:"helm-extra-args"`
+ HelmRepoExtraArgs []string
`mapstructure:"helm-repo-extra-args"`
+ HelmDependencyExtraArgs []string
`mapstructure:"helm-dependency-extra-args"`
+ Debug bool `mapstructure:"debug"`
+ Upgrade bool `mapstructure:"upgrade"`
+ SkipMissingValues bool
`mapstructure:"skip-missing-values"`
+ Namespace string `mapstructure:"namespace"`
+ ReleaseLabel string `mapstructure:"release-label"`
+ ExcludeDeprecated bool
`mapstructure:"exclude-deprecated"`
+ KubectlTimeout time.Duration `mapstructure:"kubectl-timeout"`
}
func LoadConfiguration(cfgFile string, cmd *cobra.Command, printConfig bool)
(*Configuration, error) {
v := viper.New()
+ v.SetDefault("kubectl-timeout", time.Duration(30*time.Second))
+
cmd.Flags().VisitAll(func(flag *flag.Flag) {
flagName := flag.Name
if flagName != "config" && flagName != "help" {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/config/config_test.go
new/chart-testing-3.7.0/pkg/config/config_test.go
--- old/chart-testing-3.6.0/pkg/config/config_test.go 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/pkg/config/config_test.go 2022-07-27
11:56:37.000000000 +0200
@@ -18,6 +18,7 @@
"os"
"path/filepath"
"testing"
+ "time"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
@@ -57,6 +58,7 @@
require.Equal(t, "default", cfg.Namespace)
require.Equal(t, "release", cfg.ReleaseLabel)
require.Equal(t, true, cfg.ExcludeDeprecated)
+ require.Equal(t, 120*time.Second, cfg.KubectlTimeout)
}
func Test_findConfigFile(t *testing.T) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/config/test_config.json
new/chart-testing-3.7.0/pkg/config/test_config.json
--- old/chart-testing-3.6.0/pkg/config/test_config.json 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/pkg/config/test_config.json 2022-07-27
11:56:37.000000000 +0200
@@ -29,5 +29,6 @@
"skip-missing-values": true,
"namespace": "default",
"release-label": "release",
- "exclude-deprecated": true
+ "exclude-deprecated": true,
+ "kubectl-timeout": "120s"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/config/test_config.yaml
new/chart-testing-3.7.0/pkg/config/test_config.yaml
--- old/chart-testing-3.6.0/pkg/config/test_config.yaml 2022-05-27
14:52:08.000000000 +0200
+++ new/chart-testing-3.7.0/pkg/config/test_config.yaml 2022-07-27
11:56:37.000000000 +0200
@@ -25,3 +25,4 @@
namespace: default
release-label: release
exclude-deprecated: true
+kubectl-timeout: 120s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chart-testing-3.6.0/pkg/tool/kubectl.go
new/chart-testing-3.7.0/pkg/tool/kubectl.go
--- old/chart-testing-3.6.0/pkg/tool/kubectl.go 2022-05-27 14:52:08.000000000
+0200
+++ new/chart-testing-3.7.0/pkg/tool/kubectl.go 2022-07-27 11:56:37.000000000
+0200
@@ -14,19 +14,23 @@
)
type Kubectl struct {
- exec exec.ProcessExecutor
+ exec exec.ProcessExecutor
+ timeout time.Duration
}
-func NewKubectl(exec exec.ProcessExecutor) Kubectl {
+func NewKubectl(exec exec.ProcessExecutor, timeout time.Duration) Kubectl {
return Kubectl{
- exec: exec,
+ exec: exec,
+ timeout: timeout,
}
}
// CreateNamespace creates a new namespace with the given name.
func (k Kubectl) CreateNamespace(namespace string) error {
fmt.Printf("Creating namespace '%s'...\n", namespace)
- return k.exec.RunProcess("kubectl", "create", "namespace", namespace)
+ return k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "create", "namespace", namespace)
}
// DeleteNamespace deletes the specified namespace. If the namespace does not
terminate within 120s, pods running in the
@@ -34,7 +38,10 @@
func (k Kubectl) DeleteNamespace(namespace string) {
fmt.Printf("Deleting namespace '%s'...\n", namespace)
timeoutSec := "180s"
- if err := k.exec.RunProcess("kubectl", "delete", "namespace",
namespace, "--timeout", timeoutSec); err != nil {
+ err := k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "delete", "namespace", namespace, "--timeout", timeoutSec)
+ if err != nil {
fmt.Printf("Namespace '%s' did not terminate after %s.\n",
namespace, timeoutSec)
}
@@ -42,7 +49,11 @@
fmt.Printf("Namespace '%s' did not terminate after %s.\n",
namespace, timeoutSec)
fmt.Println("Force-deleting everything...")
- if err := k.exec.RunProcess("kubectl", "delete", "all",
"--namespace", namespace, "--all", "--force", "--grace-period=0"); err != nil {
+ err = k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "delete", "all", "--namespace", namespace, "--all",
"--force",
+ "--grace-period=0")
+ if err != nil {
fmt.Printf("Error deleting everything in the namespace
%v: %v", namespace, err)
}
@@ -59,7 +70,9 @@
func (k Kubectl) forceNamespaceDeletion(namespace string) error {
// Getting the namespace json to remove the finalizer
- cmdOutput, err := k.exec.RunProcessAndCaptureOutput("kubectl", "get",
"namespace", namespace, "--output=json")
+ cmdOutput, err := k.exec.RunProcessAndCaptureOutput("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "get", "namespace", namespace, "--output=json")
if err != nil {
fmt.Println("Error getting namespace json:", err)
return err
@@ -111,13 +124,20 @@
time.Sleep(5 * time.Second)
// Check again
- if _, err := k.exec.RunProcessAndCaptureOutput("kubectl", "get",
"namespace", namespace); err != nil {
+ _, err = k.exec.RunProcessAndCaptureOutput("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "get", "namespace", namespace)
+ if err != nil {
fmt.Printf("Namespace '%s' terminated.\n", namespace)
return nil
}
fmt.Printf("Force-deleting namespace '%s'...\n", namespace)
- if err := k.exec.RunProcess("kubectl", "delete", "namespace",
namespace, "--force", "--grace-period=0", "--ignore-not-found=true"); err !=
nil {
+ err = k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "delete", "namespace", namespace, "--force", "--grace-period=0",
+ "--ignore-not-found=true")
+ if err != nil {
fmt.Println("Error deleting namespace:", err)
return err
}
@@ -126,8 +146,10 @@
}
func (k Kubectl) WaitForDeployments(namespace string, selector string) error {
- output, err := k.exec.RunProcessAndCaptureOutput(
- "kubectl", "get", "deployments", "--namespace", namespace,
"--selector", selector, "--output", "jsonpath={.items[*].metadata.name}")
+ output, err := k.exec.RunProcessAndCaptureOutput("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "get", "deployments", "--namespace", namespace, "--selector",
selector,
+ "--output", "jsonpath={.items[*].metadata.name}")
if err != nil {
return err
}
@@ -135,7 +157,9 @@
deployments := strings.Fields(output)
for _, deployment := range deployments {
deployment = strings.Trim(deployment, "'")
- err := k.exec.RunProcess("kubectl", "rollout", "status",
"deployment", deployment, "--namespace", namespace)
+ err = k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "rollout", "status", "deployment", deployment,
"--namespace", namespace)
if err != nil {
return err
}
@@ -145,7 +169,9 @@
//
// Just after rollout, pods from the previous deployment
revision may still be in a
// terminating state.
- unavailable, err :=
k.exec.RunProcessAndCaptureOutput("kubectl", "get", "deployment", deployment,
"--namespace", namespace, "--output",
+ unavailable, err := k.exec.RunProcessAndCaptureOutput("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "get", "deployment", deployment, "--namespace",
namespace, "--output",
`jsonpath={.status.unavailableReplicas}`)
if err != nil {
return err
@@ -159,7 +185,9 @@
}
func (k Kubectl) GetPodsforDeployment(namespace string, deployment string)
([]string, error) {
- jsonString, _ := k.exec.RunProcessAndCaptureOutput("kubectl", "get",
"deployment", deployment, "--namespace", namespace, "--output=json")
+ jsonString, _ := k.exec.RunProcessAndCaptureOutput("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "get", "deployment", deployment, "--namespace", namespace,
"--output=json")
var deploymentMap map[string]interface{}
err := json.Unmarshal([]byte(jsonString), &deploymentMap)
if err != nil {
@@ -183,7 +211,8 @@
func (k Kubectl) GetPods(args ...string) ([]string, error) {
kubectlArgs := []string{"get", "pods"}
kubectlArgs = append(kubectlArgs, args...)
- pods, err := k.exec.RunProcessAndCaptureOutput("kubectl", kubectlArgs)
+ pods, err := k.exec.RunProcessAndCaptureOutput("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout), kubectlArgs)
if err != nil {
return nil, err
}
@@ -191,15 +220,21 @@
}
func (k Kubectl) GetEvents(namespace string) error {
- return k.exec.RunProcess("kubectl", "get", "events", "--output",
"wide", "--namespace", namespace)
+ return k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "get", "events", "--output", "wide", "--namespace", namespace)
}
func (k Kubectl) DescribePod(namespace string, pod string) error {
- return k.exec.RunProcess("kubectl", "describe", "pod", pod,
"--namespace", namespace)
+ return k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "describe", "pod", pod, "--namespace", namespace)
}
func (k Kubectl) Logs(namespace string, pod string, container string) error {
- return k.exec.RunProcess("kubectl", "logs", pod, "--namespace",
namespace, "--container", container)
+ return k.exec.RunProcess("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "logs", pod, "--namespace", namespace, "--container", container)
}
func (k Kubectl) GetInitContainers(namespace string, pod string) ([]string,
error) {
@@ -211,7 +246,10 @@
}
func (k Kubectl) getNamespace(namespace string) bool {
- if _, err := k.exec.RunProcessAndCaptureOutput("kubectl", "get",
"namespace", namespace); err != nil {
+ _, err := k.exec.RunProcessAndCaptureOutput("kubectl",
+ fmt.Sprintf("--request-timeout=%s", k.timeout),
+ "get", "namespace", namespace)
+ if err != nil {
fmt.Printf("Namespace '%s' terminated.\n", namespace)
return false
}
++++++ vendor.tar.gz ++++++
++++ 21850 lines of diff (skipped)
