diff --git a/playbooks/zuul-operator-functional/tasks/ingress.yaml b/playbooks/zuul-operator-functional/tasks/ingress.yaml new file mode 100644 index 0000000..cc89d92 --- /dev/null +++ b/playbooks/zuul-operator-functional/tasks/ingress.yaml @@ -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 diff --git a/playbooks/zuul-operator-functional/test.yaml b/playbooks/zuul-operator-functional/test.yaml index 684db89..841f607 100644 --- a/playbooks/zuul-operator-functional/test.yaml +++ b/playbooks/zuul-operator-functional/test.yaml @@ -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 diff --git a/zuul_operator/templates/zuul.yaml b/zuul_operator/templates/zuul.yaml index 6736ae3..951704c 100644 --- a/zuul_operator/templates/zuul.yaml +++ b/zuul_operator/templates/zuul.yaml @@ -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