8000 Prepare Production, and make Staging private by dpordomingo · Pull Request #236 · src-d/code-annotation · GitHub
[go: up one dir, main page]
Skip to content

Prepare Production, and make Staging private #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpordomingo merged 3 commits into from
Apr 9, 2018
Merged

Prepare Production, and make Staging private #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
196230c
Convert Staging to a real testing env
dpordomingo Mar 15, 2018
b6442a0
Explain source{d} app deploy
dpordomingo Apr 4, 2018
307509c
Use production url
dpordomingo Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Copy link
Contributor Author
@dpordomingo dpordomingo Apr 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this conf compatible @rporres ?

ingress.globalStaticIpName=code-annotation-production
ingress.hostname=code-annotation.srcd.run

I'm not sure if we should use a new globalStaticIpName suffixed as -production while we're having a hostname following the staging pattern.

Is this something I should care about?
Does it affect the place where you store the secrets and these configurations?
(most probably I'm mixing concepts, so please ping me when you have time to explain it to me irl 💃 )

Copy link
@rporres rporres Apr 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use code-annotation-production.srcd.run as hostname. The rest is ok

Copy link
Contributor Author
@dpordomingo dpordomingo Apr 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But that's the hostname defined by @mcuadros in the GH OAuth App as he wrote at #217 (comment)

Should we ask him to change it?

Copy link
@rporres rporres Apr 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d'oh, ok. I don't like that name, but I guess it's late to change it. I will change it on my side...

when:
event: [tag]
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion helm-charts/code-annotation/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
0