Update changelog

Signed-off-by: clyang82 <[email protected]>
thanos-io · Jan 5, 2022 · 48f949e · 48f949e
1 parent 8c6b751
commit 48f949e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 - [#237](https://github.com/thanos-io/kube-thanos/pull/237) Add new bucket replicate component.
 - [#245](https://github.com/thanos-io/kube-thanos/pull/245) Support scraping config reloader sidecar for ruler.
 - [#251](https://github.com/thanos-io/kube-thanos/pull/251) Add support for extraEnv (custom environment variables) to all components.
+- [#260](https://github.com/thanos-io/kube-thanos/pull/260) Add support custom certificate for the object store by configuring `tlsSecretName` and `tlsSecretMountPath` in `objectStorageConfig`.
 
 ### Fixed
 

diff --git a/jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet b/jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet
@@ -159,7 +159,7 @@ function(params) {
       resources: if tbr.config.resources != {} then tbr.config.resources else {},
       terminationMessagePolicy: 'FallbackToLogsOnError',
       volumeMounts: if std.objectHas(tbr.config.objectStorageConfig, 'tlsSecretName') && std.length(tbr.config.objectStorageConfig.tlsSecretName) > 0 then [
-        { name: 'tls-secret', mountPath: tbr.config.objectStorageConfig.tlsSecretMountPath }
+        { name: 'tls-secret', mountPath: tbr.config.objectStorageConfig.tlsSecretMountPath },
       ] else [],
     };
 

diff --git a/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet b/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet
@@ -139,7 +139,7 @@ function(params) {
       resources: if tb.config.resources != {} then tb.config.resources else {},
       terminationMessagePolicy: 'FallbackToLogsOnError',
       volumeMounts: if std.objectHas(tb.config.objectStorageConfig, 'tlsSecretName') && std.length(tb.config.objectStorageConfig.tlsSecretName) > 0 then [
-        { name: 'tls-secret', mountPath: tb.config.objectStorageConfig.tlsSecretMountPath }
+        { name: 'tls-secret', mountPath: tb.config.objectStorageConfig.tlsSecretMountPath },
       ] else [],
     };
 

diff --git a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet
@@ -116,7 +116,7 @@ function(params) {
         readOnly: false,
       }] + (
         if std.objectHas(tc.config.objectStorageConfig, 'tlsSecretName') && std.length(tc.config.objectStorageConfig.tlsSecretName) > 0 then [
-          { name: 'tls-secret', mountPath: tc.config.objectStorageConfig.tlsSecretMountPath }
+          { name: 'tls-secret', mountPath: tc.config.objectStorageConfig.tlsSecretMountPath },
         ] else []
       ),
       resources: if tc.config.resources != {} then tc.config.resources else {},

diff --git a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet
@@ -135,7 +135,7 @@ function(params) {
         ] else []
       ) + (
         if tr.config.objectStorageConfig != null && std.objectHas(tr.config.objectStorageConfig, 'tlsSecretName') && std.length(tr.config.objectStorageConfig.tlsSecretName) > 0 then [
-          { name: 'tls-secret', mountPath: tr.config.objectStorageConfig.tlsSecretMountPath }
+          { name: 'tls-secret', mountPath: tr.config.objectStorageConfig.tlsSecretMountPath },
         ] else []
       ),
       livenessProbe: { failureThreshold: 8, periodSeconds: 30, httpGet: {
@@ -177,11 +177,11 @@ function(params) {
                 name: 'hashring-config',
                 configMap: { name: tr.config.hashringConfigMapName },
               }] else []
-            ) + ( 
+            ) + (
               if tr.config.objectStorageConfig != null && std.objectHas(tr.config.objectStorageConfig, 'tlsSecretName') && std.length(tr.config.objectStorageConfig.tlsSecretName) > 0 then [{
                 name: 'tls-secret',
                 secret: { secretName: tr.config.objectStorageConfig.tlsSecretName },
-              }] else [] 
+              }] else []
             ),
             terminationGracePeriodSeconds: 900,
             nodeSelector: {

diff --git a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet
@@ -257,40 +257,41 @@ function(params) {
             serviceAccountName: tr.serviceAccount.metadata.name,
             securityContext: tr.config.securityContext,
             containers: [c] +
-              (if std.length(tr.config.rulesConfig) > 0 || std.length(tr.config.extraVolumeMounts) > 0 || tr.config.alertmanagerConfigFile != {} then [
-                  reloadContainer,
-                ] else []),
+            (if std.length(tr.config.rulesConfig) > 0 || std.length(tr.config.extraVolumeMounts) > 0 || tr.config.alertmanagerConfigFile != {} then [
+                reloadContainer,
+              ] else []
+            ),
             volumes: 
-              [] +
-              (
-                if std.length(tr.config.rulesConfig) > 0 then [
-                  { name: ruleConfig.name, configMap: { name: ruleConfig.name } }
-                  for ruleConfig in tr.config.rulesConfig
-                ] else []
-              ) + (
-                if tr.config.alertmanagerConfigFile != {} then [{
-                  name: tr.config.alertmanagerConfigFile.name,
-                  configMap: { name: tr.config.alertmanagerConfigFile.name },
-                }] else []
-              ) + (
-                if std.length(tr.config.extraVolumeMounts) > 0 then [
-                  { name: volumeMount.name } +
-                  (
-                    if volumeMount.type == 'configMap' then {
-                      configMap: { name: volumeMount.name },
-                    }
-                    else {
-                      secret: { name: volumeMount.name },
-                    }
-                  )
-                  for volumeMount in tr.config.extraVolumeMounts
-                ] else []
-              ) + (
-                if tr.config.objectStorageConfig != null && std.objectHas(tr.config.objectStorageConfig, 'tlsSecretName') && std.length(tr.config.objectStorageConfig.tlsSecretName) > 0 then [{
-                  name: 'tls-secret',
-                  secret: { secretName: tr.config.objectStorageConfig.tlsSecretName },
-                }] else []
-              ),
+            [] +
+            (
+              if std.length(tr.config.rulesConfig) > 0 then [
+                { name: ruleConfig.name, configMap: { name: ruleConfig.name } }
+                for ruleConfig in tr.config.rulesConfig
+              ] else []
+            ) + (
+              if tr.config.alertmanagerConfigFile != {} then [{
+                name: tr.config.alertmanagerConfigFile.name,
+                configMap: { name: tr.config.alertmanagerConfigFile.name },
+              }] else []
+            ) + (
+              if std.length(tr.config.extraVolumeMounts) > 0 then [
+                { name: volumeMount.name } +
+                (
+                  if volumeMount.type == 'configMap' then {
+                    configMap: { name: volumeMount.name },
+                  }
+                  else {
+                    secret: { name: volumeMount.name },
+                  }
+                )
+                for volumeMount in tr.config.extraVolumeMounts
+              ] else []
+            ) + (
+              if tr.config.objectStorageConfig != null && std.objectHas(tr.config.objectStorageConfig, 'tlsSecretName') && std.length(tr.config.objectStorageConfig.tlsSecretName) > 0 then [{
+                name: 'tls-secret',
+                secret: { secretName: tr.config.objectStorageConfig.tlsSecretName },
+              }] else []
+            ),
             nodeSelector: {
               'kubernetes.io/os': 'linux',
             },

diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet
@@ -130,7 +130,7 @@ function(params) {
         readOnly: false,
       }] + (
         if std.objectHas(ts.config.objectStorageConfig, 'tlsSecretName') && std.length(ts.config.objectStorageConfig.tlsSecretName) > 0 then [
-          { name: 'tls-secret', mountPath: ts.config.objectStorageConfig.tlsSecretMountPath }
+          { name: 'tls-secret', mountPath: ts.config.objectStorageConfig.tlsSecretMountPath },
         ] else []
       ),
       livenessProbe: { failureThreshold: 8, periodSeconds: 30, httpGet: {