From 196230c04c61930efeff99819221d4d087951a19 Mon Sep 17 00:00:00 2001 From: David Pordomingo Date: Thu, 15 Mar 2018 18:44:41 +0100 Subject: [PATCH 1/3] Convert Staging to a real testing env --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e34f032..52db2ac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -64,7 +64,7 @@ pipeline: <<: *helm_deploy prefix: STG secrets: [ STG_API_SERVER, STG_KUBERNETES_TOKEN ] - values: ingress.globalStaticIpName=code-annotation-staging,ingress.hostname=code-annotation-staging.srcd.run,image.tag=commit-${DRONE_COMMIT_SHA:0:7},deployment.gaTrackingID=UA-109494282-2,secretName=code-annotation-drone-workaround + values: ingress.globalStaticIpName=code-annotation-staging,ingress.hostname=code-annotation-staging.srcd.run,image.tag=commit-${DRONE_COMMIT_SHA:0:7},deployment.gaTrackingID=UA-115770171-1,authorization.restrictAccessGroup=team:1819537,secretName=code-annotation-drone-workaround when: branch: [staging] event: [push] From b6442a095c8f337e2706827c22061b9b8f2c7d3e Mon Sep 17 00:00:00 2001 From: David Pordomingo Date: Wed, 4 Apr 2018 21:32:50 +0200 Subject: [PATCH 2/3] Explain source{d} app deploy --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 59785ad..463002a 100644 --- a/README.md +++ b/README.md @@ -145,9 +145,9 @@ CAT_OAUTH_RESTRICT_ACCESS=org:my-organization CAT_OAUTH_RESTRICT_REQUESTER_ACCESS=team:123456 ``` -## Deployment +## source{d} internal deployment -This site is deployed in `production` and in `staging` following our [web application deployment workflow](https://github.com/src-d/guide/blob/master/engineering/continuous-delivery.md) +This application is deployed in `production` and `staging` sourced{d} environments following our [web application deployment workflow](https://github.com/src-d/guide/blob/master/engineering/continuous-delivery.md) ## Contributing From 307509c7c83ce0d55c9b67fd7958b6a9549d989f Mon Sep 17 00:00:00 2001 From: David Pordomingo Date: Wed, 4 Apr 2018 21:42:54 +0200 Subject: [PATCH 3/3] Use production url --- .drone.yml | 2 +- helm-charts/code-annotation/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 52db2ac..1328fcf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -97,6 +97,6 @@ pipeline: <<: *helm_deploy prefix: PROD secrets: [ PROD_API_SERVER, PROD_KUBERNETES_TOKEN ] - values: ingress.globalStaticIpName=code-annotation-production,ingress.hostname=code-annotation.sourced.tech,image.tag=${DRONE_TAG},deployment.gaTrackingID=UA-109494282-2,secretName=code-annotation-drone-workaround + values: ingress.globalStaticIpName=code-annotation-production,ingress.hostname=code-annotation.srcd.run,image.tag=${DRONE_TAG},deployment.gaTrackingID=UA-109494282-2,secretName=code-annotation-drone-workaround when: event: [tag] diff --git a/helm-charts/code-annotation/values.yaml b/helm-charts/code-annotation/values.yaml index 11d0180..aa72ff3 100644 --- a/helm-charts/code-annotation/values.yaml +++ b/helm-charts/code-annotation/values.yaml @@ -28,7 +28,7 @@ ingress: kubernetes.io/ingress.class: gce tls: true # below values are required - # hostname: "code-annotation.sourced.tech" + # hostname: "code-annotation.srcd.run" # globalStaticIpName: "code-annotation-ip" # Provide with 'helm install', and do NOT change it when doing 'helm upgrade'