fix for latest otel version

open-rpa · Aug 6, 2022 · df33888 · df33888
1 parent e1ec19c
commit df33888
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 33 deletions.
diff --git a/charts/openflow/Chart.yaml b/charts/openflow/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: openflow
 description: A Helm chart for deploying a single openflow instance
 type: application
-version: 0.1.96
-appVersion: 1.4.15
+version: 0.1.97
+appVersion: 1.4.19
 dependencies:
 - name: mongodb
   version: "10.x"

diff --git a/charts/openflow/templates/deployments.yaml b/charts/openflow/templates/deployments.yaml
@@ -8,9 +8,9 @@
   {{- $dummy := set . "apiuri" .Values.protocol ":" .Values.port "://" $apidomain }}
 {{- end }}
 # ":4317"
-{{- $oteluri := print "http://otel." $apidomain ":80" }}
+{{- $oteluri := print .Values.protocol "://otel." $apidomain }}
 {{- if .Values.port }}
-  {{- $oteluri := print "http://otel." $apidomain ":" .Values.port }}
+  {{- $oteluri := print .Values.protocol "://otel." $apidomain ":" .Values.port }}
 {{- end }}
 apiVersion: apps/v1
 kind: Deployment
@@ -35,6 +35,9 @@ spec:
       {{- if .Values.openflow.nodeSelector }}
       nodeSelector:
         {{- toYaml .Values.openflow.nodeSelector | nindent 12 }}
+      {{- else if .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml .Values.nodeSelector | nindent 12 }}
       {{- end }}
       {{- if .Values.openflow.topologySpreadConstraints }}
       topologySpreadConstraints:
@@ -339,10 +342,10 @@ spec:
   {{- if or (eq .Values.jaeger.enabled true) (eq .Values.zipkin.enabled true) }}
     {{- if (eq .Values.exporter.exposed true) }}
             - name: otel_trace_url
-              value: "{{ $oteluri }}"
+              value: "{{ $oteluri }}/v1/trace"
     {{- else }}
             - name: otel_trace_url
-              value: "http://otel-collector:4317"
+              value: "http://otel-collector:4317/v1/trace"
     {{- end }}
   {{- end }}
 {{- end }}
@@ -354,10 +357,10 @@ spec:
   {{- if or (eq .Values.prometheus.enabled true) (eq .Values.victoriametrics.enabled true) }}
     {{- if (eq .Values.exporter.exposed true) }}
             - name: otel_metric_url
-              value: "{{ $oteluri }}"
+              value: "{{ $oteluri }}/v1/metrics"
     {{- else }}
             - name: otel_metric_url
-              value: "http://otel-collector:4317"
+              value: "http://otel-collector:4317/v1/metrics"
     {{- end }}
   {{- end }}
 

diff --git a/charts/openflow/templates/ingress.yaml b/charts/openflow/templates/ingress.yaml
@@ -89,6 +89,16 @@ spec:
 {{- end }}
 {{- if and .Values.openflow.license_key (eq .Values.exporter.enabled true) (eq .Values.exporter.exposed true) }}
     # not used, we use IngressRoute instead ( defined in otel template )
+    # - host: "exporter.{{ $domain }}"
+    #   http:
+    #     paths:
+    #       - path: /
+    #         pathType: ImplementationSpecific
+    #         backend:
+    #           service:
+    #             name: otel-collector
+    #             port:
+    #               name: otlphttp
     # - host: "otel.{{ $domain }}"
     #   http:
     #     paths:

diff --git a/charts/openflow/templates/otel.yaml b/charts/openflow/templates/otel.yaml
@@ -63,7 +63,8 @@ data:
 {{- if (eq .Values.jaeger.enabled true) }}
       jaeger:
         endpoint: openflow-jaeger-collector:14250
-        insecure: true
+        tls:
+          insecure: true
 {{- end }}
 {{- if (eq .Values.zipkin.enabled true) }}
       zipkin:
@@ -233,6 +234,8 @@ spec:
       port: 55681
     - name: newport
       port: 4317
+    - name: otlphttp
+      port: 4318
   selector:
     app: opentelemetry
 ---
@@ -280,6 +283,7 @@ spec:
             - containerPort: 9464 # Prometheus exporter metrics
             - containerPort: 55681 # Collector port
             - containerPort: 4317 # new port
+            - containerPort: 4318 # otlp-http
           volumeMounts:
             - name: otel-collector-config-vol
               mountPath: /conf
@@ -324,29 +328,6 @@ spec:
         - name: otel-collector
           port: 4317
           scheme: h2c
-    {{- if and (eq .Values.exporter.type "LoadBalancer") (.Values.exporter.loadBalancerIP) }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: opentelemetry
-  name: ext-otel-collector
-spec:
-  loadBalancerIP: {{ .Values.exporter.loadBalancerIP }}
-  type: LoadBalancer
-  ports:
-  - name: newporthttp
-    port: 80
-    protocol: TCP
-    targetPort: 4317
-  - name: newporthttps
-    port: 443
-    protocol: TCP
-    targetPort: 4317
-  selector:
-    app: opentelemetry
-    {{- end }}
   {{- end }}
 {{- end }}
 

diff --git a/index.yaml b/index.yaml
@@ -75,6 +75,29 @@ entries:
     - https://github.com/open-rpa/helm-charts/releases/download/calendso-0.1.1/calendso-0.1.1.tgz
     version: 0.1.1
   openflow:
+  - apiVersion: v2
+    appVersion: 1.4.19
+    created: "2022-08-06T21:16:16.6575155+02:00"
+    dependencies:
+    - condition: mongodb.enabled
+      name: mongodb
+      repository: https://charts.bitnami.com/bitnami
+      version: 10.x
+    - condition: loki.enabled
+      name: loki
+      repository: https://grafana.github.io/loki/charts
+      version: 2.x
+    - condition: jaeger.enabled
+      name: jaeger
+      repository: https://jaegertracing.github.io/helm-charts
+      version: 0.x
+    description: A Helm chart for deploying a single openflow instance
+    digest: 553471f6cb7e98dd8c6b6a1b40b3144c7c659c459561d66793e40a480191bbfe
+    name: openflow
+    type: application
+    urls:
+    - https://github.com/open-rpa/helm-charts/releases/download/openflow-0.1.97/openflow-0.1.97.tgz
+    version: 0.1.97
   - apiVersion: v2
     appVersion: 1.4.15
     created: "2022-07-01T15:17:53.3397195+02:00"
@@ -1213,4 +1236,4 @@ entries:
     urls:
     - https://github.com/open-rpa/helm-charts/releases/download/rocketchat-3.0.2/rocketchat-3.0.2.tgz
     version: 3.0.2
-generated: "2022-07-01T15:17:53.5171087+02:00"
+generated: "2022-08-06T21:16:16.8336633+02:00"