From 77bfa5f4b852306b7177671fe4daa87ccd232bf7 Mon Sep 17 00:00:00 2001 From: jianglai Date: Wed, 18 Apr 2018 13:29:09 -0700 Subject: [PATCH] Move autoscale object to service yaml file The autoscaling manifest doesn't really change much from environment to environment. It makes sense to move it to the service yaml file, which is not environment dependent. Also enhanced bashrc function to update the deployment manifest when deploy the proxy to alpha ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=193407184 --- .../proxy/kubernetes/proxy-deployment-alpha.yaml | 15 --------------- .../proxy-deployment-sandbox-canary.yaml | 16 +--------------- .../kubernetes/proxy-deployment-sandbox.yaml | 16 +--------------- .../proxy/kubernetes/proxy-service-canary.yaml | 15 +++++++++++++++ .../registry/proxy/kubernetes/proxy-service.yaml | 15 +++++++++++++++ 5 files changed, 32 insertions(+), 45 deletions(-) diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml index 2ecfa3aa1..23020fd75 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml @@ -48,18 +48,3 @@ spec: fieldPath: metadata.namespace - name: CONTAINER_NAME value: proxy ---- -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - namespace: default - name: proxy-autoscale - labels: - app: proxy -spec: - scaleTargetRef: - apiVersion: extensions/v1beta1 - kind: Deployment - name: proxy-deployment - maxReplicas: 5 - minReplicas: 1 diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml index 07305e9ed..ddc2b8d76 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml @@ -48,18 +48,4 @@ spec: fieldPath: metadata.namespace - name: CONTAINER_NAME value: proxy-canary ---- -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - namespace: default - name: proxy-autoscale-canary - labels: - app: proxy-canary -spec: - scaleTargetRef: - apiVersion: extensions/v1beta1 - kind: Deployment - name: proxy-deployment-canary - maxReplicas: 5 - minReplicas: 1 + diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml index 037cb952d..78307d77d 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml @@ -48,18 +48,4 @@ spec: fieldPath: metadata.namespace - name: CONTAINER_NAME value: proxy ---- -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - namespace: default - name: proxy-autoscale - labels: - app: proxy -spec: - scaleTargetRef: - apiVersion: extensions/v1beta1 - kind: Deployment - name: proxy-deployment - maxReplicas: 5 - minReplicas: 1 + diff --git a/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml index 395591c91..5b413cf98 100644 --- a/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml @@ -23,3 +23,18 @@ spec: targetPort: epp name: epp type: NodePort +--- +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + namespace: default + name: proxy-autoscale-canary + labels: + app: proxy-canary +spec: + scaleTargetRef: + apiVersion: extensions/v1beta1 + kind: Deployment + name: proxy-deployment-canary + maxReplicas: 5 + minReplicas: 1 diff --git a/java/google/registry/proxy/kubernetes/proxy-service.yaml b/java/google/registry/proxy/kubernetes/proxy-service.yaml index f266c9d12..57caf4d01 100644 --- a/java/google/registry/proxy/kubernetes/proxy-service.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-service.yaml @@ -23,3 +23,18 @@ spec: targetPort: epp name: epp type: NodePort +--- +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + namespace: default + name: proxy-autoscale + labels: + app: proxy +spec: + scaleTargetRef: + apiVersion: extensions/v1beta1 + kind: Deployment + name: proxy-deployment + maxReplicas: 5 + minReplicas: 1