Skip to content

[installer]: add HTTP_PROXY envvars to the Installer #12726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 13, 2022
Merged

[installer]: add HTTP_PROXY envvars to the Installer #12726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ba9406
[installer]: set proxy server configuration in installer
Sep 7, 2022
3dbf7b7
[installer]: explicitly set all host addresses to 0.0.0.0
Sep 8, 2022
1de08a6
[installer]: set the server URLs to the FQDN and add no_grpc_proxy en…
Sep 8, 2022
7d3a5e8
[installer]: update golden files
Sep 9, 2022
f791db5
[kots]: add proxy server configuration
Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions install/installer/cmd/testdata/render/aws-setup/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ data:
config.json: |-
{
"service": {
"address": ":8080"
"address": "0.0.0.0:8080"
},
"storage": {
"stage": "",
Expand Down Expand Up @@ -3813,7 +3813,7 @@ data:
]
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"ca": "",
"crt": "",
Expand Down Expand Up @@ -4059,9 +4059,9 @@ data:
"makeNewUsersAdmin": false,
"defaultBaseImageRegistryWhitelist": [],
"runDbDeleter": true,
"contentServiceAddr": "content-service:8080",
"imageBuilderAddr": "image-builder-mk3:8080",
"usageServiceAddr": "usage:9001",
"contentServiceAddr": "content-service.default.svc.cluster.local:8080",
"imageBuilderAddr": "image-builder-mk3.default.svc.cluster.local:8080",
"usageServiceAddr": "usage.default.svc.cluster.local:9001",
"vsxRegistryUrl": "https://open-vsx.gitpod.example.com",
"chargebeeProviderOptionsFile": "/chargebee/providerOptions",
"stripeSecretsFile": "/stripe-secret/apikeys",
Expand Down Expand Up @@ -4407,7 +4407,7 @@ data:
}
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"caPath": "/certs/ca.crt",
"certPath": "/certs/tls.crt",
Expand Down Expand Up @@ -4593,8 +4593,8 @@ data:
config.json: |-
{
"ingress": {
"httpAddress": ":8080",
"httpsAddress": ":9090",
"httpAddress": "0.0.0.0:8080",
"httpsAddress": "0.0.0.0:9090",
"header": "x-wsproxy-host"
},
"proxy": {
Expand Down Expand Up @@ -6460,7 +6460,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 531cd94d43e48d4295f80353ac56f7748a9f678b8ade59cbabc14d1c3fb43395
gitpod.io/checksum_config: de8ed99a057f28c772db0287eeb93b12fe89401a2645f94d0b533eb0e5640654
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down Expand Up @@ -7227,7 +7227,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 910d0b3b714a6d8b04963ee4f42d8ea370d56531b8faaa16bb819a19c4f75928
gitpod.io/checksum_config: 2e45691c9b7dbd15eefd950854dfc5d89500012dc70f6a624069a404c72f9010
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -7632,7 +7632,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 5a02760487dc021fb50bdfc0d92a3a453348b226fb74729cd57a33927d5b6e08
gitpod.io/checksum_config: 96743936096936609b76bcab7e6b4c5d2ae5b0cd63b73268b03984c82bdf3d3e
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -8032,7 +8032,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: e51ff44d9dd16219dfe3e61a9c3c4562a3ee6c31632791d43697f66569e1569f
gitpod.io/checksum_config: 32e8b437cc6763cf35540014d9f2d93632243e2da7bfac04edb928dbd31193e0
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -8679,7 +8679,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: dcbc53af67e4007a4affc029e880c338b93e4484010727f4bf0a08ad7c93a112
gitpod.io/checksum_config: f88055f3ce58c8eca0064866deeb5131473b6ba2980dce8bf4f9989e997f1ff5
creationTimestamp: null
labels:
app: gitpod
Expand Down
26 changes: 13 additions & 13 deletions install/installer/cmd/testdata/render/azure-setup/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,7 @@ data:
config.json: |-
{
"service": {
"address": ":8080"
"address": "0.0.0.0:8080"
},
"storage": {
"stage": "",
Expand Down Expand Up @@ -3731,7 +3731,7 @@ data:
]
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"ca": "",
"crt": "",
Expand Down Expand Up @@ -3923,9 +3923,9 @@ data:
"makeNewUsersAdmin": false,
"defaultBaseImageRegistryWhitelist": [],
"runDbDeleter": true,
"contentServiceAddr": "content-service:8080",
"imageBuilderAddr": "image-builder-mk3:8080",
"usageServiceAddr": "usage:9001",
"contentServiceAddr": "content-service.default.svc.cluster.local:8080",
"imageBuilderAddr": "image-builder-mk3.default.svc.cluster.local:8080",
"usageServiceAddr": "usage.default.svc.cluster.local:9001",
"vsxRegistryUrl": "https://open-vsx.gitpod.example.com",
"chargebeeProviderOptionsFile": "/chargebee/providerOptions",
"stripeSecretsFile": "/stripe-secret/apikeys",
Expand Down Expand Up @@ -4269,7 +4269,7 @@ data:
}
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"caPath": "/certs/ca.crt",
"certPath": "/certs/tls.crt",
Expand Down Expand Up @@ -4453,8 +4453,8 @@ data:
config.json: |-
{
"ingress": {
"httpAddress": ":8080",
"httpsAddress": ":9090",
"httpAddress": "0.0.0.0:8080",
"httpsAddress": "0.0.0.0:9090",
"header": "x-wsproxy-host"
},
"proxy": {
Expand Down Expand Up @@ -6306,7 +6306,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
gitpod.io/checksum_config: f39e45d788bb170ba728cfc3c69c5ca00a2b88a73a2d7288bcc1caee8e638405
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down Expand Up @@ -7067,7 +7067,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 94e6e4829aa089a570ba9f479575cdd42a6c273877223830c790397aa40dcd99
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -7466,7 +7466,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 5be4f29bef94650edc3920952abac0e61f5a807e104428baf5d8bca92b9401d4
gitpod.io/checksum_config: 8034f0b96bab62afb484f300c389b9c2ed9190807d2fd7d17f21802b1d4fa0bf
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -7884,7 +7884,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: e51ff44d9dd16219dfe3e61a9c3c4562a3ee6c31632791d43697f66569e1569f
gitpod.io/checksum_config: 32e8b437cc6763cf35540014d9f2d93632243e2da7bfac04edb928dbd31193e0
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -8525,7 +8525,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: dcbc53af67e4007a4affc029e880c338b93e4484010727f4bf0a08ad7c93a112
gitpod.io/checksum_config: f88055f3ce58c8eca0064866deeb5131473b6ba2980dce8bf4f9989e997f1ff5
creationTimestamp: null
labels:
app: gitpod
Expand Down
26 changes: 13 additions & 13 deletions install/installer/cmd/testdata/render/customization/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@ data:
config.json: |-
{
"service": {
"address": ":8080"
"address": "0.0.0.0:8080"
},
"storage": {
"stage": "",
Expand Down Expand Up @@ -4518,7 +4518,7 @@ data:
]
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"ca": "",
"crt": "",
Expand Down Expand Up @@ -4830,9 +4830,9 @@ data:
"makeNewUsersAdmin": false,
"defaultBaseImageRegistryWhitelist": [],
"runDbDeleter": true,
"contentServiceAddr": "content-service:8080",
"imageBuilderAddr": "image-builder-mk3:8080",
"usageServiceAddr": "usage:9001",
"contentServiceAddr": "content-service.default.svc.cluster.local:8080",
"imageBuilderAddr": "image-builder-mk3.default.svc.cluster.local:8080",
"usageServiceAddr": "usage.default.svc.cluster.local:9001",
"vsxRegistryUrl": "https://open-vsx.gitpod.example.com",
"chargebeeProviderOptionsFile": "/chargebee/providerOptions",
"stripeSecretsFile": "/stripe-secret/apikeys",
Expand Down Expand Up @@ -5186,7 +5186,7 @@ data:
}
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"caPath": "/certs/ca.crt",
"certPath": "/certs/tls.crt",
Expand Down Expand Up @@ -5385,8 +5385,8 @@ data:
config.json: |-
{
"ingress": {
"httpAddress": ":8080",
"httpsAddress": ":9090",
"httpAddress": "0.0.0.0:8080",
"httpsAddress": "0.0.0.0:9090",
"header": "x-wsproxy-host"
},
"proxy": {
Expand Down Expand Up @@ -7494,7 +7494,7 @@ spec:
metadata:
annotations:
gitpod.io: hello
gitpod.io/checksum_config: 4e24adf25fa6c788ea607f2b6e87d4d46c00cdaa8d3891f50feebde06ac6b4c3
gitpod.io/checksum_config: eed464cffbb7a8f5698bc1163b1e22cbc4593e154e2662c43dd2f643863c4548
hello: world
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
Expand Down Expand Up @@ -8441,7 +8441,7 @@ spec:
metadata:
annotations:
gitpod.io: hello
gitpod.io/checksum_config: cb18d1100d11de0609bf9d7961693a7ebbc982d589014e1031bf921573afe08f
gitpod.io/checksum_config: d72d95c5bd425eaabe281cea259139df35cc6343145eadac5f2e95aae30360ab
hello: world
creationTimestamp: null
labels:
Expand Down Expand Up @@ -8878,7 +8878,7 @@ spec:
metadata:
annotations:
gitpod.io: hello
gitpod.io/checksum_config: ecd350f0d685aba1d7fb6e36ab8eed6fc4fa34f2729563a482c5685f4abce748
gitpod.io/checksum_config: cdff40a52db9857434bb86e8754889cbdfa317b0bb71c2fafba58f1d5a11e87b
hello: world
creationTimestamp: null
labels:
Expand Down Expand Up @@ -9398,7 +9398,7 @@ spec:
metadata:
annotations:
gitpod.io: hello
gitpod.io/checksum_config: abcabbe0f0755c297b38713fd5dcbdf5613cca1ecc2f5180b4c66ae59b189df5
gitpod.io/checksum_config: 7f31019ddffd47a37a2fa1c2688b77bbf03a774a8af3c7a289017e74a4c84a20
hello: world
creationTimestamp: null
labels:
Expand Down Expand Up @@ -10066,7 +10066,7 @@ spec:
metadata:
annotations:
gitpod.io: hello
gitpod.io/checksum_config: a215d15f9dc39f54db7c2553b752027cd4c905b7f30c07c0fbe0193cbf1c1df1
gitpod.io/checksum_config: 7cb3858d6b6cd2fbb0e4ad1dc049ff23fca40a07e41db9c74a4b6b4ecf9ac39a
hello: world
creationTimestamp: null
labels:
Expand Down
26 changes: 13 additions & 13 deletions install/installer/cmd/testdata/render/external-registry/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ data:
config.json: |-
{
"service": {
"address": ":8080"
"address": "0.0.0.0:8080"
},
"storage": {
"stage": "",
Expand Down Expand Up @@ -3872,7 +3872,7 @@ data:
]
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"ca": "",
"crt": "",
Expand Down Expand Up @@ -4110,9 +4110,9 @@ data:
"makeNewUsersAdmin": false,
"defaultBaseImageRegistryWhitelist": [],
"runDbDeleter": true,
"contentServiceAddr": "content-service:8080",
"imageBuilderAddr": "image-builder-mk3:8080",
"usageServiceAddr": "usage:9001",
"contentServiceAddr": "content-service.default.svc.cluster.local:8080",
"imageBuilderAddr": "image-builder-mk3.default.svc.cluster.local:8080",
"usageServiceAddr": "usage.default.svc.cluster.local:9001",
"vsxRegistryUrl": "https://open-vsx.gitpod.example.com",
"chargebeeProviderOptionsFile": "/chargebee/providerOptions",
"stripeSecretsFile": "/stripe-secret/apikeys",
Expand Down Expand Up @@ -4456,7 +4456,7 @@ data:
}
},
"service": {
"address": ":8080",
"address": "0.0.0.0:8080",
"tls": {
"caPath": "/certs/ca.crt",
"certPath": "/certs/tls.crt",
Expand Down Expand Up @@ -4640,8 +4640,8 @@ data:
config.json: |-
{
"ingress": {
"httpAddress": ":8080",
"httpsAddress": ":9090",
"httpAddress": "0.0.0.0:8080",
"httpsAddress": "0.0.0.0:9090",
"header": "x-wsproxy-host"
},
"proxy": {
Expand Down Expand Up @@ -6588,7 +6588,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
gitpod.io/checksum_config: f39e45d788bb170ba728cfc3c69c5ca00a2b88a73a2d7288bcc1caee8e638405
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down Expand Up @@ -7508,7 +7508,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 94e6e4829aa089a570ba9f479575cdd42a6c273877223830c790397aa40dcd99
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -7907,7 +7907,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 3306f90f91447be560270e7f1f30b08c623b26d1a2cc2dea06fea891dd96bcbd
gitpod.io/checksum_config: 98f1ca15bcfd65d64c8e110b89afda269339e46c2155583e3f07fc5c01bc0d74
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -8310,7 +8310,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 0bc76c867af13d6037264732e25991af8de7c19a2f2e91d1fb1e64df1a9833db
gitpod.io/checksum_config: b2674e6368640d5a4b4ccb0f2fa8cb4e521fb3ee60c58f38d8b57272063a8bea
creationTimestamp: null
labels:
app: gitpod
Expand Down Expand Up @@ -8951,7 +8951,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: dcbc53af67e4007a4affc029e880c338b93e4484010727f4bf0a08ad7c93a112
gitpod.io/checksum_config: f88055f3ce58c8eca0064866deeb5131473b6ba2980dce8bf4f9989e997f1ff5
creationTimestamp: null
labels:
app: gitpod
Expand Down
Loading