Merge pull request #508 from rooftopcellist/selective-v1-shift

Use v1 extensions because v1beta1 is being removed

ansible/templates/role.yml.j2

@@ -31,7 +31,7 @@ rules:
       - '*'
   - apiGroups:
       - apps
-      - extensions
+      - networking.k8s.io
     resources:
       - deployments
       - daemonsets

deploy/awx-operator.yaml

@@ -637,7 +637,7 @@ rules:
       - '*'
   - apiGroups:
       - apps
-      - extensions
+      - networking.k8s.io
     resources:
       - deployments
       - daemonsets

deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml

@@ -644,7 +644,7 @@ spec:
           - '*'
         - apiGroups:
           - apps
-          - extensions
+          - networking.k8s.io
           resources:
           - deployments
           - daemonsets

roles/installer/templates/ingress.yaml.j2

@@ -1,6 +1,6 @@
 {% if ingress_type|lower == "ingress" %}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: '{{ meta.name }}-ingress'
@@ -21,9 +21,12 @@ spec:
       http:
         paths:
           - path: '{{ ingress_path }}'
+            pathType: Prefix
             backend:
-              serviceName: '{{ meta.name }}-service'
-              servicePort: 80
+              service:
+                name: '{{ meta.name }}-service'
+                port:
+                  number: 80
 {% if ingress_tls_secret %}
   tls:
     - hosts:

roles/installer/templates/service_account.yaml.j2

@@ -36,7 +36,7 @@ rules:
 
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: '{{ meta.name }}'
   namespace: '{{ meta.namespace }}'

scripts/okd-console.yaml

@@ -32,7 +32,7 @@ metadata:
   name: okd-console
   namespace: okd-console
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: okd-console