Skip to content
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

Jump to bottom

Address comments from https://github.com/GoogleCloudPlatform/fda-mystudies/pull/202 #204

Merged
merged 3 commits into from
Apr 22, 2020
Merged

Address comments from https://github.com/GoogleCloudPlatform/fda-mystudies/pull/202 #204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b350909
Address comments from https://github.com/GoogleCloudPlatform/fda-myst…
MartinPetkov Apr 22, 2020
9d033d8
Merge branch 'terraform' into address-comments-on-merge
MartinPetkov Apr 22, 2020
2b813e3
Merge branch 'terraform' into address-comments-on-merge
MartinPetkov Apr 22, 2020
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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
**/.terraform
*.tfstate
*.tfstate.*
sql_credentials.json
key.json
2 changes: 1 addition & 1 deletion Terraform/org/audit/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ module "storage_destination" {

name = var.bucket_name
project_id = var.project_id
location = "us-central1"
location = "us-east1"
storage_class = "COLDLINE"
iam_members = [
{
Expand Down
104 changes: 49 additions & 55 deletions WCP-WS/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,61 @@
# TODO: Rename this from study-meta-data to study-server.
apiVersion: apps/v1
kind: Deployment
metadata:
name: study-meta-data
labels:
app: study-meta-data
spec:
replicas: 1
selector:
matchLabels:
app: study-meta-data
template:
metadata:
labels:
app: study-meta-data
spec:
containers:
- name: study-meta-data
image: gcr.io/heroes-hat-dev-apps/study-meta-data:latest
env:
- name: DB_USER
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: username
- name: DB_PASS
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: dbname
apiVersion: apps/v1
Copy link
Member

Choose a reason for hiding this comment

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

Are these new trailing spaces?

Copy link
Author

Choose a reason for hiding this comment

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

Not exactly, the files in early-access already have them. I just ran git checkout early-access -- deployment.yaml on each of them, so they're the same as in that branch.

kind: Deployment
metadata:
name: study-meta-data
labels:
app: study-meta-data
spec:
replicas: 1
selector:
matchLabels:
app: study-meta-data
template:
metadata:
labels:
app: study-meta-data
spec:
containers:
- name: study-meta-data
image: gcr.io/heroes-hat-dev/study-meta-data:latest
env:
- name: DB_USER
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: username
- name: DB_PASS
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: dbname
- name: RESPONSE_SERVER
value: "response-server-np:50000"
- name: USER_REGISTRATION_SERVER
value: "user-registration-server-np:60000"
value: "user-registration-server-np:50000"
- name: STUDY_DESIGNER
value: "study-designer-np:50000"
- name: GOOGLE_APPLICATION_CREDENTIALS
value: "/secrets/gcloud_key/key.json"
ports:
- containerPort: 8080
readinessProbe:
httpGet:
path: /StudyMetaData/ping
port: 8080
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
- name: cloudsql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command: ["/cloud_sql_proxy",
"-instances=heroes-hat-dev-data:us-east1:my-studies-2=tcp:3306",
"-credential_file=/secrets/gcloud_key/key.json"]
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
volumes:
- name: gcloud-key-volume
secret:
secretName: study-meta-data-gcloud-key
- name: cloudsql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command: ["/cloud_sql_proxy",
"-instances=heroes-hat-dev:us-east1:my-studies2=tcp:3306",
"-credential_file=/secrets/cloudsql/key.json"]
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/cloudsql
readOnly: true
volumes:
- name: gcloud-key-volume
secret:
secretName: study-meta-data-gcloud-key
67 changes: 67 additions & 0 deletions WCP-WS/tf-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# TODO: Rename this from study-meta-data to study-server.
apiVersion: apps/v1
kind: Deployment
metadata:
name: study-meta-data
labels:
app: study-meta-data
spec:
replicas: 1
selector:
matchLabels:
app: study-meta-data
template:
metadata:
labels:
app: study-meta-data
spec:
containers:
- name: study-meta-data
image: gcr.io/heroes-hat-dev-apps/study-meta-data:latest
env:
- name: DB_USER
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: username
- name: DB_PASS
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: study-meta-data-db-credentials
key: dbname
- name: RESPONSE_SERVER
value: "response-server-np:50000"
- name: USER_REGISTRATION_SERVER
value: "user-registration-server-np:50000"
- name: STUDY_DESIGNER
value: "study-designer-np:50000"
- name: GOOGLE_APPLICATION_CREDENTIALS
value: "/secrets/gcloud_key/key.json"
ports:
- containerPort: 8080
readinessProbe:
httpGet:
path: /StudyMetaData/ping
port: 8080
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
- name: cloudsql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command: ["/cloud_sql_proxy",
"-instances=heroes-hat-dev-data:us-east1:my-studies-2=tcp:3306",
"-credential_file=/secrets/gcloud_key/key.json"]
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
volumes:
- name: gcloud-key-volume
secret:
secretName: study-meta-data-gcloud-key
108 changes: 53 additions & 55 deletions WCP/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,58 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: study-designer
labels:
app: study-designer
spec:
replicas: 1
selector:
matchLabels:
app: study-designer
template:
metadata:
labels:
app: study-designer
spec:
containers:
- name: study-designer
image: gcr.io/heroes-hat-dev-apps/study-designer:latest
env:
- name: DB_USER
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: username
- name: DB_PASS
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: dbname
apiVersion: apps/v1
kind: Deployment
metadata:
name: study-designer
labels:
app: study-designer
spec:
replicas: 1
selector:
matchLabels:
app: study-designer
template:
metadata:
labels:
app: study-designer
spec:
containers:
- name: study-designer
image: gcr.io/heroes-hat-dev/study-designer:latest
env:
- name: DB_USER
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: username
- name: DB_PASS
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: dbname
- name: REGISTRATION_SERVER_URL
value: "user-registration-server-np:60000"
value: "user-registration-server-np:50000"
- name: RESPONSE_SERVER_URL
value: "response-server-np:50000"
- name: GOOGLE_APPLICATION_CREDENTIALS
value: "/secrets/gcloud_key/key.json"
ports:
- containerPort: 8080
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
- name: cloudsql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command: ["/cloud_sql_proxy",
"-instances=heroes-hat-dev-data:us-east1:my-studies-2=tcp:3306",
"-credential_file=/secrets/gcloud_key/key.json"]
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
volumes:
- name: gcloud-key-volume
secret:
secretName: study-designer-gcloud-key
readinessProbe:
httpGet:
path: /fdahpStudyDesigner/appDetails.do
port: 8080
- name: cloudsql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command: ["/cloud_sql_proxy",
"-instances=heroes-hat-dev:us-east1:my-studies2=tcp:3306",
"-credential_file=/secrets/cloudsql/key.json"]
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/cloudsql
readOnly: true
volumes:
- name: gcloud-key-volume
secret:
secretName: study-meta-data-gcloud-key
60 changes: 60 additions & 0 deletions WCP/tf-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: study-designer
labels:
app: study-designer
spec:
replicas: 1
selector:
matchLabels:
app: study-designer
template:
metadata:
labels:
app: study-designer
spec:
containers:
- name: study-designer
image: gcr.io/heroes-hat-dev-apps/study-designer:latest
env:
- name: DB_USER
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: username
- name: DB_PASS
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: study-designer-db-credentials
key: dbname
- name: REGISTRATION_SERVER_URL
value: "user-registration-server-np:50000"
- name: RESPONSE_SERVER_URL
value: "response-server-np:50000"
- name: GOOGLE_APPLICATION_CREDENTIALS
value: "/secrets/gcloud_key/key.json"
ports:
- containerPort: 8080
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
- name: cloudsql-proxy
image: gcr.io/cloudsql-docker/gce-proxy:latest
command: ["/cloud_sql_proxy",
"-instances=heroes-hat-dev-data:us-east1:my-studies-2=tcp:3306",
"-credential_file=/secrets/gcloud_key/key.json"]
volumeMounts:
- name: gcloud-key-volume
mountPath: /secrets/gcloud_key
readOnly: true
volumes:
- name: gcloud-key-volume
secret:
secretName: study-designer-gcloud-key
Loading