From 922e3b2ecf591d3927d1eef0d6c1c4686bb6043a Mon Sep 17 00:00:00 2001
From: "Parsons, Cliff (cp769u)" <cp769u@att.com>
Date: Fri, 23 Oct 2020 16:13:37 +0000
Subject: [PATCH] Uplift HTK for etcd backup/restore delete archive capability

This patch includes the upstream helm toolkit change below which adds
the capability to delete an archive from the local or remote data stores.

https://review.opendev.org/#/c/758859/
(commit 2d1fe882bb751c03ee741a6166c9c8a5fad8f926)

Change-Id: Iec3f234f5be780bd90d233b1cba58d11127d5d28
---
 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 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index ce116e5b..553e3b9e 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -112,7 +112,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -136,7 +136,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index eca5e466..9faa845d 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -153,7 +153,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -178,7 +178,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml
index 9a91aeb2..989a7373 100644
--- a/examples/containerd/armada-resources.yaml
+++ b/examples/containerd/armada-resources.yaml
@@ -112,7 +112,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -136,7 +136,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml
index cf655de7..de84d254 100644
--- a/examples/gate/armada-resources.yaml
+++ b/examples/gate/armada-resources.yaml
@@ -112,7 +112,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -136,7 +136,7 @@ data:
     type: git
     location: https://opendev.org/openstack/openstack-helm-infra.git
     subpath: helm-toolkit
-    reference: fc8d855a439226878bc3bc07e4d117d72ae89993
+    reference: 2d1fe882bb751c03ee741a6166c9c8a5fad8f926
   dependencies: []
 ---
 schema: armada/Chart/v1
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index ffabe0ca..68c158ba 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -20,7 +20,7 @@ HELM=${1}
 HELM_PIDFILE=${2}
 SERVE_DIR=$(mktemp -d)
 
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"fc8d855a439226878bc3bc07e4d117d72ae89993"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"2d1fe882bb751c03ee741a6166c9c8a5fad8f926"}
 
 ${HELM} init --client-only