Merge pull request #22702 from ebriand/patch-4

Use more real container examples
This commit is contained in:
Kubernetes Prow Robot
2020-07-26 18:52:17 -07:00
committed by GitHub
@@ -132,11 +132,9 @@ metadata:
name: frontend name: frontend
spec: spec:
containers: containers:
- name: db - name: app
image: mysql image: super.mycompany.com/app:v4
env: env:
- name: MYSQL_ROOT_PASSWORD
value: "password"
resources: resources:
requests: requests:
memory: "64Mi" memory: "64Mi"
@@ -144,8 +142,8 @@ spec:
limits: limits:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
- name: wp - name: log-aggregator
image: wordpress image: super.mycompany.com/log-aggregator:v6
resources: resources:
requests: requests:
memory: "64Mi" memory: "64Mi"
@@ -330,18 +328,15 @@ metadata:
name: frontend name: frontend
spec: spec:
containers: containers:
- name: db - name: app
image: mysql image: super.mycompany.com/app:v4
env:
- name: MYSQL_ROOT_PASSWORD
value: "password"
resources: resources:
requests: requests:
ephemeral-storage: "2Gi" ephemeral-storage: "2Gi"
limits: limits:
ephemeral-storage: "4Gi" ephemeral-storage: "4Gi"
- name: wp - name: log-aggregator
image: wordpress image: super.mycompany.com/log-aggregator:v6
resources: resources:
requests: requests:
ephemeral-storage: "2Gi" ephemeral-storage: "2Gi"