add tlsSecretMountPath for tlsSecretName (stolostron#1247) (stolostro…

…n#1248) Signed-off-by: David Luong <[email protected]> Co-authored-by: David Luong <[email protected]>
subbarao-meduri · Sep 29, 2023 · eb9bda2 · eb9bda2
1 parent 36de572
commit eb9bda2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/operators/multiclusterobservability/api/shared/multiclusterobservability_shared.go b/operators/multiclusterobservability/api/shared/multiclusterobservability_shared.go
@@ -42,6 +42,9 @@ type PreConfiguredStorage struct {
 	// TLS secret contains the custom certificate for the object store
 	// +optional
 	TLSSecretName string `json:"tlsSecretName,omitempty"`
+	// TLS secret mount path for the custom certificate for the object store
+	// +optional
+	TLSSecretMountPath string `json:"tlsSecretMountPath,omitempty"`
 	// serviceAccountProjection indicates whether mount service account token to thanos pods. Default is false.
 	// +optional
 	ServiceAccountProjection bool `json:"serviceAccountProjection,omitempty"`

diff --git a/...undle/manifests/observability.open-cluster-management.io_multiclusterobservabilities.yaml b/...undle/manifests/observability.open-cluster-management.io_multiclusterobservabilities.yaml
@@ -133,6 +133,9 @@ spec:
                       tlsSecretName:
                         description: TLS secret contains the custom certificate for the object store
                         type: string
+                      tlsSecretMountPath: 
+                        description: TLS secret mount path for the custom certificate for the object store
+                        type: string
                     required:
                     - key
                     - name
@@ -748,6 +751,9 @@ spec:
                       tlsSecretName:
                         description: TLS secret contains the custom certificate for the object store
                         type: string
+                      tlsSecretMountPath:
+                        description: TLS secret mount path for the custom certificate for the object store
+                        type: string
                     required:
                     - key
                     - name
@@ -781,6 +787,9 @@ spec:
                         tlsSecretName:
                           description: TLS secret contains the custom certificate for the object store
                           type: string
+                        tlsSecretMountPath:
+                          description: TLS secret mount path for the custom certificate for the object store
+                          type: string
                       required:
                       - key
                       - name

diff --git a/...onfig/crd/bases/observability.open-cluster-management.io_multiclusterobservabilities.yaml b/...onfig/crd/bases/observability.open-cluster-management.io_multiclusterobservabilities.yaml
@@ -142,6 +142,10 @@ spec:
                         description: TLS secret contains the custom certificate for
                           the object store
                         type: string
+                      tlsSecretMountPath:
+                        description: TLS secret mount path for the custom certificate for
+                          the object store
+                        type: string
                     required:
                     - key
                     - name
@@ -894,6 +898,10 @@ spec:
                         description: TLS secret contains the custom certificate for
                           the object store
                         type: string
+                      tlsSecretMountPath:
+                        description: TLS secret mount path for the custom certificate for
+                          the object store
+                        type: string
                     required:
                     - key
                     - name
@@ -935,6 +943,10 @@ spec:
                           description: TLS secret contains the custom certificate
                             for the object store
                           type: string
+                        tlsSecretMountPath:
+                          description: TLS secret mount path for the custom certificate
+                            for the object store
+                          type: string
                       required:
                       - key
                       - name

diff --git a/operators/multiclusterobservability/controllers/multiclusterobservability/observatorium.go b/operators/multiclusterobservability/controllers/multiclusterobservability/observatorium.go
@@ -279,7 +279,7 @@ func newDefaultObservatoriumSpec(cl client.Client, mco *mcov1beta2.MultiClusterO
 		obs.ObjectStorageConfig.Thanos.Name = objStorageConf.Name
 		obs.ObjectStorageConfig.Thanos.Key = objStorageConf.Key
 		obs.ObjectStorageConfig.Thanos.TLSSecretName = objStorageConf.TLSSecretName
-		obs.ObjectStorageConfig.Thanos.TLSSecretMountPath = tlsSecretMountPath
+		obs.ObjectStorageConfig.Thanos.TLSSecretMountPath = objStorageConf.TLSSecretMountPath
 		obs.ObjectStorageConfig.Thanos.ServiceAccountProjection =
 			mco.Spec.StorageConfig.MetricObjectStorage.ServiceAccountProjection
 	}