Skip to content

Commit 7b2a3d0

Browse files
saschagrunertsaschagrunert
committed
Add insecure registry configuration for localhost:5000 in CRI-O e2e tests
This configures CRI-O to allow HTTP connections to localhost:5000, which is required for e2e tests that use the fake-registry-server. The fake-registry-server only serves HTTP, but CRI-O defaults to HTTPS for all registries, causing image pull failures. The configuration is placed in /etc/containers/registries.conf.d/ as a drop-in file to avoid being overwritten by the CRI-O installation process. This fixes test failures in: - [sig-node] Ensure Credential Pulled Images - [sig-node] Container Runtime Conformance Test (private registry tests) Related: kubernetes/kubernetes#134998 Related: kubernetes/kubernetes#135369 Signed-off-by: Sascha Grunert <[email protected]>
1 parent aef1430 commit 7b2a3d0

20 files changed

+118
-0
lines changed

‎jobs/e2e_node/crio/crio.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
},
3434
"mode": 420
3535
},
36+
{
37+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
38+
"contents": {
39+
"compression": "gzip",
40+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
41+
},
42+
"mode": 420
43+
},
3644
{
3745
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
3846
"contents": {

‎jobs/e2e_node/crio/crio_canary.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
},
3434
"mode": 420
3535
},
36+
{
37+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
38+
"contents": {
39+
"compression": "gzip",
40+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
41+
},
42+
"mode": 420
43+
},
3644
{
3745
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
3846
"contents": {

‎jobs/e2e_node/crio/crio_drop_infra_ctr.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
},
3434
"mode": 420
3535
},
36+
{
37+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
38+
"contents": {
39+
"compression": "gzip",
40+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
41+
},
42+
"mode": 420
43+
},
3644
{
3745
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
3846
"contents": {

‎jobs/e2e_node/crio/crio_eventedpleg.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
},
3434
"mode": 420
3535
},
36+
{
37+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
38+
"contents": {
39+
"compression": "gzip",
40+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
41+
},
42+
"mode": 420
43+
},
3644
{
3745
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
3846
"contents": {

‎jobs/e2e_node/crio/crio_hugepages.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
},
3434
"mode": 420
3535
},
36+
{
37+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
38+
"contents": {
39+
"compression": "gzip",
40+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
41+
},
42+
"mode": 420
43+
},
3644
{
3745
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
3846
"contents": {

‎jobs/e2e_node/crio/crio_imagefs.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
},
5252
"mode": 420
5353
},
54+
{
55+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
56+
"contents": {
57+
"compression": "gzip",
58+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
59+
},
60+
"mode": 420
61+
},
5462
{
5563
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
5664
"contents": {

‎jobs/e2e_node/crio/crio_splitfs.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
},
5252
"mode": 420
5353
},
54+
{
55+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
56+
"contents": {
57+
"compression": "gzip",
58+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
59+
},
60+
"mode": 420
61+
},
5462
{
5563
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
5664
"contents": {

‎jobs/e2e_node/crio/crio_swap1g.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
},
3434
"mode": 420
3535
},
36+
{
37+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
38+
"contents": {
39+
"compression": "gzip",
40+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
41+
},
42+
"mode": 420
43+
},
3644
{
3745
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
3846
"contents": {

‎jobs/e2e_node/crio/crio_userns.ign‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@
4343
},
4444
"mode": 420
4545
},
46+
{
47+
"path": "/etc/containers/registries.conf.d/99-localhost-insecure.conf",
48+
"contents": {
49+
"compression": "gzip",
50+
"source": "data:;base64,H4sIAAAAAAAC/1SOMUsFMRCE+/yK4b06cAg2wussLEVed1wR4t5lMWR1d+Nx/14MnGA5zDDfd8Wzymfkhixt5a1rcpYGF6RaZQc3o9yV8HK/v0JpY3M9sIqiSk61iPnT4zRN4Yo3+uqs9D5aeiA4mRu6cdvghbCmD4rnRzTSb1LshXPBCDYoUVo9Qpjnc7ks4Zc1xG64/Odewp/iDa6dwk8AAAD//6EsFVnUAAAA"
51+
},
52+
"mode": 420
53+
},
4654
{
4755
"path": "/etc/sysctl.d/99-e2e-sysctl.conf",
4856
"contents": {

‎jobs/e2e_node/crio/templates/base/99-localhost-insecure.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Drop-in configuration to allow insecure HTTP registry for localhost:5000
2+
# Required for e2e tests using the fake-registry-server which serves HTTP-only
3+
4+
[[registry]]
5+
location = "localhost:5000"
6+
insecure = true

0 commit comments

Comments
 (0)