From 8e33daf850e775a62e232ebb1489014fe3357bc8 Mon Sep 17 00:00:00 2001 From: Steve Loranz Date: Sep 02 2021 16:14:31 +0000 Subject: updated for networking.k8s.io/v1 networking.k8s.io/v1beta1 was dropped in 1.22.0 --- diff --git a/operator/molecule/default/tasks/kojihub_test.yml b/operator/molecule/default/tasks/kojihub_test.yml index 4ba3f30..625d636 100644 --- a/operator/molecule/default/tasks/kojihub_test.yml +++ b/operator/molecule/default/tasks/kojihub_test.yml @@ -116,7 +116,7 @@ - block: - name: 'TEST: kojihub.ingress.http' k8s_info: - api_version: networking.k8s.io/v1beta1 + api_version: networking.k8s.io/v1 kind: Ingress namespace: "{{ namespace }}" name: koji-hub-http diff --git a/operator/roles/koji-hub/templates/ingress.yml.j2 b/operator/roles/koji-hub/templates/ingress.yml.j2 index b0f6947..4991664 100644 --- a/operator/roles/koji-hub/templates/ingress.yml.j2 +++ b/operator/roles/koji-hub/templates/ingress.yml.j2 @@ -1,4 +1,4 @@ -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ koji_hub_ingress_name }} @@ -20,10 +20,13 @@ spec: secretName: {{ koji_hub_service_cert_secret }} {% endif %} rules: - - http: - paths: - - path: /kojihub - pathType: Prefix - backend: - serviceName: {{ koji_hub_ingress_svc }} - servicePort: {{ koji_hub_http_port }} + - host: {{ koji_hub_host }} + http: + paths: + - backend: + service: + name: {{ koji_hub_ingress_svc }} + port: + number: {{ koji_hub_http_port }} + path: /kojihub + pathType: Prefix