From dc60ef8454610070f752deffa76fc833cd740124 Mon Sep 17 00:00:00 2001
From: "Lo, Chi (cl566n)" <cl566n@att.com>
Date: Wed, 23 Feb 2022 15:17:39 -0800
Subject: [PATCH] Removing set -x from function

Removing set -x from within the dump_databases_to_directory function.
The set -x from within the function is causing all the code that
follows the function call to have debug tracing on. This in turns
causing multiple identical logs for the same event. Looking at this
function, there should be enough logging to aid debugging.

Reference ps:  https://review.opendev.org/c/openstack/openstack-helm-infra/+/830533
               (commit 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3)

Change-Id: Id442972bbcca983afab7c4f3c29f3686e9e0b481
---
 charts/etcd/templates/bin/_etcdbackup.tpl | 1 -
 examples/basic/armada-resources.yaml      | 4 ++--
 examples/complete/armada-resources.yaml   | 4 ++--
 examples/containerd/armada-resources.yaml | 4 ++--
 examples/gate/armada-resources.yaml       | 4 ++--
 tools/helm_tk.sh                          | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/charts/etcd/templates/bin/_etcdbackup.tpl b/charts/etcd/templates/bin/_etcdbackup.tpl
index d3b16f20..e57444a5 100644
--- a/charts/etcd/templates/bin/_etcdbackup.tpl
+++ b/charts/etcd/templates/bin/_etcdbackup.tpl
@@ -36,7 +36,6 @@ export MAX_DELAY_SEND_REMOTE=${MAX_DELAY_SEND_BACKUP_TO_REMOTE}
 export ARCHIVE_DIR=${BACKUP_DIR}/db/${DB_NAMESPACE}/${DB_NAME}/archive
 
 dump_databases_to_directory() {
-  set -x
   TMP_DIR=$1
   LOG_FILE=${2:-BACKUP_LOG}
 
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index 3f48465d..72b29a08 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -111,7 +111,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -135,7 +135,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index c581fed1..075ac3cd 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -152,7 +152,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -177,7 +177,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml
index 0680fe10..4752528e 100644
--- a/examples/containerd/armada-resources.yaml
+++ b/examples/containerd/armada-resources.yaml
@@ -111,7 +111,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -135,7 +135,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml
index 5eca6648..65bb6fde 100644
--- a/examples/gate/armada-resources.yaml
+++ b/examples/gate/armada-resources.yaml
@@ -111,7 +111,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -135,7 +135,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: 4a490b894ce2a3c547075a5559de58fd07124401
+    reference: 2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 13630d5b..ebeed2b6 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -17,7 +17,7 @@
 set -eux
 
 HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"}
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"11ac37056b1a45cdcdabe0aab239ab7fadd53b24"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"2fc1ce4a142e605a9fc6c90dceabbf7c4bfb81e3"}
 
 TMP_DIR=$(mktemp -d)