-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Updated Django Container Engine sample to use CloudSQL v2, sidecar co… #758
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3eb1605
Updated Django Container Engine sample to use CloudSQL v2, sidecar co…
ryanmats b7f5a7d
Fixed linter issue
ryanmats 06242c1
Merge branch 'master' of https://github.com/GoogleCloudPlatform/pytho…
ryanmats 376044f
Added secrets for database user/password
ryanmats File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,12 +19,12 @@ | |
# instances of the bookshelf app are running on the cluster. | ||
# For more info about Pods see: | ||
# https://cloud.google.com/container-engine/docs/pods/ | ||
# For more info about Replication Controllers: | ||
# https://cloud.google.com/container-engine/docs/replicationcontrollers/ | ||
# For more info about Deployments: | ||
# https://kubernetes.io/docs/user-guide/deployments/ | ||
|
||
# [START replication_controller] | ||
apiVersion: v1 | ||
kind: ReplicationController | ||
# [START kubernetes_deployment] | ||
apiVersion: extensions/v1beta1 | ||
kind: Deployment | ||
metadata: | ||
name: polls | ||
labels: | ||
|
@@ -39,14 +39,54 @@ spec: | |
containers: | ||
- name: polls-app | ||
# Replace with your project ID or use `make template` | ||
image: gcr.io/$GCLOUD_PROJECT/polls | ||
image: gcr.io/<your-project-id>/polls | ||
# This setting makes nodes pull the docker image every time before | ||
# starting the pod. This is useful when debugging, but should be turned | ||
# off in production. | ||
imagePullPolicy: Always | ||
env: | ||
# [START cloudsql_secrets] | ||
- name: DATABASE_USER | ||
valueFrom: | ||
secretKeyRef: | ||
name: cloudsql | ||
key: username | ||
- name: DATABASE_PASSWORD | ||
valueFrom: | ||
secretKeyRef: | ||
name: cloudsql | ||
key: password | ||
# [END cloudsql_secrets] | ||
ports: | ||
- containerPort: 8080 | ||
# [END replication_controller] | ||
|
||
# [START proxy_container] | ||
- image: b.gcr.io/cloudsql-docker/gce-proxy:1.05 | ||
name: cloudsql-proxy | ||
command: ["/cloud_sql_proxy", "--dir=/cloudsql", | ||
"-instances=<your-cloudsql-connection-string>=tcp:3306", | ||
"-credential_file=/secrets/cloudsql/credentials.json"] | ||
volumeMounts: | ||
- name: cloudsql-oauth-credentials | ||
mountPath: /secrets/cloudsql | ||
readOnly: true | ||
- name: ssl-certs | ||
mountPath: /etc/ssl/certs | ||
- name: cloudsql | ||
mountPath: /cloudsql | ||
# [END proxy_container] | ||
# [START volumes] | ||
volumes: | ||
- name: cloudsql-oauth-credentials | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. where are these secrets created? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. bill and i just discussed this, will update on Tuesday |
||
secret: | ||
secretName: cloudsql-oauth-credentials | ||
- name: ssl-certs | ||
hostPath: | ||
path: /etc/ssl/certs | ||
- name: cloudsql | ||
emptyDir: | ||
# [END volumes] | ||
# [END kubernetes_deployment] | ||
|
||
--- | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's secrets in here but the tutorial I see now doesn't have secret anywhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bill and i just discussed this, will update on Tuesday