fix: move web sentinel publish to k8s buildkit
This commit is contained in:
@@ -29,6 +29,7 @@ export interface HwlabProxySpec {
|
||||
export interface HwlabNetworkProfileSpec {
|
||||
readonly id: string;
|
||||
readonly proxy: HwlabProxySpec;
|
||||
readonly imageBuildProxy: HwlabProxySpec;
|
||||
readonly dockerBuildProxy: HwlabProxySpec;
|
||||
}
|
||||
|
||||
@@ -613,7 +614,7 @@ function optionalStringRecord(value: unknown, path: string): Record<string, stri
|
||||
}));
|
||||
}
|
||||
|
||||
function proxyConfig(raw: Record<string, unknown>, id: string, key: "proxy" | "dockerBuildProxy", requiredNoProxy: readonly string[]): HwlabProxySpec {
|
||||
function proxyConfig(raw: Record<string, unknown>, id: string, key: "proxy" | "imageBuildProxy" | "dockerBuildProxy", requiredNoProxy: readonly string[]): HwlabProxySpec {
|
||||
const proxy = asRecord(raw[key], `networkProfiles.${id}.${key}`);
|
||||
return {
|
||||
http: stringField(proxy, "http", `networkProfiles.${id}.${key}`),
|
||||
@@ -625,10 +626,14 @@ function proxyConfig(raw: Record<string, unknown>, id: string, key: "proxy" | "d
|
||||
}
|
||||
|
||||
function networkProfileConfig(id: string, raw: Record<string, unknown>, requiredNoProxy: readonly string[]): HwlabNetworkProfileSpec {
|
||||
const imageBuildProxy = raw.imageBuildProxy === undefined
|
||||
? proxyConfig(raw, id, "dockerBuildProxy", requiredNoProxy)
|
||||
: proxyConfig(raw, id, "imageBuildProxy", requiredNoProxy);
|
||||
return {
|
||||
id,
|
||||
proxy: proxyConfig(raw, id, "proxy", requiredNoProxy),
|
||||
dockerBuildProxy: proxyConfig(raw, id, "dockerBuildProxy", requiredNoProxy),
|
||||
imageBuildProxy,
|
||||
dockerBuildProxy: raw.dockerBuildProxy === undefined ? imageBuildProxy : proxyConfig(raw, id, "dockerBuildProxy", requiredNoProxy),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user