From c2190296063f7d4558a5194de5fc497c04af423c Mon Sep 17 00:00:00 2001
From: Anthony Mirabella <a9@aneurysm9.com>
Date: Tue, 7 Jul 2020 13:26:47 -0400
Subject: [PATCH] Update otel-collector example to use collector v0.5.0 (#915)

* Update otel-collector example to use collector v0.5.0

* Apply suggestions from code review

Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>

Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
---
 .../otel-collector/k8s/otel-collector.yaml    | 91 ++++++++++---------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/example/otel-collector/k8s/otel-collector.yaml b/example/otel-collector/k8s/otel-collector.yaml
index 7e37f3d5772..d77ebc3d57e 100644
--- a/example/otel-collector/k8s/otel-collector.yaml
+++ b/example/otel-collector/k8s/otel-collector.yaml
@@ -29,7 +29,9 @@ data:
       # Make sure to add the otlp receiver.
       # This will open up the receiver on port 55680
       otlp:
-        endpoint: 0.0.0.0:55680
+        protocols:
+          grpc:
+            endpoint: "0.0.0.0:55680"
     processors:
     extensions:
       health_check: {}
@@ -64,19 +66,18 @@ metadata:
     component: otel-collector
 spec:
   ports:
-  - name: otlp # Default endpoint for otlp receiver.
-    port: 55680
-    protocol: TCP
-    targetPort: 55680
-    nodePort: 30080
-  - name: metrics # Default endpoint for metrics.
-    port: 8889
-    protocol: TCP
-    targetPort: 8889
+    - name: otlp # Default endpoint for otlp receiver.
+      port: 55680
+      protocol: TCP
+      targetPort: 55680
+      nodePort: 30080
+    - name: metrics # Default endpoint for metrics.
+      port: 8889
+      protocol: TCP
+      targetPort: 8889
   selector:
     component: otel-collector
-  type:
-    NodePort
+  type: NodePort
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -105,39 +106,39 @@ spec:
         component: otel-collector
     spec:
       containers:
-      - command:
-          - "/otelcol"
-          - "--config=/conf/otel-collector-config.yaml"
-#           Memory Ballast size should be max 1/3 to 1/2 of memory.
-          - "--mem-ballast-size-mib=683"
-        env:
-        - name: GOGC
-          value: "80"
-        image: otel/opentelemetry-collector:0.3.0
-        name: otel-collector
-        resources:
-          limits:
-            cpu: 1
-            memory: 2Gi
-          requests:
-            cpu: 200m
-            memory: 400Mi
-        ports:
-        - containerPort: 55680 # Default endpoint for otlp receiver.
-        - containerPort: 8889  # Default endpoint for querying metrics.
-        volumeMounts:
-        - name: otel-collector-config-vol
-          mountPath: /conf
-#        - name: otel-collector-secrets
-#          mountPath: /secrets
-        livenessProbe:
-          httpGet:
-            path: /
-            port: 13133 # Health Check extension default port.
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 13133 # Health Check extension default port.
+        - command:
+            - "/otelcol"
+            - "--config=/conf/otel-collector-config.yaml"
+            # Memory Ballast size should be max 1/3 to 1/2 of memory.
+            - "--mem-ballast-size-mib=683"
+          env:
+            - name: GOGC
+              value: "80"
+          image: otel/opentelemetry-collector:0.5.0
+          name: otel-collector
+          resources:
+            limits:
+              cpu: 1
+              memory: 2Gi
+            requests:
+              cpu: 200m
+              memory: 400Mi
+          ports:
+            - containerPort: 55680 # Default endpoint for otlp receiver.
+            - containerPort: 8889 # Default endpoint for querying metrics.
+          volumeMounts:
+            - name: otel-collector-config-vol
+              mountPath: /conf
+          # - name: otel-collector-secrets
+          #   mountPath: /secrets
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133 # Health Check extension default port.
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133 # Health Check extension default port.
       volumes:
         - configMap:
             name: otel-collector-conf