From 942cce05e7100ef8177913dcc8cb9c11b429b064 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Thu, 2 Mar 2023 16:19:38 -0500 Subject: [PATCH] resolve merge error --- config/crd/bases/awx.ansible.com_awxs.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/crd/bases/awx.ansible.com_awxs.yaml b/config/crd/bases/awx.ansible.com_awxs.yaml index 927259ff..3e0fef0f 100644 --- a/config/crd/bases/awx.ansible.com_awxs.yaml +++ b/config/crd/bases/awx.ansible.com_awxs.yaml @@ -175,6 +175,13 @@ spec: web_topology_spread_constraints: description: topology rule(s) for the web pods type: string + termination_grace_period_seconds: + description: Optional duration in seconds pods needs to terminate gracefully + type: integer + format: int32 + service_labels: + description: Additional labels to apply to the service + type: string annotations: description: annotations for the pods type: string