fix: phase out jaeger in favor of tempo and otel collecotor
This commit is contained in:
@@ -1,14 +0,0 @@
|
|||||||
apiVersion: jaegertracing.io/v1
|
|
||||||
kind: Jaeger
|
|
||||||
metadata:
|
|
||||||
name: jaeger
|
|
||||||
namespace: {{ .Release.Namespace }}
|
|
||||||
spec:
|
|
||||||
strategy: allInOne
|
|
||||||
ingress:
|
|
||||||
enabled: false
|
|
||||||
allInOne:
|
|
||||||
image: jaegertracing/all-in-one:1.22
|
|
||||||
options:
|
|
||||||
query:
|
|
||||||
base-path: /jaeger
|
|
||||||
@@ -11,16 +11,3 @@ subjects:
|
|||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
namespace: {{ $fullname }}
|
namespace: {{ $fullname }}
|
||||||
name: {{ $fullname }}
|
name: {{ $fullname }}
|
||||||
---
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
kind: ClusterRoleBinding
|
|
||||||
metadata:
|
|
||||||
name: vcluster-jaegers
|
|
||||||
roleRef:
|
|
||||||
apiGroup: rbac.authorization.k8s.io
|
|
||||||
kind: ClusterRole
|
|
||||||
name: vcluster-jaegers
|
|
||||||
subjects:
|
|
||||||
- kind: ServiceAccount
|
|
||||||
namespace: {{ $fullname }}
|
|
||||||
name: {{ $fullname }}
|
|
||||||
|
|||||||
@@ -69,8 +69,10 @@ spec:
|
|||||||
to: "rabbitmq/{{ .Values.environment }}-rabbitmq"
|
to: "rabbitmq/{{ .Values.environment }}-rabbitmq"
|
||||||
- from: "{{ .Release.Namespace }}/staging-archmeister-rw"
|
- from: "{{ .Release.Namespace }}/staging-archmeister-rw"
|
||||||
to: "atlantis/staging-archmeister-rw"
|
to: "atlantis/staging-archmeister-rw"
|
||||||
- from: "{{ .Release.Namespace }}/jaeger-collector"
|
- from: "idp/{{ .Values.environment }}-openfga"
|
||||||
to: "atlantis/jaeger-collector"
|
to: "idp/{{ .Values.environment }}-openfga"
|
||||||
|
- from: "otel/opentelemetry-collector"
|
||||||
|
to: "otel/opentelemetry-collector"
|
||||||
- from: "idp/{{ .Values.environment }}-cerbos"
|
- from: "idp/{{ .Values.environment }}-cerbos"
|
||||||
to: "idp/{{ .Values.environment }}-cerbos"
|
to: "idp/{{ .Values.environment }}-cerbos"
|
||||||
sync:
|
sync:
|
||||||
@@ -94,9 +96,6 @@ spec:
|
|||||||
- apiGroups: [ "cilium.io" ]
|
- apiGroups: [ "cilium.io" ]
|
||||||
resources: [ "ciliumnetworkpolicies" ]
|
resources: [ "ciliumnetworkpolicies" ]
|
||||||
verbs: [ "get", "list", "watch", "create", "patch" ]
|
verbs: [ "get", "list", "watch", "create", "patch" ]
|
||||||
# - apiGroups: [ "jaegertracing.io" ]
|
|
||||||
# resources: [ "jaegers" ]
|
|
||||||
# verbs: [ "get", "list", "watch", "create", "patch" ]
|
|
||||||
config: |-
|
config: |-
|
||||||
version: v1beta1
|
version: v1beta1
|
||||||
import:
|
import:
|
||||||
@@ -110,15 +109,11 @@ spec:
|
|||||||
# apiVersion: dapr.io/v1alpha1
|
# apiVersion: dapr.io/v1alpha1
|
||||||
# - kind: Subscription
|
# - kind: Subscription
|
||||||
# apiVersion: dapr.io/v1alpha1
|
# apiVersion: dapr.io/v1alpha1
|
||||||
# - kind: Jaeger
|
|
||||||
# apiVersion: jaegertracing.io/v1
|
|
||||||
# - kind: CiliumNetworkPolicy
|
# - kind: CiliumNetworkPolicy
|
||||||
# apiVersion: cilium.io/v2
|
# apiVersion: cilium.io/v2
|
||||||
export:
|
export:
|
||||||
- kind: CiliumNetworkPolicy
|
- kind: CiliumNetworkPolicy
|
||||||
apiVersion: cilium.io/v2
|
apiVersion: cilium.io/v2
|
||||||
# - kind: Jaeger
|
|
||||||
# apiVersion: jaegertracing.io/v1
|
|
||||||
init:
|
init:
|
||||||
manifests: |-
|
manifests: |-
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ spec:
|
|||||||
k8s:io.kubernetes.pod.namespace: rabbitmq
|
k8s:io.kubernetes.pod.namespace: rabbitmq
|
||||||
- toEndpoints:
|
- toEndpoints:
|
||||||
- matchLabels:
|
- matchLabels:
|
||||||
k8s:io.kubernetes.pod.namespace: jaeger
|
k8s:io.kubernetes.pod.namespace: otel
|
||||||
endpointSelector:
|
endpointSelector:
|
||||||
matchLabels: {}
|
matchLabels: {}
|
||||||
|
|||||||
@@ -7,5 +7,5 @@ spec:
|
|||||||
tracing:
|
tracing:
|
||||||
samplingRate: "1"
|
samplingRate: "1"
|
||||||
zipkin:
|
zipkin:
|
||||||
endpointAddress: "http://jaeger-collector:9411/api/v2/spans"
|
endpointAddress: " http://opentelemetry-collector.otel.svc:9411/api/v2/spans"
|
||||||
|
|
||||||
|
|||||||
@@ -9,15 +9,3 @@ rules:
|
|||||||
- ciliumnetworkpolicies
|
- ciliumnetworkpolicies
|
||||||
verbs:
|
verbs:
|
||||||
- '*'
|
- '*'
|
||||||
---
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
kind: ClusterRole
|
|
||||||
metadata:
|
|
||||||
name: vcluster-jaegers
|
|
||||||
rules:
|
|
||||||
- apiGroups:
|
|
||||||
- jaegertracing.io
|
|
||||||
resources:
|
|
||||||
- jaegers
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ if [ ! $# -ge 1 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d chart ]; then
|
if [ ! -f create-vcluster.sh ]; then
|
||||||
echo "error: must be run from toplevel directory"
|
echo "error: must be run from toplevel directory"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user