Move ingress to functional test

The operator currently creates an ingress object, but this was really
just to aid testing.  The operator probably shouldn't really create one
since doing so may be site-specific.

Having the ingress greatly aids local and functional testing though, so
move it to the functional test playbook.

Change-Id: Ic6296120f8c107ecc29556fdab4d6cddb5216a50
This commit is contained in:
James E. Blair 2021-04-10 10:41:55 -07:00
parent 1b699279a4
commit b6d8f1eb53
3 changed files with 18 additions and 18 deletions

View File

@ -0,0 +1,15 @@
- k8s:
namespace: default
definition:
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: zuul-test-ingress
spec:
rules:
- http:
paths:
- path: /
backend:
serviceName: zuul-web
servicePort: 9000

View File

@ -1,6 +1,9 @@
- name: run functional tst
hosts: all
tasks:
- name: Install ingress
include_tasks: tasks/ingress.yaml
- name: Create temp git root directory
tempfile:
state: directory

View File

@ -298,21 +298,3 @@ spec:
{%- for volume in spec.get('jobVolumes', []) %}
- {{ volume.volume | zuul_to_json }}
{%- endfor %}
---
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: zuul-ingress
labels:
app.kubernetes.io/name: zuul
app.kubernetes.io/instance: {{ instance_name }}
app.kubernetes.io/part-of: zuul
app.kubernetes.io/component: zuul-web
spec:
rules:
- http:
paths:
- path: /
backend:
serviceName: zuul-web
servicePort: 9000