From 1a8243e03382ff8e28d9f00d83bf48ca0fda40cd Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 9 Jun 2015 13:25:02 -0700 Subject: [PATCH 1/2] v1beta3 to v1 --- celery-rabbitmq/README.md | 8 ++++---- celery-rabbitmq/celery-controller.yaml | 2 +- celery-rabbitmq/flower-controller.yaml | 2 +- celery-rabbitmq/rabbitmq-controller.yaml | 2 +- celery-rabbitmq/rabbitmq-service.yaml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/celery-rabbitmq/README.md b/celery-rabbitmq/README.md index 877c5d70..487ab119 100644 --- a/celery-rabbitmq/README.md +++ b/celery-rabbitmq/README.md @@ -34,7 +34,7 @@ The Celery task queue will need to communicate with the RabbitMQ broker. RabbitM Use the file [`examples/celery-rabbitmq/rabbitmq-service.yaml`](rabbitmq-service.yaml): ```yaml -apiVersion: v1beta3 +apiVersion: v1 kind: Service metadata: labels: @@ -66,7 +66,7 @@ This service allows other pods to connect to the rabbitmq. To them, it will be s A RabbitMQ broker can be turned up using the file [`examples/celery-rabbitmq/rabbitmq-controller.yaml`](rabbitmq-controller.yaml): ```yaml -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: labels: @@ -103,7 +103,7 @@ Note that bringing up the pod includes pulling down a docker image, which may ta Bringing up the celery worker is done by running `$ kubectl create -f examples/celery-rabbitmq/celery-controller.yaml`, which contains this: ```yaml -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: labels: @@ -181,7 +181,7 @@ Flower is a web-based tool for monitoring and administrating Celery clusters. By To bring up the frontend, run this command `$ kubectl create -f examples/celery-rabbitmq/flower-controller.yaml`. This controller is defined as so: ```yaml -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: labels: diff --git a/celery-rabbitmq/celery-controller.yaml b/celery-rabbitmq/celery-controller.yaml index 4fc7004d..dff3c23f 100644 --- a/celery-rabbitmq/celery-controller.yaml +++ b/celery-rabbitmq/celery-controller.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: labels: diff --git a/celery-rabbitmq/flower-controller.yaml b/celery-rabbitmq/flower-controller.yaml index 16481b97..06c897e7 100644 --- a/celery-rabbitmq/flower-controller.yaml +++ b/celery-rabbitmq/flower-controller.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: labels: diff --git a/celery-rabbitmq/rabbitmq-controller.yaml b/celery-rabbitmq/rabbitmq-controller.yaml index 4bd7f608..43ae46ff 100644 --- a/celery-rabbitmq/rabbitmq-controller.yaml +++ b/celery-rabbitmq/rabbitmq-controller.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: labels: diff --git a/celery-rabbitmq/rabbitmq-service.yaml b/celery-rabbitmq/rabbitmq-service.yaml index 80bbb1a2..cf37a850 100644 --- a/celery-rabbitmq/rabbitmq-service.yaml +++ b/celery-rabbitmq/rabbitmq-service.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Service metadata: labels: From 2ec7eed42d0b216760efde3934809d874313347e Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 9 Jun 2015 13:28:47 -0700 Subject: [PATCH 2/2] remove defaults --- celery-rabbitmq/README.md | 5 ----- celery-rabbitmq/celery-controller.yaml | 1 - celery-rabbitmq/flower-controller.yaml | 1 - celery-rabbitmq/rabbitmq-controller.yaml | 1 - celery-rabbitmq/rabbitmq-service.yaml | 2 -- 5 files changed, 10 deletions(-) diff --git a/celery-rabbitmq/README.md b/celery-rabbitmq/README.md index 487ab119..577bfcc8 100644 --- a/celery-rabbitmq/README.md +++ b/celery-rabbitmq/README.md @@ -43,8 +43,6 @@ metadata: spec: ports: - port: 5672 - protocol: TCP - targetPort: 5672 selector: app: taskQueue component: rabbitmq @@ -87,7 +85,6 @@ spec: name: rabbitmq ports: - containerPort: 5672 - protocol: TCP resources: limits: cpu: 100m @@ -124,7 +121,6 @@ spec: name: celery ports: - containerPort: 5672 - protocol: TCP resources: limits: cpu: 100m @@ -203,7 +199,6 @@ spec: ports: - containerPort: 5555 hostPort: 5555 - protocol: TCP resources: limits: cpu: 100m diff --git a/celery-rabbitmq/celery-controller.yaml b/celery-rabbitmq/celery-controller.yaml index dff3c23f..31a4f52a 100644 --- a/celery-rabbitmq/celery-controller.yaml +++ b/celery-rabbitmq/celery-controller.yaml @@ -19,7 +19,6 @@ spec: name: celery ports: - containerPort: 5672 - protocol: TCP resources: limits: cpu: 100m diff --git a/celery-rabbitmq/flower-controller.yaml b/celery-rabbitmq/flower-controller.yaml index 06c897e7..6f1cc10c 100644 --- a/celery-rabbitmq/flower-controller.yaml +++ b/celery-rabbitmq/flower-controller.yaml @@ -20,7 +20,6 @@ spec: ports: - containerPort: 5555 hostPort: 5555 - protocol: TCP resources: limits: cpu: 100m diff --git a/celery-rabbitmq/rabbitmq-controller.yaml b/celery-rabbitmq/rabbitmq-controller.yaml index 43ae46ff..2d68e34d 100644 --- a/celery-rabbitmq/rabbitmq-controller.yaml +++ b/celery-rabbitmq/rabbitmq-controller.yaml @@ -19,7 +19,6 @@ spec: name: rabbitmq ports: - containerPort: 5672 - protocol: TCP resources: limits: cpu: 100m diff --git a/celery-rabbitmq/rabbitmq-service.yaml b/celery-rabbitmq/rabbitmq-service.yaml index cf37a850..ec29b32c 100644 --- a/celery-rabbitmq/rabbitmq-service.yaml +++ b/celery-rabbitmq/rabbitmq-service.yaml @@ -7,8 +7,6 @@ metadata: spec: ports: - port: 5672 - protocol: TCP - targetPort: 5672 selector: app: taskQueue component: rabbitmq