@@ -29,17 +29,23 @@ var (
2929// based on the object storage type. Currently supported amendments:
3030// - All: Ensure object storage secret mounted and auth projected as env vars.
3131// - GCS: Ensure env var GOOGLE_APPLICATION_CREDENTIALS in container
32- // - S3: Ensure mounting custom CA configmap if any TLSConfig given
32+ // - S3 & Swift : Ensure mounting custom CA configmap if any TLSConfig given
3333func ConfigureDeployment (d * appsv1.Deployment , opts Options ) error {
3434 switch opts .SharedStore {
35- case lokiv1 .ObjectStorageSecretAlibabaCloud , lokiv1 .ObjectStorageSecretAzure , lokiv1 .ObjectStorageSecretGCS , lokiv1 . ObjectStorageSecretSwift :
35+ case lokiv1 .ObjectStorageSecretAlibabaCloud , lokiv1 .ObjectStorageSecretAzure , lokiv1 .ObjectStorageSecretGCS :
3636 return configureDeployment (d , opts )
3737 case lokiv1 .ObjectStorageSecretS3 :
3838 err := configureDeployment (d , opts )
3939 if err != nil {
4040 return err
4141 }
42- return configureDeploymentCA (d , opts .TLS )
42+ return configureDeploymentCA (d , opts .TLS , lokiv1 .ObjectStorageSecretS3 )
43+ case lokiv1 .ObjectStorageSecretSwift :
44+ err := configureDeployment (d , opts )
45+ if err != nil {
46+ return err
47+ }
48+ return configureDeploymentCA (d , opts .TLS , lokiv1 .ObjectStorageSecretSwift )
4349 default :
4450 return nil
4551 }
@@ -49,16 +55,21 @@ func ConfigureDeployment(d *appsv1.Deployment, opts Options) error {
4955// based on the object storage type. Currently supported amendments:
5056// - All: Ensure object storage secret mounted and auth projected as env vars.
5157// - GCS: Ensure env var GOOGLE_APPLICATION_CREDENTIALS in container
52- // - S3: Ensure mounting custom CA configmap if any TLSConfig given
58+ // - S3 & Swift : Ensure mounting custom CA configmap if any TLSConfig given
5359func ConfigureStatefulSet (d * appsv1.StatefulSet , opts Options ) error {
5460 switch opts .SharedStore {
55- case lokiv1 .ObjectStorageSecretAlibabaCloud , lokiv1 .ObjectStorageSecretAzure , lokiv1 .ObjectStorageSecretGCS , lokiv1 . ObjectStorageSecretSwift :
61+ case lokiv1 .ObjectStorageSecretAlibabaCloud , lokiv1 .ObjectStorageSecretAzure , lokiv1 .ObjectStorageSecretGCS :
5662 return configureStatefulSet (d , opts )
5763 case lokiv1 .ObjectStorageSecretS3 :
5864 if err := configureStatefulSet (d , opts ); err != nil {
5965 return err
6066 }
61- return configureStatefulSetCA (d , opts .TLS )
67+ return configureStatefulSetCA (d , opts .TLS , lokiv1 .ObjectStorageSecretS3 )
68+ case lokiv1 .ObjectStorageSecretSwift :
69+ if err := configureStatefulSet (d , opts ); err != nil {
70+ return err
71+ }
72+ return configureStatefulSetCA (d , opts .TLS , lokiv1 .ObjectStorageSecretSwift )
6273 default :
6374 return nil
6475 }
@@ -75,16 +86,22 @@ func configureDeployment(d *appsv1.Deployment, opts Options) error {
7586 return nil
7687}
7788
78- // ConfigureDeploymentCA merges a S3 CA ConfigMap volume into the deployment spec.
79- func configureDeploymentCA (d * appsv1.Deployment , tls * TLSConfig ) error {
89+ // ConfigureDeploymentCA merges a S3 or Swift CA ConfigMap volume into the deployment spec.
90+ func configureDeploymentCA (d * appsv1.Deployment , tls * TLSConfig , secretType lokiv1. ObjectStorageSecretType ) error {
8091 if tls == nil {
8192 return nil
8293 }
8394
84- p := ensureCAForS3 (& d .Spec .Template .Spec , tls )
95+ var p corev1.PodSpec
96+ switch secretType {
97+ case lokiv1 .ObjectStorageSecretS3 :
98+ p = ensureCAForObjectStorage (& d .Spec .Template .Spec , tls , lokiv1 .ObjectStorageSecretS3 )
99+ case lokiv1 .ObjectStorageSecretSwift :
100+ p = ensureCAForObjectStorage (& d .Spec .Template .Spec , tls , lokiv1 .ObjectStorageSecretSwift )
101+ }
85102
86103 if err := mergo .Merge (& d .Spec .Template .Spec , p , mergo .WithOverride ); err != nil {
87- return kverrors .Wrap (err , "failed to merge s3 object storage ca options " )
104+ return kverrors .Wrap (err , "failed to merge object storage ca options " )
88105 }
89106
90107 return nil
@@ -101,16 +118,22 @@ func configureStatefulSet(s *appsv1.StatefulSet, opts Options) error {
101118 return nil
102119}
103120
104- // ConfigureStatefulSetCA merges a S3 CA ConfigMap volume into the statefulset spec.
105- func configureStatefulSetCA (s * appsv1.StatefulSet , tls * TLSConfig ) error {
121+ // ConfigureStatefulSetCA merges a S3 or Swift CA ConfigMap volume into the statefulset spec.
122+ func configureStatefulSetCA (s * appsv1.StatefulSet , tls * TLSConfig , secretType lokiv1. ObjectStorageSecretType ) error {
106123 if tls == nil {
107124 return nil
108125 }
126+ var p corev1.PodSpec
109127
110- p := ensureCAForS3 (& s .Spec .Template .Spec , tls )
128+ switch secretType {
129+ case lokiv1 .ObjectStorageSecretS3 :
130+ p = ensureCAForObjectStorage (& s .Spec .Template .Spec , tls , lokiv1 .ObjectStorageSecretS3 )
131+ case lokiv1 .ObjectStorageSecretSwift :
132+ p = ensureCAForObjectStorage (& s .Spec .Template .Spec , tls , lokiv1 .ObjectStorageSecretSwift )
133+ }
111134
112135 if err := mergo .Merge (& s .Spec .Template .Spec , p , mergo .WithOverride ); err != nil {
113- return kverrors .Wrap (err , "failed to merge s3 object storage ca options " )
136+ return kverrors .Wrap (err , "failed to merge object storage ca options " )
114137 }
115138
116139 return nil
@@ -254,7 +277,7 @@ func serverSideEncryption(opts Options) []corev1.EnvVar {
254277 }
255278}
256279
257- func ensureCAForS3 (p * corev1.PodSpec , tls * TLSConfig ) corev1.PodSpec {
280+ func ensureCAForObjectStorage (p * corev1.PodSpec , tls * TLSConfig , secretType lokiv1. ObjectStorageSecretType ) corev1.PodSpec {
258281 container := p .Containers [0 ].DeepCopy ()
259282 volumes := p .Volumes
260283
@@ -275,9 +298,16 @@ func ensureCAForS3(p *corev1.PodSpec, tls *TLSConfig) corev1.PodSpec {
275298 MountPath : caDirectory ,
276299 })
277300
278- container .Args = append (container .Args ,
279- fmt .Sprintf ("-s3.http.ca-file=%s" , path .Join (caDirectory , tls .Key )),
280- )
301+ switch secretType {
302+ case lokiv1 .ObjectStorageSecretS3 :
303+ container .Args = append (container .Args ,
304+ fmt .Sprintf ("-s3.http.ca-file=%s" , path .Join (caDirectory , tls .Key )),
305+ )
306+ case lokiv1 .ObjectStorageSecretSwift :
307+ container .Args = append (container .Args ,
308+ fmt .Sprintf ("-swift.http.tls-ca-path=%s" , path .Join (caDirectory , tls .Key )),
309+ )
310+ }
281311
282312 return corev1.PodSpec {
283313 Containers : []corev1.Container {
0 commit comments