Skip to content

Commit 5b96db1

Browse files
authored
Merge pull request #55928 from bergerhoffer/OCPBUGS-7544
OCPBUGS 7544: Replacing instances of k8s.gcr.io with registry.k8s.io
2 parents 54a8258 + c742f5d commit 5b96db1

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

modules/application-health-about.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ spec:
8080
containers:
8181
- name: goproxy-app <1>
8282
args:
83-
image: k8s.gcr.io/goproxy:0.1 <2>
83+
image: registry.k8s.io/goproxy:0.1 <2>
8484
readinessProbe: <3>
8585
exec: <4>
8686
command: <5>
@@ -109,7 +109,7 @@ spec:
109109
containers:
110110
- name: goproxy-app <1>
111111
args:
112-
image: k8s.gcr.io/goproxy:0.1 <2>
112+
image: registry.k8s.io/goproxy:0.1 <2>
113113
livenessProbe: <3>
114114
httpGet: <4>
115115
scheme: HTTPS <5>
@@ -153,7 +153,7 @@ spec:
153153
containers:
154154
- name: goproxy-app <1>
155155
args:
156-
image: k8s.gcr.io/goproxy:0.1 <2>
156+
image: registry.k8s.io/goproxy:0.1 <2>
157157
livenessProbe: <3>
158158
exec: <4>
159159
command: <5>

modules/application-health-configuring.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
containers:
3232
- name: my-container <1>
3333
args:
34-
image: k8s.gcr.io/goproxy:0.1 <2>
34+
image: registry.k8s.io/goproxy:0.1 <2>
3535
livenessProbe: <3>
3636
tcpSocket: <4>
3737
port: 8080 <5>
@@ -77,7 +77,7 @@ spec:
7777
====
7878
If the `initialDelaySeconds` value is lower than the `periodSeconds` value, the first Readiness probe occurs at some point between the two periods due to an issue with timers.
7979

80-
The `timeoutSeconds` value must be lower than the `periodSeconds` value.
80+
The `timeoutSeconds` value must be lower than the `periodSeconds` value.
8181
====
8282

8383
. Create the `Pod` object:
@@ -101,8 +101,8 @@ Events:
101101
Type Reason Age From Message
102102
---- ------ ---- ---- -------
103103
Normal Scheduled 9s default-scheduler Successfully assigned openshift-logging/liveness-exec to ip-10-0-143-40.ec2.internal
104-
Normal Pulling 2s kubelet, ip-10-0-143-40.ec2.internal pulling image "k8s.gcr.io/liveness"
105-
Normal Pulled 1s kubelet, ip-10-0-143-40.ec2.internal Successfully pulled image "k8s.gcr.io/liveness"
104+
Normal Pulling 2s kubelet, ip-10-0-143-40.ec2.internal pulling image "registry.k8s.io/liveness"
105+
Normal Pulled 1s kubelet, ip-10-0-143-40.ec2.internal Successfully pulled image "registry.k8s.io/liveness"
106106
Normal Created 1s kubelet, ip-10-0-143-40.ec2.internal Created container
107107
Normal Started 1s kubelet, ip-10-0-143-40.ec2.internal Started container
108108
----
@@ -125,12 +125,12 @@ Events:
125125
---- ------ ---- ---- -------
126126
Normal Scheduled <unknown> Successfully assigned aaa/liveness-http to ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj
127127
Normal AddedInterface 47s multus Add eth0 [10.129.2.11/23]
128-
Normal Pulled 46s kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Successfully pulled image "k8s.gcr.io/liveness" in 773.406244ms
129-
Normal Pulled 28s kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Successfully pulled image "k8s.gcr.io/liveness" in 233.328564ms
128+
Normal Pulled 46s kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Successfully pulled image "registry.k8s.io/liveness" in 773.406244ms
129+
Normal Pulled 28s kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Successfully pulled image "registry.k8s.io/liveness" in 233.328564ms
130130
Normal Created 10s (x3 over 46s) kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Created container liveness
131131
Normal Started 10s (x3 over 46s) kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Started container liveness
132132
Warning Unhealthy 10s (x6 over 34s) kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Liveness probe failed: HTTP probe failed with statuscode: 500
133133
Normal Killing 10s (x2 over 28s) kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Container liveness failed liveness probe, will be restarted
134-
Normal Pulling 10s (x3 over 47s) kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Pulling image "k8s.gcr.io/liveness"
135-
Normal Pulled 10s kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Successfully pulled image "k8s.gcr.io/liveness" in 244.116568ms
134+
Normal Pulling 10s (x3 over 47s) kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Pulling image "registry.k8s.io/liveness"
135+
Normal Pulled 10s kubelet, ci-ln-37hz77b-f76d1-wdpjv-worker-b-snzrj Successfully pulled image "registry.k8s.io/liveness" in 244.116568ms
136136
----

0 commit comments

Comments
 (0)