diff --git a/install/installer/pkg/common/certificate.go b/install/installer/pkg/common/certificate.go index b01d3dcc94d6d4..fb5a68e7e6aa66 100644 --- a/install/installer/pkg/common/certificate.go +++ b/install/installer/pkg/common/certificate.go @@ -8,6 +8,8 @@ import ( corev1 "k8s.io/api/core/v1" ) +const CUSTOM_CA_MOUNT_PATH = "/etc/ssl/certs/ca-certificates.crt" + func CAVolume() corev1.Volume { return corev1.Volume{ Name: "ca-certificates", @@ -22,7 +24,7 @@ func CAVolume() corev1.Volume { func CAVolumeMount() corev1.VolumeMount { return corev1.VolumeMount{ Name: "ca-certificates", - MountPath: "/etc/ssl/certs/ca-certificates.crt", + MountPath: CUSTOM_CA_MOUNT_PATH, SubPath: "ca-certificates.crt", ReadOnly: true, } diff --git a/install/installer/pkg/components/server/deployment.go b/install/installer/pkg/components/server/deployment.go index df03c0adfba396..314adc3c089640 100644 --- a/install/installer/pkg/components/server/deployment.go +++ b/install/installer/pkg/components/server/deployment.go @@ -102,6 +102,11 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) { Name: "WSMAN_CFG_MANAGERS", Value: wsmanCfgManager, }, + // Required for node.js to pick up custom CAs + { + Name: "NODE_EXTRA_CA_CERTS", + Value: common.CUSTOM_CA_MOUNT_PATH, + }, }, ) diff --git a/install/installer/pkg/components/ws-manager-bridge/deployment.go b/install/installer/pkg/components/ws-manager-bridge/deployment.go index 76b57399974e36..766e4bb4b37f8f 100644 --- a/install/installer/pkg/components/ws-manager-bridge/deployment.go +++ b/install/installer/pkg/components/ws-manager-bridge/deployment.go @@ -87,10 +87,17 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) { common.AnalyticsEnv(&ctx.Config), common.DatabaseEnv(&ctx.Config), common.ConfigcatEnv(ctx), - []corev1.EnvVar{{ - Name: "WSMAN_BRIDGE_CONFIGPATH", - Value: "/config/ws-manager-bridge.json", - }}, + []corev1.EnvVar{ + { + Name: "WSMAN_BRIDGE_CONFIGPATH", + Value: "/config/ws-manager-bridge.json", + }, + // Required for node.js to pick up custom CAs + { + Name: "NODE_EXTRA_CA_CERTS", + Value: common.CUSTOM_CA_MOUNT_PATH, + }, + }, )) _ = ctx.WithExperimental(func(cfg *experimental.Config) error {