Adjusted the ALM examples and operator capabilities in CSV

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
jaegertracing · Sep 19, 2019 · 5c023b1 · 5c023b1
1 parent d45dfca
commit 5c023b1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/deploy/examples/with-badger-and-volume.yaml b/deploy/examples/with-badger-and-volume.yaml
@@ -3,13 +3,6 @@ kind: Jaeger
 metadata:
   name: with-badger-and-volume
 spec:
-  allInOne:
-    volumeMounts:
-    - name: data
-      mountPath: /badger
-    volumes:
-    - name: data
-      emptyDir: {}
   storage:
     type: badger
     options:

diff --git a/deploy/olm-catalog/jaeger.clusterserviceversion.yaml b/deploy/olm-catalog/jaeger.clusterserviceversion.yaml
@@ -8,7 +8,7 @@ metadata:
     certified: "false"
     containerImage: docker.io/jaegertracing/jaeger-operator:1.14.0
     createdAt: "2019-09-04T13:28:40+00:00"
-    capabilities: Seamless Upgrades
+    capabilities: Deep Insights
     support: Jaeger
     description: Provides tracing, monitoring and troubleshooting microservices-based distributed systems
     repository: https://github.com/jaegertracing/jaeger-operator
@@ -18,46 +18,56 @@ metadata:
           "apiVersion": "jaegertracing.io/v1",
           "kind": "Jaeger",
           "metadata": {
-            "name": "my-jaeger"
+            "name": "jaeger-all-in-one-inmemory"
+          }
+        },
+        {
+          "apiVersion": "jaegertracing.io/v1",
+          "kind": "Jaeger",
+          "metadata": {
+            "name": "jaeger-prod-elasticsearch"
           },
           "spec": {
-            "strategy": "allInOne",
-            "allInOne": {
-              "image": "jaegertracing/all-in-one:1.14.0",
+            "strategy": "production",
+            "storage": {
+              "type": "elasticsearch",
               "options": {
-                "log-level": "debug",
-                "query": {
-                  "base-path": "/jaeger"
+                "es": {
+                  "server-urls": "http://elasticsearch.default.svc:9200"
                 }
               }
-            },
-            "ui": {
-              "options": {
-                "dependencies": {
-                  "menuEnabled": false
-                },
-                "tracking": {
-                  "gaID": "UA-000000-2"
-                },
-                "menu": [
-                  {
-                    "label": "About Jaeger",
-                    "items": [
-                      {
-                        "label": "Documentation",
-                        "url": "https://www.jaegertracing.io/docs/latest"
-                      }
-                    ]
-                  }
-                ]
-              }
-            },
+            }
+          }
+        },
+        {
+          "apiVersion": "jaegertracing.io/v1",
+          "kind": "Jaeger",
+          "metadata": {
+            "name": "jaeger-all-in-one-local-storage"
+          },
+          "spec": {
             "storage": {
+              "type": "badger",
               "options": {
-                "memory": {
-                  "max-traces": 100000
+                "badger": {
+                  "ephemeral": false,
+                  "directory-key": "/badger/key",
+                  "directory-value": "/badger/data"
                 }
-              }
+              },
+              "volumeMounts": [
+                {
+                  "name": "data",
+                  "mountPath": "/badger"
+                }
+              ],
+              "volumes": [
+                {
+                  "name": "data",
+                  "emptyDir": {
+                  }
+                }
+              ]
             }
           }
         }