Skip to content

[server] Fix custom CA #20770

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 1 commit into from
Apr 24, 2025
Merged

[server] Fix custom CA #20770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion install/installer/pkg/common/certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
}
Expand Down
5 changes: 5 additions & 0 deletions install/installer/pkg/components/server/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
)

Expand Down
15 changes: 11 additions & 4 deletions install/installer/pkg/components/ws-manager-bridge/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading