From c6231a80d03c7fad0b53b02ab23f38aeca12df1d Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko@vexxhost.com>
Date: Mon, 6 Jul 2020 19:45:12 +0300
Subject: [PATCH] Change ingress api version

Change-Id: If9e31a2bf5f85f7f07fa81acccacd8e44b7d2ab9
---
 openstack_operator/objects.py                        | 3 +++
 openstack_operator/templates/heat/ingress.yml.j2     | 2 +-
 openstack_operator/templates/horizon/ingress.yml.j2  | 2 +-
 openstack_operator/templates/keystone/ingress.yml.j2 | 2 +-
 openstack_operator/templates/magnum/ingress.yml.j2   | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/openstack_operator/objects.py b/openstack_operator/objects.py
index 26f54122..6fc156eb 100644
--- a/openstack_operator/objects.py
+++ b/openstack_operator/objects.py
@@ -93,5 +93,8 @@ MAPPING = {
     "monitoring.coreos.com/v1": {
         "PodMonitor": PodMonitor,
         "PrometheusRule": PrometheusRule,
+    },
+    "networking.k8s.io/v1beta1": {
+        "Ingress": Ingress
     }
 }
diff --git a/openstack_operator/templates/heat/ingress.yml.j2 b/openstack_operator/templates/heat/ingress.yml.j2
index 0a94f1ff..c3a08e86 100644
--- a/openstack_operator/templates/heat/ingress.yml.j2
+++ b/openstack_operator/templates/heat/ingress.yml.j2
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: heat
diff --git a/openstack_operator/templates/horizon/ingress.yml.j2 b/openstack_operator/templates/horizon/ingress.yml.j2
index f60fb7cb..da6c9c9e 100644
--- a/openstack_operator/templates/horizon/ingress.yml.j2
+++ b/openstack_operator/templates/horizon/ingress.yml.j2
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: horizon
diff --git a/openstack_operator/templates/keystone/ingress.yml.j2 b/openstack_operator/templates/keystone/ingress.yml.j2
index d4dfa4e1..dbd23e1c 100644
--- a/openstack_operator/templates/keystone/ingress.yml.j2
+++ b/openstack_operator/templates/keystone/ingress.yml.j2
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 {% if spec.ingress is defined %}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: keystone
diff --git a/openstack_operator/templates/magnum/ingress.yml.j2 b/openstack_operator/templates/magnum/ingress.yml.j2
index 82608cda..330c8e55 100644
--- a/openstack_operator/templates/magnum/ingress.yml.j2
+++ b/openstack_operator/templates/magnum/ingress.yml.j2
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: magnum