update loki cli args for swift ca to match the ones introduced in

grafana#11672
JoaoBraveCoding · Dec 4, 2024 · 9178aeb · 9178aeb
1 parent dfe16b4
commit 9178aeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/operator/internal/manifests/storage/configure.go b/operator/internal/manifests/storage/configure.go
@@ -305,7 +305,7 @@ func ensureCAForObjectStorage(p *corev1.PodSpec, tls *TLSConfig, secretType loki
 		)
 	case lokiv1.ObjectStorageSecretSwift:
 		container.Args = append(container.Args,
-			fmt.Sprintf("-swift.http.ca-file=%s", path.Join(caDirectory, tls.Key)),
+			fmt.Sprintf("-swift.http.tls-ca-path=%s", path.Join(caDirectory, tls.Key)),
 		)
 	}
 

diff --git a/operator/internal/manifests/storage/configure_test.go b/operator/internal/manifests/storage/configure_test.go
@@ -2643,7 +2643,7 @@ func TestConfigureDeploymentForStorageCA(t *testing.T) {
 										},
 									},
 									Args: []string{
-										"-swift.http.ca-file=/etc/storage/ca/service-ca.crt",
+										"-swift.http.tls-ca-path=/etc/storage/ca/service-ca.crt",
 									},
 									Env: []corev1.EnvVar{
 										{
@@ -2933,7 +2933,7 @@ func TestConfigureStatefulSetForStorageCA(t *testing.T) {
 										},
 									},
 									Args: []string{
-										"-swift.http.ca-file=/etc/storage/ca/service-ca.crt",
+										"-swift.http.tls-ca-path=/etc/storage/ca/service-ca.crt",
 									},
 									Env: []corev1.EnvVar{
 										{