Skip to content

Commit ef816cd

Browse files
author
Christopher Hein
authored
Merge pull request aws-samples#446 from den-is/master
Images update
2 parents 9ba9181 + 151456e commit ef816cd

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

01-path-basics/103-kubernetes-concepts/readme.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ Let's create a Deployment first that will create 3 replicas of a pod:
736736
spec:
737737
containers:
738738
- name: echoheaders
739-
image: gcr.io/google_containers/echoserver:1.4
739+
image: k8s.gcr.io/echoserver:1.10
740740
imagePullPolicy: IfNotPresent
741741
ports:
742742
- containerPort: 8080
@@ -767,7 +767,7 @@ Pod Template:
767767
Labels: app=echo-pod
768768
Containers:
769769
echoheaders:
770-
Image: gcr.io/google_containers/echoserver:1.4
770+
Image: k8s.gcr.io/echoserver:1.10
771771
Port: 8080/TCP
772772
Environment: <none>
773773
Mounts: <none>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
apiVersion: extensions/v1beta1
22
kind: Deployment
33
metadata:
4-
name: echo-deployment
4+
name: echo-deployment
55
spec:
6-
replicas: 3
6+
replicas: 3
77
template:
88
metadata:
99
labels:
1010
app: echo-pod
1111
spec:
1212
containers:
13-
- name: echoheaders
14-
image: gcr.io/google_containers/echoserver:1.4
15-
imagePullPolicy: IfNotPresent
16-
ports:
13+
- name: echoheaders
14+
image: k8s.gcr.io/echoserver:1.10
15+
imagePullPolicy: IfNotPresent
16+
ports:
1717
- containerPort: 8080
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
apiVersion: extensions/v1beta1
22
kind: Deployment
33
metadata:
4-
name: echo-deployment
4+
name: echo-deployment
55
spec:
6-
replicas: 3
6+
replicas: 3
77
template:
88
metadata:
99
labels:
1010
app: echo-pod
1111
spec:
1212
containers:
13-
- name: echoheaders
14-
image: gcr.io/google_containers/echoserver:1.4
15-
imagePullPolicy: IfNotPresent
16-
ports:
13+
- name: echoheaders
14+
image: k8s.gcr.io/echoserver:1.10
15+
imagePullPolicy: IfNotPresent
16+
ports:
1717
- containerPort: 8080

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/grafana.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: grafana
16-
image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3
16+
image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3
1717
ports:
1818
- containerPort: 3000
1919
protocol: TCP

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/heapster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
serviceAccountName: heapster
2121
containers:
2222
- name: heapster
23-
image: gcr.io/google_containers/heapster-amd64:v1.4.0
23+
image: k8s.gcr.io/heapster-amd64:v1.5.2
2424
imagePullPolicy: IfNotPresent
2525
command:
2626
- /heapster

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/influxdb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: influxdb
16-
image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3
16+
image: k8s.gcr.io/heapster-influxdb-amd64:v1.3.3
1717
volumeMounts:
1818
- mountPath: /data
1919
name: influxdb-storage

02-path-working-with-clusters/201-cluster-monitoring/templates/prometheus/prometheus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ spec:
165165
initialDelaySeconds: 5
166166
timeoutSeconds: 5
167167
- name: addon-resizer
168-
image: gcr.io/google_containers/addon-resizer:1.0
168+
image: k8s.gcr.io/addon-resizer:1.0
169169
resources:
170170
limits:
171171
cpu: 100m

0 commit comments

Comments
 (0)