update observatorium/configuration. (observatorium#67)

Signed-off-by: morvencao <[email protected]>
saswatamcode · Jan 21, 2022 · 6c1bbab · 6c1bbab
1 parent 26018d7
commit 6c1bbab
Show file tree

Hide file tree

Showing 124 changed files with 371 additions and 172 deletions.
diff --git a/jsonnet/jsonnetfile.json b/jsonnet/jsonnetfile.json
@@ -8,8 +8,7 @@
           "subdir": "configuration"
         }
       },
-      "version": "ddd91bbfa980f9588af7ad24fa6e33ae24cda852",
-      "sum": "3JuzPRAtOLmV15ADRx9ylrUD+XlCeJzZjg0LrPIAF3c="
+      "version": "main"
     },
     {
       "source": {

diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -19,8 +19,8 @@
           "subdir": "configuration"
         }
       },
-      "version": "ddd91bbfa980f9588af7ad24fa6e33ae24cda852",
-      "sum": "3JuzPRAtOLmV15ADRx9ylrUD+XlCeJzZjg0LrPIAF3c="
+      "version": "60bbf7ac4baac885449866d07ffdce30047330f4",
+      "sum": "IHlHbcCdcJlnwCjfpNP2BNeIZRPHYjRei5bxvHV9xsA="
     },
     {
       "source": {

diff --git a/jsonnet/obs-operator.jsonnet b/jsonnet/obs-operator.jsonnet
@@ -18,6 +18,7 @@ local operatorObs = obs {
       'app.kubernetes.io/part-of': 'observatorium',
     },
     image: if std.objectHas(cr.spec.thanos, 'image') then cr.spec.thanos.image else obs.thanos.config.image,
+    imagePullPolicy: if std.objectHas(cr.spec.thanos, 'imagePullPolicy') then cr.spec.thanos.imagePullPolicy else obs.thanos.config.imagePullPolicy,
     version: if std.objectHas(cr.spec.thanos, 'version') then cr.spec.thanos.version else obs.thanos.config.version,
     objectStorageConfig: cr.spec.objectStorageConfig.thanos,
     hashrings: cr.spec.hashrings,

diff --git a/jsonnet/vendor/github.com/observatorium/observatorium/configuration/Makefile b/jsonnet/vendor/github.com/observatorium/observatorium/configuration/Makefile
diff --git a/jsonnet/vendor/github.com/observatorium/observatorium/configuration/components/dex.libsonnet b/jsonnet/vendor/github.com/observatorium/observatorium/configuration/components/dex.libsonnet
diff --git a/...ndor/github.com/observatorium/observatorium/configuration/components/gubernator.libsonnet b/...ndor/github.com/observatorium/observatorium/configuration/components/gubernator.libsonnet
diff --git a/...net/vendor/github.com/observatorium/observatorium/configuration/components/loki.libsonnet b/...net/vendor/github.com/observatorium/observatorium/configuration/components/loki.libsonnet
diff --git a/...endor/github.com/observatorium/observatorium/configuration/components/memcached.libsonnet b/...endor/github.com/observatorium/observatorium/configuration/components/memcached.libsonnet
diff --git a/...et/vendor/github.com/observatorium/observatorium/configuration/components/minio.libsonnet b/...et/vendor/github.com/observatorium/observatorium/configuration/components/minio.libsonnet
diff --git a/...r/github.com/observatorium/observatorium/configuration/components/observatorium.libsonnet b/...r/github.com/observatorium/observatorium/configuration/components/observatorium.libsonnet
diff --git a/...t/vendor/github.com/observatorium/observatorium/configuration/components/thanos.libsonnet b/...t/vendor/github.com/observatorium/observatorium/configuration/components/thanos.libsonnet
diff --git a/...com/observatorium/observatorium/configuration/examples/base/manifests/api-deployment.yaml b/...com/observatorium/observatorium/configuration/examples/base/manifests/api-deployment.yaml
diff --git a/...ub.com/observatorium/observatorium/configuration/examples/base/manifests/api-service.yaml b/...ub.com/observatorium/observatorium/configuration/examples/base/manifests/api-service.yaml
diff --git a/...observatorium/observatorium/configuration/examples/base/manifests/api-serviceAccount.yaml b/...observatorium/observatorium/configuration/examples/base/manifests/api-serviceAccount.yaml
diff --git a/...ervatorium/observatorium/configuration/examples/base/manifests/gubernator-deployment.yaml b/...ervatorium/observatorium/configuration/examples/base/manifests/gubernator-deployment.yaml
diff --git a/...orium/observatorium/configuration/examples/base/manifests/loki-compactor-statefulset.yaml b/...orium/observatorium/configuration/examples/base/manifests/loki-compactor-statefulset.yaml
diff --git a/...rium/observatorium/configuration/examples/base/manifests/loki-distributor-deployment.yaml b/...rium/observatorium/configuration/examples/base/manifests/loki-distributor-deployment.yaml
diff --git a/...torium/observatorium/configuration/examples/base/manifests/loki-ingester-statefulset.yaml b/...torium/observatorium/configuration/examples/base/manifests/loki-ingester-statefulset.yaml
diff --git a/...atorium/observatorium/configuration/examples/base/manifests/loki-querier-statefulset.yaml b/...atorium/observatorium/configuration/examples/base/manifests/loki-querier-statefulset.yaml
diff --git a/...m/observatorium/configuration/examples/base/manifests/loki-query-frontend-deployment.yaml b/...m/observatorium/configuration/examples/base/manifests/loki-query-frontend-deployment.yaml
diff --git a/...rvatorium/observatorium/configuration/examples/base/manifests/thanos-compact-service.yaml b/...rvatorium/observatorium/configuration/examples/base/manifests/thanos-compact-service.yaml
diff --git a/...um/observatorium/configuration/examples/base/manifests/thanos-compact-serviceAccount.yaml b/...um/observatorium/configuration/examples/base/manifests/thanos-compact-serviceAccount.yaml