Fix the filename in env vars

nandajavarma · nandajavarma · commit 3ad096734216 · 2023-08-08T13:36:55.000Z
diff --git a/components/ws-manager-mk2/controllers/create.go b/components/ws-manager-mk2/controllers/create.go
@@ -562,7 +562,7 @@ func createWorkspaceEnvironment(sctx *startWorkspaceContext) ([]corev1.EnvVar, e
 	result = append(result, corev1.EnvVar{Name: "THEIA_MINI_BROWSER_HOST_PATTERN", Value: "browser-{{hostname}}"})
 
 	const (
-		customCAMountPath = "/etc/ssl/certs/custom-ca.crt"
+		customCAMountPath = "/etc/ssl/certs/gitpod-ca.crt"
 		certsMountPath    = "/etc/ssl/certs/"
 	)
 
diff --git a/install/installer/pkg/components/cluster/certmanager.go b/install/installer/pkg/components/cluster/certmanager.go
@@ -37,7 +37,7 @@ func certmanager(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 	gitpodCustomCertificateBundleSource := []trust.BundleSource{
 		{
-			UseDefaultCAs: pointer.Bool(false),
+			UseDefaultCAs: pointer.Bool(true),
 		},
 	}
 
@@ -49,7 +49,7 @@ func certmanager(ctx *common.RenderContext) ([]runtime.Object, error) {
 			},
 		})
 
-		gitpodCustomCertificateBundleSource = append(gitpodCaBundleSources, trust.BundleSource{
+		gitpodCustomCertificateBundleSource = append(gitpodCustomCertificateBundleSource, trust.BundleSource{
 			Secret: &trust.SourceObjectKeySelector{
 				Name:        ctx.Config.CustomCACert.Name,
 				KeySelector: trust.KeySelector{Key: "ca.crt"},

Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ func createWorkspaceEnvironment(sctx *startWorkspaceContext) ([]corev1.EnvVar, e`
`562`	`562`	`result = append(result, corev1.EnvVar{Name: "THEIA_MINI_BROWSER_HOST_PATTERN", Value: "browser-{{hostname}}"})`
`563`	`563`
`564`	`564`	`const (`
`565`		`- customCAMountPath = "/etc/ssl/certs/custom-ca.crt"`
	`565`	`+ customCAMountPath = "/etc/ssl/certs/gitpod-ca.crt"`
`566`	`566`	`certsMountPath = "/etc/ssl/certs/"`
`567`	`567`	`)`
`568`	`568`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func certmanager(ctx *common.RenderContext) ([]runtime.Object, error) {`
`37`	`37`
`38`	`38`	`gitpodCustomCertificateBundleSource := []trust.BundleSource{`
`39`	`39`	`{`
`40`		`- UseDefaultCAs: pointer.Bool(false),`
	`40`	`+ UseDefaultCAs: pointer.Bool(true),`
`41`	`41`	`},`
`42`	`42`	`}`
`43`	`43`
`@@ -49,7 +49,7 @@ func certmanager(ctx *common.RenderContext) ([]runtime.Object, error) {`
`49`	`49`	`},`
`50`	`50`	`})`
`51`	`51`
`52`		`- gitpodCustomCertificateBundleSource = append(gitpodCaBundleSources, trust.BundleSource{`
	`52`	`+ gitpodCustomCertificateBundleSource = append(gitpodCustomCertificateBundleSource, trust.BundleSource{`
`53`	`53`	`Secret: &trust.SourceObjectKeySelector{`
`54`	`54`	`Name: ctx.Config.CustomCACert.Name,`
`55`	`55`	`KeySelector: trust.KeySelector{Key: "ca.crt"},`