Skip to content

Commit f41fa7c

Browse files
committed
CDH: update example configuration
new field `http_proxy` is introduced and we use the more common name `no_proxy` and `https_proxy` for old `skip_proxy_ips` and `image_pull_proxy` variable names. Signed-off-by: Xynnn007 <[email protected]>
1 parent 7016c8e commit f41fa7c

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

confidential-data-hub/example.config.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
"sigstore_config_uri": "kbs:///default/sigstore-config/test",
2121
"image_security_policy_uri": "kbs:///default/security-policy/test",
2222
"authenticated_registry_credentials_uri": "kbs:///default/credential/test",
23-
"image_pull_proxy": "http://127.0.0.1:5432",
24-
"skip_proxy_ips": "192.168.0.1,localhost",
23+
"https_proxy": "http://127.0.0.1:5432",
24+
"http_proxy": "http://127.0.0.1:5432",
25+
"no_proxy": "192.168.0.1,localhost",
2526
"extra_root_certificates": "-----BEGIN CERTIFICATE-----\nMIIFTDCCAvugAwIBAgIBADBGBgkqhkiG9w0BAQowOaAPMA0GCWCGSAFlAwQCAgUA\noRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAgUAogMCATCjAwIBATB7MRQwEgYD\nVQQLDAtFbmdpbmVlcmluZzELMAkGA1UEBhMCVVMxFDASBgNVBAcMC1NhbnRhIENs\nYXJhMQswCQYDVQQIDAJDQTEfMB0GA1UECgwWQWR2YW5jZWQgTWljcm8gRGV2aWNl\nczESMBAGA1UEAwwJU0VWLU1pbGFuMB4XDTIzMDEyNDE3NTgyNloXDTMwMDEyNDE3\nNTgyNlowejEUMBIGA1UECwwLRW5naW5lZXJpbmcxCzAJBgNVBAYTAlVTMRQwEgYD\nVQQHDAtTYW50YSBDbGFyYTELMAkGA1UECAwCQ0ExHzAdBgNVBAoMFkFkdmFuY2Vk\nIE1pY3JvIERldmljZXMxETAPBgNVBAMMCFNFVi1WQ0VLMHYwEAYHKoZIzj0CAQYF\nK4EEACIDYgAExmG1ZbuoAQK93USRyZQcsyobfbaAEoKEELf/jK39cOVJt1t4s83W\nXM3rqIbS7qHUHQw/FGyOvdaEUs5+wwxpCWfDnmJMAQ+ctgZqgDEKh1NqlOuuKcKq\n2YAWE5cTH7sHo4IBFjCCARIwEAYJKwYBBAGceAEBBAMCAQAwFwYJKwYBBAGceAEC\nBAoWCE1pbGFuLUIwMBEGCisGAQQBnHgBAwEEAwIBAzARBgorBgEEAZx4AQMCBAMC\nAQAwEQYKKwYBBAGceAEDBAQDAgEAMBEGCisGAQQBnHgBAwUEAwIBADARBgorBgEE\nAZx4AQMGBAMCAQAwEQYKKwYBBAGceAEDBwQDAgEAMBEGCisGAQQBnHgBAwMEAwIB\nCDARBgorBgEEAZx4AQMIBAMCAXMwTQYJKwYBBAGceAEEBEDDhCejDUx6+dlvehW5\ncmmCWmTLdqI1L/1dGBFdia1HP46MC82aXZKGYSutSq37RCYgWjueT+qCMBE1oXDk\nd1JOMEYGCSqGSIb3DQEBCjA5oA8wDQYJYIZIAWUDBAICBQChHDAaBgkqhkiG9w0B\nAQgwDQYJYIZIAWUDBAICBQCiAwIBMKMDAgEBA4ICAQACgCai9x8DAWzX/2IelNWm\nituEBSiq9C9eDnBEckQYikAhPasfagnoWFAtKu/ZWTKHi+BMbhKwswBS8W0G1ywi\ncUWGlzigI4tdxxf1YBJyCoTSNssSbKmIh5jemBfrvIBo1yEd+e56ZJMdhN8e+xWU\nbvovUC2/7Dl76fzAaACLSorZUv5XPJwKXwEOHo7FIcREjoZn+fKjJTnmdXce0LD6\n9RHr+r+ceyE79gmK31bI9DYiJoL4LeGdXZ3gMOVDR1OnDos5lOBcV+quJ6JujpgH\nd9g3Sa7Du7pusD9Fdap98ocZslRfFjFi//2YdVM4MKbq6IwpYNB+2PCEKNC7SfbO\nNgZYJuPZnM/wViES/cP7MZNJ1KUKBI9yh6TmlSsZZOclGJvrOsBZimTXpATjdNMt\ncluKwqAUUzYQmU7bf2TMdOXyA9iH5wIpj1kWGE1VuFADTKILkTc6LzLzOWCofLxf\nonhTtSDtzIv/uel547GZqq+rVRvmIieEuEvDETwuookfV6qu3D/9KuSr9xiznmEg\nxynud/f525jppJMcD/ofbQxUZuGKvb3f3zy+aLxqidoX7gca2Xd9jyUy5Y/83+ZN\nbz4PZx81UJzXVI9ABEh8/xilATh1ZxOePTBJjN7lgr0lXtKYjV/43yyxgUYrXNZS\noLSG2dLCK9mjjraPjau34Q==\n-----END CERTIFICATE-----",
2627
"work_dir": "/run/image-rs"
2728
}

confidential-data-hub/example.config.toml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,20 +117,25 @@ image_security_policy_uri = "kbs:///default/security-policy/test"
117117
# By default this value is not set.
118118
authenticated_registry_credentials_uri = "kbs:///default/credential/test"
119119

120-
# Proxy that will be used to pull image
120+
# HTTPS proxy that will be used to pull image
121121
#
122122
# By default this value is not set.
123-
image_pull_proxy = "http://127.0.0.1:5432"
123+
https_proxy = "http://127.0.0.1:5432"
124+
125+
# HTTP proxy that will be used to pull image
126+
#
127+
# By default this value is not set.
128+
http_proxy = "http://127.0.0.1:5432"
124129

125130
# No proxy env that will be used to pull image.
126131
#
127132
# This will ensure that when we access the image registry with specified
128-
# IPs, the `image_pull_proxy` will not be used.
133+
# IPs, both `https_proxy` and `http_proxy` will not be used.
129134
#
130-
# If `image_pull_proxy` is not set, this field will do nothing.
135+
# If neither `https_proxy` nor `http_proxy` is not set, this field will do nothing.
131136
#
132137
# By default this value is not set.
133-
skip_proxy_ips = "192.168.0.1,localhost"
138+
no_proxy = "192.168.0.1,localhost"
134139

135140
# To support registries with self signed certs. This config item
136141
# is used to add extra trusted root certifications. The certificates

0 commit comments

Comments
 (0)