From 1147e9689efd65d48d44dd2621c15ff107b3c078 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Tue, 12 Nov 2019 08:46:22 -0800
Subject: [PATCH] MAAS chart fixes: ingress apiversion, serviceNames

This change fixes a few issues with the MAAS chart:

1. Removes extraneous serviceName from maas-ingress-errors Deployment
2. Adds missing serviceName to maas-syslog StatefulSet
3. Moves maas-region-api Ingress object back under extensions/v1beta1
   Similar to: https://review.opendev.org/691701/

Change-Id: I83156c0e255ad17bbac024daba293490980414ee
---
 charts/maas/templates/deployment-ingress-errors.yaml | 1 -
 charts/maas/templates/ingress-region.yaml            | 2 +-
 charts/maas/templates/statefulset-maas-syslog.yaml   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/maas/templates/deployment-ingress-errors.yaml b/charts/maas/templates/deployment-ingress-errors.yaml
index b0f15c3..4aa713c 100644
--- a/charts/maas/templates/deployment-ingress-errors.yaml
+++ b/charts/maas/templates/deployment-ingress-errors.yaml
@@ -29,7 +29,6 @@ kind: Deployment
 metadata:
   name: maas-ingress-errors
 spec:
-  serviceName: maas-rack
   replicas: {{ .Values.pod.replicas.ingress_errors }}
   selector:
     matchLabels:
diff --git a/charts/maas/templates/ingress-region.yaml b/charts/maas/templates/ingress-region.yaml
index 2926c97..7a2f0e3 100644
--- a/charts/maas/templates/ingress-region.yaml
+++ b/charts/maas/templates/ingress-region.yaml
@@ -16,7 +16,7 @@
 
 {{- if and .Values.manifests.ingress_region .Values.network.region_api.ingress.public }}
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: maas-region-api
diff --git a/charts/maas/templates/statefulset-maas-syslog.yaml b/charts/maas/templates/statefulset-maas-syslog.yaml
index 90ad59c..90b5f0b 100644
--- a/charts/maas/templates/statefulset-maas-syslog.yaml
+++ b/charts/maas/templates/statefulset-maas-syslog.yaml
@@ -34,6 +34,7 @@ spec:
   selector:
     matchLabels:
 {{ tuple $envAll "maas" "syslog" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
+  serviceName: maas-syslog
   template:
     metadata:
       labels: