diff --git a/ansible/templates/role.yml.j2 b/ansible/templates/role.yml.j2 index 886bd5f0..391ec61b 100644 --- a/ansible/templates/role.yml.j2 +++ b/ansible/templates/role.yml.j2 @@ -31,7 +31,7 @@ rules: - '*' - apiGroups: - apps - - extensions + - networking.k8s.io resources: - deployments - daemonsets diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 47ada64e..7ae8c8ee 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -637,7 +637,7 @@ rules: - '*' - apiGroups: - apps - - extensions + - networking.k8s.io resources: - deployments - daemonsets diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml index 4a4716c0..62e6dd09 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -644,7 +644,7 @@ spec: - '*' - apiGroups: - apps - - extensions + - networking.k8s.io resources: - deployments - daemonsets diff --git a/roles/installer/templates/ingress.yaml.j2 b/roles/installer/templates/ingress.yaml.j2 index a93cd7b5..f4f8ee93 100644 --- a/roles/installer/templates/ingress.yaml.j2 +++ b/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: diff --git a/roles/installer/templates/service_account.yaml.j2 b/roles/installer/templates/service_account.yaml.j2 index 3786c6d6..5119864b 100644 --- a/roles/installer/templates/service_account.yaml.j2 +++ b/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 }}' diff --git a/scripts/okd-console.yaml b/scripts/okd-console.yaml index 11112f74..deb0d361 100644 --- a/scripts/okd-console.yaml +++ b/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