Commit 561fde4

authored

[server] Fix custom CA (#20770)

Configure NODE_EXTRA_CA_CERTS env var to point to the CA certificate bundle file

1 parent 828784c commit 561fde4Copy full SHA for 561fde4

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ import (`
`8`	`8`	`corev1 "k8s.io/api/core/v1"`
`9`	`9`	`)`
`10`	`10`
	`11`	`+const CUSTOM_CA_MOUNT_PATH = "/etc/ssl/certs/ca-certificates.crt"`
	`12`	`+`
`11`	`13`	`func CAVolume() corev1.Volume {`
`12`	`14`	`return corev1.Volume{`
`13`	`15`	`Name: "ca-certificates",`
`@@ -22,7 +24,7 @@ func CAVolume() corev1.Volume {`
`22`	`24`	`func CAVolumeMount() corev1.VolumeMount {`
`23`	`25`	`return corev1.VolumeMount{`
`24`	`26`	`Name: "ca-certificates",`
`25`		`- MountPath: "/etc/ssl/certs/ca-certificates.crt",`
	`27`	`+ MountPath: CUSTOM_CA_MOUNT_PATH,`
`26`	`28`	`SubPath: "ca-certificates.crt",`
`27`	`29`	`ReadOnly: true,`
`28`	`30`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,11 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {`
`102`	`102`	`Name: "WSMAN_CFG_MANAGERS",`
`103`	`103`	`Value: wsmanCfgManager,`
`104`	`104`	`},`
	`105`	`+ // Required for node.js to pick up custom CAs`
	`106`	`+ {`
	`107`	`+ Name: "NODE_EXTRA_CA_CERTS",`
	`108`	`+ Value: common.CUSTOM_CA_MOUNT_PATH,`
	`109`	`+ },`
`105`	`110`	`},`
`106`	`111`	`)`
`107`	`112`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,17 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {`
`87`	`87`	`common.AnalyticsEnv(&ctx.Config),`
`88`	`88`	`common.DatabaseEnv(&ctx.Config),`
`89`	`89`	`common.ConfigcatEnv(ctx),`
`90`		`- []corev1.EnvVar{{`
`91`		`- Name: "WSMAN_BRIDGE_CONFIGPATH",`
`92`		`- Value: "/config/ws-manager-bridge.json",`
`93`		`- }},`
	`90`	`+ []corev1.EnvVar{`
	`91`	`+ {`
	`92`	`+ Name: "WSMAN_BRIDGE_CONFIGPATH",`
	`93`	`+ Value: "/config/ws-manager-bridge.json",`
	`94`	`+ },`
	`95`	`+ // Required for node.js to pick up custom CAs`
	`96`	`+ {`
	`97`	`+ Name: "NODE_EXTRA_CA_CERTS",`
	`98`	`+ Value: common.CUSTOM_CA_MOUNT_PATH,`
	`99`	`+ },`
	`100`	`+ },`
`94`	`101`	`))`
`95`	`102`
`96`	`103`	`_ = ctx.WithExperimental(func(cfg *experimental.Config) error {`

Comments

(0)