diff --git a/zuul_operator/templates/zuul.conf b/zuul_operator/templates/zuul.conf index 587d2b2..1c6da8e 100644 --- a/zuul_operator/templates/zuul.conf +++ b/zuul_operator/templates/zuul.conf @@ -1,6 +1,3 @@ -[gearman] -server=zuul-gearman - [keystore] password={{ keystore_password }} @@ -9,9 +6,6 @@ password={{ keystore_password }} {{ key }}={{ value }} {% endfor %} -[gearman_server] -start=true - [scheduler] {% for key, value in spec.scheduler.items() -%} {{ key }}={{ value }} diff --git a/zuul_operator/templates/zuul.yaml b/zuul_operator/templates/zuul.yaml index b93c0a2..7490d28 100644 --- a/zuul_operator/templates/zuul.yaml +++ b/zuul_operator/templates/zuul.yaml @@ -48,28 +48,6 @@ spec: --- apiVersion: v1 kind: Service -metadata: - name: zuul-gearman - labels: - app.kubernetes.io/name: zuul - app.kubernetes.io/instance: {{ instance_name }} - app.kubernetes.io/part-of: zuul - app.kubernetes.io/component: zuul-scheduler -spec: - type: ClusterIP - ports: - - name: gearman - port: 4730 - protocol: TCP - targetPort: gearman - selector: - app.kubernetes.io/name: zuul - app.kubernetes.io/instance: {{ instance_name }} - app.kubernetes.io/part-of: zuul - app.kubernetes.io/component: zuul-scheduler ---- -apiVersion: v1 -kind: Service metadata: name: zuul-web labels: @@ -145,9 +123,6 @@ spec: - name: scheduler image: {{ spec.imagePrefix }}/zuul-scheduler:{{ spec.zuulImageVersion }} args: ["/usr/local/bin/zuul-scheduler", "-f", "-d"] - ports: - - name: gearman - containerPort: 4730 volumeMounts: - name: zuul-config mountPath: /etc/zuul