From e36b1a3b2cf1012c84eecd9c85b21b3dc69922c7 Mon Sep 17 00:00:00 2001
From: tabjer <tabjer@rwwa.com.au>
Date: Thu, 15 Jul 2021 08:44:30 +0800
Subject: [PATCH] Reset for some changes, updated crd and regenerated files

---
 ansible/templates/crd.yml.j2                             | 3 +++
 bundle.Dockerfile                                        | 2 +-
 .../awx-operator/manifests/awx.ansible.com_awxs_crd.yaml | 9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2
index 961ade74..97b7cf2c 100644
--- a/ansible/templates/crd.yml.j2
+++ b/ansible/templates/crd.yml.j2
@@ -86,6 +86,9 @@ spec:
                     - ingress
                     - Route
                     - route
+                ingress_path:
+                  description: The ingress path used to reach the deployed service
+                  type: string
                 ingress_annotations:
                   description: Annotations to add to the Ingress Controller
                   type: string
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
index 17fe97cd..f78084ba 100644
--- a/bundle.Dockerfile
+++ b/bundle.Dockerfile
@@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=awx-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
-LABEL operators.operatorframework.io.metrics.project_layout=ansible
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4
+LABEL operators.operatorframework.io.metrics.project_layout=ansible
 
 COPY deploy/olm-catalog/awx-operator/manifests /manifests/
 COPY deploy/olm-catalog/awx-operator/metadata /metadata/
diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
index ed3906b8..c1ae8b55 100644
--- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
+++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
@@ -36,7 +36,8 @@ spec:
                 description: Secret where the broadcast websocket secret can be found
                 type: string
               bundle_cacert_secret:
-                description: Secret where can be found the trusted Certificate Authority Bundle
+                description: Secret where can be found the trusted Certificate Authority
+                  Bundle
                 type: string
               ca_trust_bundle:
                 description: Path where the trusted CA bundle is available
@@ -140,6 +141,9 @@ spec:
               ingress_annotations:
                 description: Annotations to add to the Ingress Controller
                 type: string
+              ingress_path:
+                description: The ingress path used to reach the deployed service
+                type: string
               ingress_tls_secret:
                 description: Secret where the Ingress TLS secret can be found
                 type: string
@@ -152,9 +156,6 @@ spec:
                 - Route
                 - route
                 type: string
-              ingress_path:
-                  description: The ingress path used to reach the deployed service
-                  type: string
               init_container_image:
                 description: Registry path to the init container to use
                 type: string