From d365ab873b83a1114de51fa0467dc27581ccc54a Mon Sep 17 00:00:00 2001 From: "Huang, Sophie (sh879n)" Date: Wed, 30 Sep 2020 02:44:50 +0000 Subject: [PATCH] Uplift HTK for etcd backup/restore framework Include below patchset to make database backups work with openstack Train release. https://review.opendev.org/#/c/754831 Change-Id: I8004ac8320f02bb0acbf0edd9caa9520a94aada1 --- 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 affb85c7..ce116e5b 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 dependencies: [] --- schema: armada/Chart/v1 diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 0109246d..eca5e466 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 dependencies: [] --- schema: armada/Chart/v1 diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 17fbbe90..9a91aeb2 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 dependencies: [] --- schema: armada/Chart/v1 diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index ec70e640..cf655de7 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 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: 898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3 + reference: fc8d855a439226878bc3bc07e4d117d72ae89993 dependencies: [] --- schema: armada/Chart/v1 diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh index d7d0b9e9..ffabe0ca 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:-"898f6b94ed09f10dc76fc5b9aa460f1d44f2daa3"} +HTK_STABLE_COMMIT=${HTK_COMMIT:-"fc8d855a439226878bc3bc07e4d117d72ae89993"} ${HELM} init --client-only