Merge "cleanup: drop obsolete LOGJUICER_CA_BUNDLE env injection"

Microzuul CI · Gerrit Code Review · commit 56899f208cc3 · 2025-05-14T08:19:17.000Z
diff --git a/controllers/logjuicer.go b/controllers/logjuicer.go
@@ -21,8 +21,6 @@ func (r *SFController) AddCorporateCA(spec *apiv1.PodSpec) string {
 				MountPath: "/certs",
 			})
 			spec.Containers[0].Env = append(spec.Containers[0].Env, base.MkEnvVar("LOGJUICER_CA_EXTRA", "/certs/"+fileName))
-			// TODO: remove the next line after merging https://github.com/logjuicer/logjuicer/pull/144
-			spec.Containers[0].Env = append(spec.Containers[0].Env, base.MkEnvVar("LOGJUICER_CA_BUNDLE", "/certs/"+fileName))
 			break
 		}
 		return string(corporateCM.ResourceVersion)

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ func (r SFController) AddCorporateCA(spec apiv1.PodSpec) string {`
`21`	`21`	`MountPath: "/certs",`
`22`	`22`	`})`
`23`	`23`	`spec.Containers[0].Env = append(spec.Containers[0].Env, base.MkEnvVar("LOGJUICER_CA_EXTRA", "/certs/"+fileName))`
`24`		`- // TODO: remove the next line after merging https://github.com/logjuicer/logjuicer/pull/144`
`25`		`- spec.Containers[0].Env = append(spec.Containers[0].Env, base.MkEnvVar("LOGJUICER_CA_BUNDLE", "/certs/"+fileName))`
`26`	`24`	`break`
`27`	`25`	`}`
`28`	`26`	`return string(corporateCM.ResourceVersion)`