mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Merge pull request #24138 from amygdala/gbrkt
Automatic merge from submit-queue update gb-frontend image. New image includes the change in PR # 23381. Update to use the gcr.io/google-samples/gb-frontend:v4 image. New image includes the change in https://github.com/kubernetes/kubernetes/pull/23381.
This commit is contained in:
commit
0ed117744c
@ -539,7 +539,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: php-redis
|
- name: php-redis
|
||||||
image: gcr.io/google_samples/gb-frontend:v3
|
image: gcr.io/google-samples/gb-frontend:v4
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
|
@ -43,7 +43,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: php-redis
|
- name: php-redis
|
||||||
image: gcr.io/google_samples/gb-frontend:v3
|
image: gcr.io/google-samples/gb-frontend:v4
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
|
@ -20,7 +20,7 @@ apiVersion: extensions/v1beta1
|
|||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: redis-master
|
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
|
# from the labels in the pod template if not set
|
||||||
# labels:
|
# labels:
|
||||||
# app: redis
|
# app: redis
|
||||||
@ -30,7 +30,7 @@ spec:
|
|||||||
# this replicas value is default
|
# this replicas value is default
|
||||||
# modify it according to your case
|
# modify it according to your case
|
||||||
replicas: 1
|
replicas: 1
|
||||||
# selector can be applied automatically
|
# selector can be applied automatically
|
||||||
# from the labels in the pod template if not set
|
# from the labels in the pod template if not set
|
||||||
# selector:
|
# selector:
|
||||||
# matchLabels:
|
# matchLabels:
|
||||||
@ -162,7 +162,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: php-redis
|
- name: php-redis
|
||||||
image: gcr.io/google_samples/gb-frontend:v3
|
image: gcr.io/google-samples/gb-frontend:v4
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
|
@ -25,7 +25,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: php-redis
|
- name: php-redis
|
||||||
image: gcr.io/google_samples/gb-frontend:v3
|
image: gcr.io/google-samples/gb-frontend:v4
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
|
Loading…
Reference in New Issue
Block a user