From fc9b28b3e2e1be0a2b5171074c5dd8f43e3a0a6f Mon Sep 17 00:00:00 2001 From: Chi Lo Date: Tue, 6 Oct 2020 08:12:17 -0700 Subject: [PATCH] Removed hooks from annotations The add-region job/pod does not need to tie with the post-install or post-upgrade hooks. In addition, hook-delete-policy is not needed since this resource is not created by a hook. Job deletion prior to upgrade is already being taken care of in values.yaml. Change-Id: Ib22cce350e82986d0f51c7bca2be0ee5a01c36a9 --- ranger-agent/Chart.yaml | 2 +- ranger-agent/templates/job-add-region.yaml | 2 -- ranger-agent/values.yaml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ranger-agent/Chart.yaml b/ranger-agent/Chart.yaml index 152b3a65..98d1bc8d 100644 --- a/ranger-agent/Chart.yaml +++ b/ranger-agent/Chart.yaml @@ -15,7 +15,7 @@ appVersion: v1.0.0 description: OpenStack-Helm Ranger Agent home: https://opendev.org/x/ranger-agent name: ranger-agent -version: 0.1.3 +version: 0.1.4 sources: - https://opendev.org/openstack/ranger-agent - https://opendev.org/openstack/openstack-helm diff --git a/ranger-agent/templates/job-add-region.yaml b/ranger-agent/templates/job-add-region.yaml index dc046b02..f7c510a0 100755 --- a/ranger-agent/templates/job-add-region.yaml +++ b/ranger-agent/templates/job-add-region.yaml @@ -27,8 +27,6 @@ kind: Job metadata: name: ranger-agent-add-region annotations: - "helm.sh/hook": post-install,post-upgrade - "helm.sh/hook-delete-policy": before-hook-creation {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: diff --git a/ranger-agent/values.yaml b/ranger-agent/values.yaml index ca9fb834..ee9784ed 100644 --- a/ranger-agent/values.yaml +++ b/ranger-agent/values.yaml @@ -625,7 +625,7 @@ conf: "OSVersion": "Stein" } rms_listener_endpoint: http://localhost:7003/v2/orm/regions - retry_duration_minutes: 660 + retry_duration_minutes: 360 retry_interval_minutes: 15 rabbitmq: