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

update gb-frontend image. New image includes the change in PR # 23381. #24138

Merged
merged 1 commit into from
Apr 22, 2016
Merged

update gb-frontend image. New image includes the change in PR # 23381. #24138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/guestbook/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ spec:
spec:
containers:
- name: php-redis
image: gcr.io/google_samples/gb-frontend:v3
image: gcr.io/google-samples/gb-frontend:v4
Copy link
Member

Choose a reason for hiding this comment

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

Why is this changed from google_samples to google-samples? Do we need to change other yaml files too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The hyphen version used to not be properly supported by gcr, but now it is. They both are fine now.
(the project itself is named google-samples-- but we used to have to use the underscore).

Copy link
Member

Choose a reason for hiding this comment

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

If so, you may want to update other yaml files in this example too.

examples/guestbook/
├── all-in-one
│   ├── frontend.yaml
│   ├── guestbook-all-in-one.yaml
│   └── redis-slave.yaml
├── frontend-deployment.yaml
├── frontend-service.yaml
├── redis-master-deployment.yaml
├── redis-master-service.yaml
├── redis-slave-deployment.yaml
└── redis-slave-service.yaml

resources:
requests:
cpu: 100m
Expand Down
2 changes: 1 addition & 1 deletion examples/guestbook/all-in-one/frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
spec:
containers:
- name: php-redis
image: gcr.io/google_samples/gb-frontend:v3
image: gcr.io/google-samples/gb-frontend:v4
resources:
requests:
cpu: 100m
Expand Down
6 changes: 3 additions & 3 deletions examples/guestbook/all-in-one/guestbook-all-in-one.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: redis-master
# these labels can be applied automatically
# these labels can be applied automatically
# from the labels in the pod template if not set
# labels:
# app: redis
Expand All @@ -30,7 +30,7 @@ spec:
# this replicas value is default
# modify it according to your case
replicas: 1
# selector can be applied automatically
# selector can be applied automatically
# from the labels in the pod template if not set
# selector:
# matchLabels:
Expand Down Expand Up @@ -162,7 +162,7 @@ spec:
spec:
containers:
- name: php-redis
image: gcr.io/google_samples/gb-frontend:v3
image: gcr.io/google-samples/gb-frontend:v4
resources:
requests:
cpu: 100m
Expand Down
2 changes: 1 addition & 1 deletion examples/guestbook/frontend-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: php-redis
image: gcr.io/google_samples/gb-frontend:v3
image: gcr.io/google-samples/gb-frontend:v4
resources:
requests:
cpu: 100m
Expand Down