diff --git a/Makefile b/Makefile index 510bf7b99..2e72c3b68 100644 --- a/Makefile +++ b/Makefile @@ -44,9 +44,13 @@ endif ECHO ?= @echo $(echo_prefix) -# Default namespace of the operator +# Default namespace of the Tempo operator OPERATOR_NAMESPACE ?= tempo-operator-system +# OpenTelemetry operator installation vars +OTEL_OPERATOR_NAMESPACE ?= otel-operator-system +OTEL_BUNDLE_IMG ?= "ghcr.io/open-telemetry/opentelemetry-operator/operator-bundle:v0.113.1" + # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") # To re-generate a bundle for other specific channels without changing the standard setup, you can: @@ -214,6 +218,12 @@ olm-deploy: operator-sdk ## Deploy operator via OLM olm-upgrade: operator-sdk ## Upgrade operator via OLM $(OPERATOR_SDK) run bundle-upgrade -n $(OPERATOR_NAMESPACE) $(BUNDLE_IMG) +##@ OpenTelemetry Operator deployment +.PHONY: otel-deploy +otel-deploy: operator-sdk ## Deploy OpenTelemetry operator via OLM + kubectl create namespace otel-operator-system + $(OPERATOR_SDK) run bundle --timeout=5m --security-context-config=restricted -n $(OTEL_OPERATOR_NAMESPACE) $(OTEL_BUNDLE_IMG) + ##@ Build Dependencies ## Location to install dependencies to @@ -381,7 +391,7 @@ deploy-minio: # generic end-to-tests .PHONY: prepare-e2e -prepare-e2e: chainsaw start-kind cert-manager set-test-image-vars build docker-build load-image-operator deploy +prepare-e2e: chainsaw start-kind cert-manager set-test-image-vars build docker-build load-image-operator deploy olm-install otel-deploy .PHONY: e2e e2e: diff --git a/tests/e2e/monolithic-ingestion-mtls/02-assert.yaml b/tests/e2e/monolithic-ingestion-mtls/02-assert.yaml index 1f4451287..3bf6d9293 100644 --- a/tests/e2e/monolithic-ingestion-mtls/02-assert.yaml +++ b/tests/e2e/monolithic-ingestion-mtls/02-assert.yaml @@ -3,9 +3,23 @@ kind: Deployment metadata: name: opentelemetry-collector status: + availableReplicas: 1 readyReplicas: 1 + replicas: 1 + --- apiVersion: v1 kind: Service metadata: name: opentelemetry-collector +spec: + ports: + - appProtocol: grpc + name: otlp-grpc + port: 4317 + protocol: TCP + targetPort: 4317 + selector: + app.kubernetes.io/component: opentelemetry-collector + app.kubernetes.io/managed-by: opentelemetry-operator + app.kubernetes.io/part-of: opentelemetry diff --git a/tests/e2e/monolithic-ingestion-mtls/02-install-otel.yaml b/tests/e2e/monolithic-ingestion-mtls/02-install-otel.yaml index 842b7f1bb..db6908620 100644 --- a/tests/e2e/monolithic-ingestion-mtls/02-install-otel.yaml +++ b/tests/e2e/monolithic-ingestion-mtls/02-install-otel.yaml @@ -5,15 +5,32 @@ metadata: data: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZQRENDQXlTZ0F3SUJBZ0lVV1ZZcE9WdmJhdVU5Sk01SG94cklncHNjYVpRd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0V6RVJNQThHQTFVRUF3d0lUWGxFWlcxdlEwRXdJQmNOTWpRd01URTVNVFl5TlRFNVdoZ1BNakV5TXpFeQpNall4TmpJMU1UbGFNQ0l4SURBZUJnTlZCQU1NRjI5d1pXNTBaV3hsYldWMGNua3RZMjlzYkdWamRHOXlNSUlDCklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUEwa05CTCtjYXhZeWF2YVZ1cnBuVlBjQkMKWnJQdlE0elQwUEpWeUg0VVlIbFZZa2J2WFFZVHFiSklHVURLOEdsM3R4d1QrQ1lINytBK2MzS0RVQU1qS1VreApKUDNCeXlOcUl6bzBiYzg3b1ptTnZZYWdyTkJpNDdVZWNJc0pSRzB2WFhuKy9ZRjU0STNKS1JXRllvNE5EN2sxCnJOa1BXYjJaVXRGaEZFZXRaOENsaDM1dWlRMEFsUW40OGprWU1UQlVITXQ4NVlJaHYwT0h2UkdIdWxXOXBvWWwKb0d1bklsYVR4MzA3Q0V1SVRsTk5KUzVWQUp3cUxBeG1kZFZoOFBXK2g2VU5nakVFOTdRdUYxYmJEOW9kRmwwSQpkNTBQL1V5cStYV2J6cmoyVzRPWUdDcUZWb1RQTkpBbUJ0aTg1Qm9jR1JVTlpBN2lyWEhOc0ZSRGJDbHdNV2dYCnlscCtJUHZLUDJnMWFpK25JUlNjWnkxSFlpQjlPZHNzbWJncFd6K3RYODFCalJ1ZHVaNW8yQU5NM3hlOVBUT1UKS2NXc1IwZGppUVVzZE5SZGdsc2ZTOTNsYW1jcURiY01YNTFlaG5HKzlGL2U3bGJJa1Nlc1NPcENjV2hzZllYVgpuK3dDempaN3ljNnd4Y1BxdU9vNm5ialMvMElYa0ExRjNhRkYxSTQ4NEh0WXZxUVV4UXIvQTFFcXdLZlFkUVFlClI1VFF1UCsvUzB4bDRhSXdudUtlUGN0WVQwUjA3S2JYQkpOeGxWMUJEUWdveGpLelhuOUxOVEQ5bXZlU3VKZEoKK1M4T3lLakVXeXRneXJUZm9Mc0dCcE8zRTFDdVFwU1dOYmQ2TnNtSFd4WmhGTUZ3ZklSKzhxWVdjdmdkMVhCVgp4R0Q2TDJ0aW5iczFaKzRZZkRrQ0F3RUFBYU4zTUhVd0hRWURWUjBPQkJZRUZIRzB3aTgwQjRpaThiaEFxYm9nCkVLUnhkZlI3TUI4R0ExVWRJd1FZTUJhQUZMNHZUaFhVUnVpWWpsWDQ4Z2RiRjRlaWtpbVRNQThHQTFVZEV3RUIKL3dRRk1BTUJBZjh3SWdZRFZSMFJCQnN3R1lJWGIzQmxiblJsYkdWdFpYUnllUzFqYjJ4c1pXTjBiM0l3RFFZSgpLb1pJaHZjTkFRRUxCUUFEZ2dJQkFDUHFSaXhmS0dVN1FBZkEzZk9nMGo2QjNGbk84U1dwTTlud2lDUjQvRGNUCnVndWZZQUxZenkydkEvZDdKMUlFdHlzb0YxOERqUDg2REtPZktCV3JEYVdGMUpPc0tpVW4zcC9vMHVFRFdEL1AKVTF1M0dRMWZ6dWx3V3JLdGZSWUU0QXRBSmRJOEZFR2JWb0M4SUc1Qk9yRmxhWVNRazF5Z0Q1Q1pFRTcrb2kvbApFdG1qUm93cXI4UHB3YkpOVmNCazBOS3h2a2x1OEVCUk93ZyswQzVhRjMyL0NrM0Z5V3RwZFZJcVNYd2FGcVVYCjZ6UGJMRlNLdFdJQWdrZE1jaGw1YVZmLzF6dTFXZXZ2YngvM1BkRWpkTVRhbGhRNzRvQnhsbFpKd2l6MUd5MTgKbGM4N3JoSitaRUFDZjF3dXNVUEo3SUxJcllRNXhMNk12U3hlbk4ySU04WWJZTk5hZ1NFT0diell4d0xmaDlWYwpTZDVIb0M3RmV3bzZ4bnZ5WVQ3TDQ5WGVjaE9IbDRJanZpYVR2UkZmbTlJYVpHR01Gb1BOb01JMEZEUnZ1S2xBCm11SEJEWXp6Z2d3eTJYMjllVG5VdGtIQVJheXZrUkRWYUFBaFlWUHVYbXBPRi9tK29ySTVKcWpvUTU2ejI0bHcKSWZnQWZOUnlKQjVqS3BqUzh0L1Q4UTJFa1hxKzIxTitoZEwrMUNxelRGSzBETTVoVjNGdi9GZ0thQjN3azVobgpyVXJrYlA1Tllpc3ZJY1VrbWF6dEtyYTQ5R2RyS0xOZDVCQmQ2dGd2VjQrZ3Vqb2JkNHdhUzBQZDE2K25XVm5BCm9YdkVLR1hCRlJZNnJYUEJpQUptLzhPejlrWTE4ODZjeC9TZTZwZ1NSaVVENHZNakRhSkwrZkEwUWhHSUpJNVMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRZ0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1N3d2dna29BZ0VBQW9JQ0FRRFNRMEV2NXhyRmpKcTkKcFc2dW1kVTl3RUptcys5RGpOUFE4bFhJZmhSZ2VWVmlSdTlkQmhPcHNrZ1pRTXJ3YVhlM0hCUDRKZ2Z2NEQ1egpjb05RQXlNcFNURWsvY0hMSTJvak9qUnR6enVobVkyOWhxQ3MwR0xqdFI1d2l3bEViUzlkZWY3OWdYbmdqY2twCkZZVmlqZzBQdVRXczJROVp2WmxTMFdFVVI2MW53S1dIZm02SkRRQ1ZDZmp5T1JneE1GUWN5M3psZ2lHL1E0ZTkKRVllNlZiMm1oaVdnYTZjaVZwUEhmVHNJUzRoT1UwMGxMbFVBbkNvc0RHWjExV0h3OWI2SHBRMkNNUVQzdEM0WApWdHNQMmgwV1hRaDNuUS85VEtyNWRadk91UFpiZzVnWUtvVldoTTgwa0NZRzJMemtHaHdaRlExa0R1S3RjYzJ3ClZFTnNLWEF4YUJmS1duNGcrOG8vYURWcUw2Y2hGSnhuTFVkaUlIMDUyeXladUNsYlA2MWZ6VUdORzUyNW5talkKQTB6ZkY3MDlNNVFweGF4SFIyT0pCU3gwMUYyQ1d4OUwzZVZxWnlvTnR3eGZuVjZHY2I3MFg5N3VWc2lSSjZ4SQo2a0p4YUd4OWhkV2Y3QUxPTm52SnpyREZ3K3E0NmpxZHVOTC9RaGVRRFVYZG9VWFVqanpnZTFpK3BCVEZDdjhEClVTckFwOUIxQkI1SGxOQzQvNzlMVEdYaG9qQ2U0cDQ5eTFoUFJIVHNwdGNFazNHVlhVRU5DQ2pHTXJOZWYwczEKTVAyYTk1SzRsMG41THc3SXFNUmJLMkRLdE4rZ3V3WUdrN2NUVUs1Q2xKWTF0M28yeVlkYkZtRVV3WEI4aEg3eQpwaFp5K0IzVmNGWEVZUG92YTJLZHV6Vm43aGg4T1FJREFRQUJBb0lDQUFDSis1akwxdDI2eG9yRjZjcTR5anNtClN3VklZTXlqaDhkNVY0NzBBOGxiaGtTQ09ncmJBU0htT3hrVmVXKzBWWUk2cURKeXBvS082Sm9US1JNRGJ3dWsKREdRejRsTksrL0tySzRjOGlNS1pTaXU2Tko4OHlZUWI2c0FQR3k3NXVLMWNxcktycWt4UkVMcnlPeTFOZitzUwpabmpTOVo4ZFJVOVpDZzZyUUY2THQrRHBDZzkvNFFpQXhncVk2dDcxYU1IS0k3L1MzWk5IOFFrakNsNEg2anlMCkMzMmx5UC9saU90eC9yeSt0Tksrayt3TWVsdE9DeTJodW9HQzBvVnptOUZ0TXVPcWpJQzJEWWd4eU0zNW1TbDkKZzVBSzd3ZVBNc0VBOUMxTGZCWXYrQ3ZYc0EvUXQxZERKMVhOS0c3TlFsVXVJS0twQnh1NnR2UkV3d2Q3ODdXcgpoZmRHdDNoeHhoc01jbm9jekE2MStDdmYrYmMxZWFOSU92a216THJOZHV1Rk0rOWR3RHFsOHhVZXZwd3FrTkZLCldHWDhKclQ4eFpuWmxyM05ESEFMNWUzTTBMa0pjN1Exck1uWXZDOHFNaXZqZks2MW0wUUR1TDJSWk9tUjZMekMKalMybk5Dd1o1M2FISzJpOE5jaERmQi9qS2Exc0hMaGg4cHRrcXlNZ0F1TGZuc1hyK2wwd1d6M0MxY3IvaXdHTApNa2tNVzBDL0l2ektJcW5jUllVNndWTzMzU2l6Vjdyb2dNY09TVjZQVENvVWhRUzZaS0NVeU5MZmhWdHJDektjCnVZRXNvVU8zWEJ1VWYvRHliNDEyUERoQkp3NG9nbXZiNHkzWTRDbFZFR3MzbGw4Nm10VDFyazVsSzRRRXk5U04KcW1rcXlpeTVTWWlINEEvdmNlU0JBb0lCQVFEdnlxTDZmN2hZYmFDNEsxVlprN0tXaHFUdWQyeVFqNjhDSUtJaApNVzVvaWpONkdaamJMK3k1cTgwY2tJZ3cwNi84Z0JhS1dKT3g0d0tQV3NhR0tjWnNKaEFkTDEza241MlROeHNXCmFzVEVaVmV6RlAzb2FWVmtLWGZXWU5tOXFINWxXMzVZdEZaUDVOTnRiSjRCbE5ZZUxlSldNSGtpRE5JaHA3dHgKQmtWQVFaYklKMEdCeU9UN3d5bHlkRHVNZ2p2OTJyQTNFWWRWUDBIdCsxTDNxWnFYbkZiSjdUeDI0TUQyaVliVwpORGJKTUlaVHl0NG9sRGJsRDRDdUROZ0FYWWk3LzkyeUdVaFpacVJKMTlGcHFPVnpieXcyc1FqUmVzVWRLcElMClIrSnJvRHViSldpS20wamtGR3dNUmpPVzViU1JVV3JaYktOMmQ5Sy9hZXVuTGF1TkFvSUJBUURnZWFaVnRvdFEKUE9Qd3d5SWlBZVZQQnNJRmlBOHRIU1o2TG03SzlYdklVbTh2YWlKeHpyZEp1RjF6Vm1GTkNEOUFzZ3hNanVzOApPWHVCRzhEcFJGbmwza1BDOWtZbCs3Y3VnS25UR0hzQXBheHU5MXFvVUpLajRtQWNTc281aVJKL0RCcmwyN2ZJCnh4RFlPQndtSGs2VW1lRUs2c1p5SEVZTG9pOTdvV1h2ZlB5ODMrYW45TU9JZTZ3S0R5ZWtjU05oOC9yMXF6bzMKR0llb1pIZm9iRmswMDNkNS9IL0F1MmhKS1plTDFIWHhiL05nYURJVVB6R2tTR3JYN0Voek9NSkN1d1h6SmJ4UApvbUNmTjRmMUhvR3l2Ym5MeWlPS2dpcTExclhmL2pRRjVySEI5RlZrZEZkcXJYVWMveksyeUZ1TFF4U25DREZaCkdNaldVZDZOUmxKZEFvSUJBUUM0Wmw0YXdPa2twM2wyNTJ3RkxMMmpYL3VwbnBFUVFrNVZGbjlYZzBuaWZwVEQKaXJldnB4VW1XMldxVjhORHVTYVd5SEdOQmp6ZUNUTEl4d2Z2MkdSTWVxRGRzTFZGd1RGT0tveGNHdE1pTE1UYQpaSVExbS9zY3dYNzBqeG9pN1ZYMTMvd3pmc3I1T1lFVm52ZUxROGU5QVpBU3M4Z1RWVVNxdVBBK0pKSlFyWitrClgvdlNNSWxXeW1ndktnODVLRlcyQzl5REhLbXo5cWRldVd5K0krRk1RZC9EL1BvSWVTSXE5T3VLQWpFM1dtZVMKUEduSFR1TkFGMEhmbHVUc3N3RVpnZFFjeDdDSmY1TkxiZm9PaE9HZWVabkluUytvMS82SlJWbDE3MXZCWkVFeQpOL3hDeXRPdEFiOXRXUGNIVGJJa0pqWkM2WFp5L2daRlNORDlpUE5wQW9JQkFFQXNoeEVhRHRueGpualdVSHZJCmJ2WVl5SDhzVnFwZkd4RHpGVm1RdE1LZ1Rva1BucWxLbjd2RHFYTy96akZubWkyMHVTOXA3SFpiT0tQQWUzWTAKeEQ2alBGd1FiQjJQeU43U2licC8xU3BxTXRIR2hYUjVGSE1sMUxSQjdXNWxjWlJBc2EvbEVMV2xzM3NkRDI4VwpXd0RBdlVXUnVRb0dhMEFJTGVyNlNWb2VNV01OMzdORWxtSCtlVUNtOUg1ZW1lNzNBVmdhaTVvVXVUTzdCVXk5CkxRT2RNUnIreE1ja3pMdWQyR1Z4YUFhT0t0WDA4OXcxOU1zeXFOanlCQVJzeFp5dU94VTRSSTIvcmovV2NGZnoKVU1ENDNKVVdSUExrSTdHNG9HWlpGaVpadlpmbGNrUTF2b2dRN3RwTFd3UkdZMlY4MS9xb3JQTDcwdTd5bU4xcQpyVUVDZ2dFQVNvVnZucXpkZktXcGRuYk9ZOER0bWd3TW5FQ1VueXBqSDdJOTJubEwxdzN2QnV3blNMSVRtdmFCCkMyTjF2amJQNUhpSHJQMlBySVJhTFlNR05GZ2pUaXNGTmlkUWdydU5RWDhwMWJTYm9WZHpOc2l5RnYyZHQrbWgKYXcrdm5jaWk1Zm9XQ1Awc3JNWUNyTE9IQ0RMTzdQdExOZ0pBUk9ZQ2hHRDg2TWFWS244MmJnL2RzOGRKbW95SAptK2NhMDk3VE1ucElRcFNuU3VnUkttb1hxNHpWNEQxZnJza2NyVXlhZC9USGtwclJmaG55Q1o5UXA3ZXlCY1hJCnNNRkxDTjJqRVBQY3o4MFdZVHFyV1NDU253UHUrNHZmV0tiR1NSb1JKaXh3SjFCVjRIb2lGMTRBQ29tR0FRWVUKc0kvUlBDR1pUL3B6UmkwQzZnc21jaDlROU5UVHBnPT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= + --- -apiVersion: v1 -kind: ConfigMap +apiVersion: opentelemetry.io/v1beta1 +kind: OpenTelemetryCollector metadata: - name: opentelemetry-collector-configmap -data: - config: | + name: opentelemetry +spec: + volumeMounts: + - mountPath: /var/run/tls/receiver/ca + name: custom-ca + readOnly: true + - mountPath: /var/run/tls/receiver/cert + name: opentelemetry-collector-cert + readOnly: true + volumes: + - configMap: + defaultMode: 420 + name: custom-ca + name: custom-ca + - name: opentelemetry-collector-cert + secret: + defaultMode: 420 + secretName: opentelemetry-collector-cert + config: exporters: - logging: {} + debug: {} otlp: endpoint: tempo-simplest:4317 tls: @@ -29,68 +46,5 @@ data: service: pipelines: traces: - exporters: [otlp] + exporters: [otlp,debug] receivers: [otlp] ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: opentelemetry-collector -spec: - selector: - matchLabels: - name: otelcol - template: - metadata: - labels: - name: otelcol - spec: - containers: - - name: opentelemetry-collector - command: - - /otelcol-contrib - - --config=/conf/config.yaml - image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.107.0 - ports: - - name: otlp - containerPort: 4317 - protocol: TCP - volumeMounts: - - mountPath: /conf - name: opentelemetry-collector-configmap - - mountPath: /var/run/tls/receiver/ca - name: custom-ca - readOnly: true - - mountPath: /var/run/tls/receiver/cert - name: opentelemetry-collector-cert - readOnly: true - volumes: - - configMap: - defaultMode: 420 - name: custom-ca - name: custom-ca - - name: opentelemetry-collector-configmap - configMap: - name: opentelemetry-collector-configmap - items: - - key: config - path: config.yaml - - name: opentelemetry-collector-cert - secret: - defaultMode: 420 - secretName: opentelemetry-collector-cert ---- -apiVersion: v1 -kind: Service -metadata: - name: opentelemetry-collector -spec: - type: ClusterIP - ports: - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc - selector: - name: otelcol diff --git a/tests/e2e/monolithic-receivers-tls/02-assert.yaml b/tests/e2e/monolithic-receivers-tls/02-assert.yaml index 9bd742e33..8bd1306c3 100644 --- a/tests/e2e/monolithic-receivers-tls/02-assert.yaml +++ b/tests/e2e/monolithic-receivers-tls/02-assert.yaml @@ -2,18 +2,10 @@ apiVersion: apps/v1 kind: Deployment metadata: name: opentelemetry-collector - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector -spec: - selector: - matchLabels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector status: + availableReplicas: 1 readyReplicas: 1 + replicas: 1 --- apiVersion: v1 @@ -21,33 +13,18 @@ kind: Service metadata: name: opentelemetry-collector spec: - type: ClusterIP ports: - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc - - name: otlp-http - port: 4318 - targetPort: 4318 - protocol: TCP + - appProtocol: grpc + name: otlp-grpc-grpc + port: 4317 + protocol: TCP + targetPort: 4317 + - appProtocol: http + name: otlp-http-http + port: 4318 + protocol: TCP + targetPort: 4318 selector: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - ---- -apiVersion: v1 -kind: Pod -metadata: - labels: - app.kubernetes.io/instance: opentelemetry - app.kubernetes.io/name: otelcol - component: standalone-collector -status: - containerStatuses: - - name: opentelemetry-collector - ready: true - started: true - phase: Running + app.kubernetes.io/component: opentelemetry-collector + app.kubernetes.io/managed-by: opentelemetry-operator + app.kubernetes.io/part-of: opentelemetry diff --git a/tests/e2e/monolithic-receivers-tls/02-install-otel.yaml b/tests/e2e/monolithic-receivers-tls/02-install-otel.yaml index b339a6057..3533bf981 100644 --- a/tests/e2e/monolithic-receivers-tls/02-install-otel.yaml +++ b/tests/e2e/monolithic-receivers-tls/02-install-otel.yaml @@ -1,9 +1,18 @@ -apiVersion: v1 -kind: ConfigMap +apiVersion: opentelemetry.io/v1beta1 +kind: OpenTelemetryCollector metadata: - name: opentelemetry-collector-configmap -data: - config: | + name: opentelemetry +spec: + volumeMounts: + - mountPath: /var/run/tls/receiver/ca + name: custom-ca + readOnly: true + volumes: + - configMap: + defaultMode: 420 + name: custom-ca + name: custom-ca + config: exporters: otlp: endpoint: tempo-simplest:4317 @@ -18,10 +27,10 @@ data: receivers: otlp/grpc: protocols: - grpc: + grpc: {} otlp/http: protocols: - http: + http: {} extensions: health_check: endpoint: 0.0.0.0:13133 @@ -39,89 +48,3 @@ data: traces/http: receivers: [ otlp/http ] exporters: [ otlphttp ] ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: opentelemetry-collector - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector -spec: - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - template: - metadata: - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - spec: - containers: - - name: opentelemetry-collector - command: - - /otelcol-contrib - - --config=/conf/config.yaml - image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.98.0" - ports: - - name: otlp - containerPort: 4317 - protocol: TCP - - name: otlp-http - containerPort: 4318 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: 13133 - readinessProbe: - httpGet: - path: / - port: 13133 - resources: - limits: - memory: 200Mi - volumeMounts: - - mountPath: /conf - name: opentelemetry-collector-configmap - - mountPath: /var/run/tls/receiver/ca - name: custom-ca - readOnly: true - volumes: - - configMap: - defaultMode: 420 - name: custom-ca - name: custom-ca - - name: opentelemetry-collector-configmap - configMap: - name: opentelemetry-collector-configmap - items: - - key: config - path: config.yaml ---- -apiVersion: v1 -kind: Service -metadata: - name: opentelemetry-collector -spec: - type: ClusterIP - ports: - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc - - name: otlp-http - port: 4318 - targetPort: 4318 - protocol: TCP - selector: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector diff --git a/tests/e2e/receivers-mtls/02-assert.yaml b/tests/e2e/receivers-mtls/02-assert.yaml index b2adb6d89..fe2d4dd83 100644 --- a/tests/e2e/receivers-mtls/02-assert.yaml +++ b/tests/e2e/receivers-mtls/02-assert.yaml @@ -2,18 +2,10 @@ apiVersion: apps/v1 kind: Deployment metadata: name: opentelemetry-collector - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector -spec: - selector: - matchLabels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector status: + availableReplicas: 1 readyReplicas: 1 + replicas: 1 --- apiVersion: v1 @@ -21,16 +13,18 @@ kind: Service metadata: name: opentelemetry-collector spec: - type: ClusterIP ports: - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc + - appProtocol: grpc + name: otlp-grpc + port: 4317 + protocol: TCP + targetPort: 4317 + - appProtocol: http + name: otlp-http + port: 4318 + protocol: TCP + targetPort: 4318 selector: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - - + app.kubernetes.io/component: opentelemetry-collector + app.kubernetes.io/managed-by: opentelemetry-operator + app.kubernetes.io/part-of: opentelemetry diff --git a/tests/e2e/receivers-mtls/02-install-otel.yaml b/tests/e2e/receivers-mtls/02-install-otel.yaml index c1463573f..30ed55ed3 100644 --- a/tests/e2e/receivers-mtls/02-install-otel.yaml +++ b/tests/e2e/receivers-mtls/02-install-otel.yaml @@ -5,15 +5,32 @@ metadata: data: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVWRENDQXp5Z0F3SUJBZ0lVUE9WcllCNWlKdnhNaVRMQnk0ckd6T1AxZ2o4d0RRWUpLb1pJaHZjTkFRRUwKQlFBd1BERUxNQWtHQTFVRUJoTUNXRmd4RlRBVEJnTlZCQWNNREVSbFptRjFiSFFnUTJsMGVURVdNQlFHQTFVRQpDZ3dOYjJKelpYSjJZV0pwYkdsMGVUQWdGdzB5TXpFeE1ESXdNelEzTlRKYUdBOHlNRFV4TURNeE9UQXpORGMxCk1sb3dJakVnTUI0R0ExVUVBd3dYYjNCbGJuUmxiR1Z0WlhSeWVTMWpiMnhzWldOMGIzSXdnZ0lpTUEwR0NTcUcKU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzNieXhGNEkwSTVkeGcwbXhqdW9FcVFTNFNyRC9HNVFuMgozVnJqUkppMDEzK0NVU1djdFNuZDQvdEdvNHUyUEsxeTdiOTNHVHV5cE8xSWdlRksyYXM4cFNmTUFpWE1jU1dPCnFQQ29aTG83ZnRJY3NLTWk4OXI0T1kzZUF3Q0ZpeGVydWxyT3F4MEd2MGhTM29QaDlHSjVlSWx3UTV3TkQxSEsKbWxraHoxTkNJaGFTQWhJOEttek8yblZjeC9HZGtHL250NjJjUi85QVpaVktQN1drenMrRVJwUmduVTJsU3YrbAo5VHZCeG9VQzdYK0ZvL1Fjd0xYemNUaGlFaTJhd1V2MFNGWitNckxLa1JXRFFyUEhqMUFKdXhhU094TEN4dXVvClJHZTZSOEhrUHZvNENxMmFQb2xnSzJWM2FqcDlQT0pWTUVxUkQxeTFTY0FjZjNGNDZza0pLbjVtSFFnYjZzUUQKckxFcTF0ZTJlRWVBWUVOTnBOYisycFJ2bEdRRGQ4d2o5TW9LNXExQTYxMEE1cXBzSFFPZkEybE9pejRPd0ltRgpnQVFzc1hqc2NEUFdYM29vQkJZaXVvWnE3YzJsRHFERDhxN1BpY1NTTmFkRm80NTZabzBJVjNIeFN6WHQ1UlE5CnQ1Y0FzZWhmSC9ieUpSMFpudmRLWWgvbFczd01ISjhnYnJMYVBodUV6TUlZUnZOVTJoVnZWSzJScnV3OVNLaGkKSmZ0Q2tOK3dNTGh3c0pMMEM4VG92ekJ1cS83T1hiMEVsYjdabnhyU21QcnY5bjFaRm1DRnRPK0orZ2RXaGVLTAp1SXJ5aGJuVGlPZmxJUlRrcEVjWTlwNVBFM0tnbjNHRFdtS2t2NHE1bkcxSFJZQ0N3KzNjSnAxMDA3NFhNZTQwClNWbzlCN1BwM1FJREFRQUJvMll3WkRBaUJnTlZIUkVFR3pBWmdoZHZjR1Z1ZEdWc1pXMWxkSEo1TFdOdmJHeGwKWTNSdmNqQWRCZ05WSFE0RUZnUVVGYTBZUzBLRktCL01CSHduNlYyZ25HdS9laDB3SHdZRFZSMGpCQmd3Rm9BVQpzVU8ycFkxRTNacmZhSmZ0RnFXRDg5OWZmWWt3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUJsanc4M1FTMS9SCjMvRllad0puNkpseURIRlpaUWhwUnU1Z09ZM0pNN0k5SnFDQmpVVVpCSkVrTnIyNG41amlvT1ZhcUMyVk1XOEwKUnRYb0YxZjN4Q1lOa25vc1h6VWZxdEFhd0lFN3FWTURFaEtnblV4ZUJsaFozai85aHk2OEtoNnRqSnJQVGFCZgpMTVRUNGdubkdWTE5CeS92WjBkUGlqekdqOWhvdmwwYS9HYUdRM1RVelU3VGRaR1NPRXBqdjM1UTNmSXhQYU9GClRNd016dzVrSzZ5eHdFM3NXbGFrMUlpMDU5b0hzUGNVbFE0eWx4Q0thREpLSmFURUF3b0FtTCtrVXUyU1FaMkoKQXRVaVF3QStNVlhPM2dIbzJNaTVtUWNXRmwyQ1JMK0FXaGVaZDJTWFcrNWkvdjVBZlcyTitFRmIxZXFJT2JzVgp2SlhSZjV2d1RjVT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRZ0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1N3d2dna29BZ0VBQW9JQ0FRQzNieXhGNEkwSTVkeGcKMG14anVvRXFRUzRTckQvRzVRbjIzVnJqUkppMDEzK0NVU1djdFNuZDQvdEdvNHUyUEsxeTdiOTNHVHV5cE8xSQpnZUZLMmFzOHBTZk1BaVhNY1NXT3FQQ29aTG83ZnRJY3NLTWk4OXI0T1kzZUF3Q0ZpeGVydWxyT3F4MEd2MGhTCjNvUGg5R0o1ZUlsd1E1d05EMUhLbWxraHoxTkNJaGFTQWhJOEttek8yblZjeC9HZGtHL250NjJjUi85QVpaVksKUDdXa3pzK0VScFJnblUybFN2K2w5VHZCeG9VQzdYK0ZvL1Fjd0xYemNUaGlFaTJhd1V2MFNGWitNckxLa1JXRApRclBIajFBSnV4YVNPeExDeHV1b1JHZTZSOEhrUHZvNENxMmFQb2xnSzJWM2FqcDlQT0pWTUVxUkQxeTFTY0FjCmYzRjQ2c2tKS241bUhRZ2I2c1FEckxFcTF0ZTJlRWVBWUVOTnBOYisycFJ2bEdRRGQ4d2o5TW9LNXExQTYxMEEKNXFwc0hRT2ZBMmxPaXo0T3dJbUZnQVFzc1hqc2NEUFdYM29vQkJZaXVvWnE3YzJsRHFERDhxN1BpY1NTTmFkRgpvNDU2Wm8wSVYzSHhTelh0NVJROXQ1Y0FzZWhmSC9ieUpSMFpudmRLWWgvbFczd01ISjhnYnJMYVBodUV6TUlZClJ2TlUyaFZ2VksyUnJ1dzlTS2hpSmZ0Q2tOK3dNTGh3c0pMMEM4VG92ekJ1cS83T1hiMEVsYjdabnhyU21QcnYKOW4xWkZtQ0Z0TytKK2dkV2hlS0x1SXJ5aGJuVGlPZmxJUlRrcEVjWTlwNVBFM0tnbjNHRFdtS2t2NHE1bkcxSApSWUNDdyszY0pwMTAwNzRYTWU0MFNWbzlCN1BwM1FJREFRQUJBb0lDQUNEQ1FlM1l4RmNxZGNqMHkxYWtJQjBqCnRzNnU1RlRvNG5hcjRXZGxBTUNMRzhKeUszMW8vU2tiWmV5Zm1IdmJLajYwSnRWbU5Ec2JLU1Voek5KSlBVTi8KV3pRYnpoUk13S0JSbTJqM1ZDcjc0eG9za1hYVWh1NTltTkJsU05xUWxKR2Vua2o2Vmh5MlhId3dNTzFSYjZTeAoyaG1xZVZ2N3VHZXVXT3lvMGYybGlOSmFmRmN5WEd3MHAzRUNaQ3YzZDRTeVVOYndKSzJqZHAzajh0U1Qrb3RzCjcyS3h0UVFuK0sveXM5RlBXc0hER0ZzTmhMTDkxNEM2WDQ5a0g3RGJoRzBEM2k1N2IyS3R0bUhTcjdpYjUzZFYKYWhxRFlqNVd1QTg4NkNsa1YwUWoyeHZYREZuWGdVRWpmdU5zblRWd2doc2tuS3g3U2RzMmFKQ3VVZDErVUpoOApQQk9CUVdIelZSM0lHdjJ1R2FwbjFjRlhHWlJRNGZjRW1hOE81VXNNSFJDblZOcjFYejFHRDc0a0VyWFdHRlRFCjRpaU1mcUJMSjUwT3c0VHlzWVdJdlc4NjhPMjFtTGFlYzJqQnJDdEtiU2pEV3FSaDlpajNnU05XN004QVFLT2cKdVZvSTJOZ0h4QjJNd2EvUytlQlpiVVhtU0FGTmRTS0lSbXhHSUNlcGZxOXBvR1kwQ0c1ZWJHbkxzVlVSYnFpNApsRWNKVlpBaWhIS0hHdXNsZ21MRmduQ04yZVVRYkpSWEorNnFFMm1mWnA2dlZwZ0hpL3lRQkxGZDM4b2JwbnhQCm1aUCtCK21zdHB2elBabGpXN2FlREZhUnFZblJBbm1zdUR5Mmk1MmtHdVBqeGxObjI0T3UvTWpiaFJvRkt2Q1YKNlVwRkUrcE9hUnRZcmI1VzZ6d0JBb0lCQVFENnhZZWZOWkkvYnRKYnQzQ2YrbkhPcVVQSUN1OFhFZHFDMlA1eApxSzhqVjN0VzFKZ1RNaHQrTGRDZy9EMzR0b1pWTFFVZmVocUZudnhLckhpNExid1VDUG56WkU3aHIvS29IWE1oCm01OUQ5TWFHZDJRYWZXaW5XTE93SGRTQ2NxbjNjZnRZVnFqWVJFSXUybCtlK0VwUlRJSGwrdGlCcXhkakZ5bjIKSnZ6dlVuODk4MW9yS3JnYVAzdUJ6cmlrcDFhR2huamhxVHAvNHVOVGtuV0JhQTBUUTVVc3VTTnpHL0VIOWxkSgp0dk9mZ1p3bnVuTERYeEVJYVNxc1V5V0k4Z1lISUcwQ0h0TUpkTFd1T1Fqa2FIdWswbjd3a0p0eE1FWnZhOUF1Cm0rMDg0QXRIMi81NDBDVXRXcmdJZy9ycDVuZTVxOHh3MGNKK2p2T1hwQTlVdHpaOUFvSUJBUUM3UWp5RUE5QVYKa1Z6RjJPRUpZaEcxc0R2MnBhaXhWRWU0ZTM0L0tLYTNVWTdNWWp6aDlPQmVCcXp6bUVQL1BxOW0zYTFkbkNEUAoxQ0l0emtLZnZHWGE5eEVWZHgvY0Z5Mmo4NUpmRXNSZytPbWpiOFVacDkwanNqK0lXT1ZNazE4NFdFUkxBQ1cyCit1bDk1NU1sK1VoYTRReEE3ZkdOZnZISXhMMDRuV0FvYjVzNzgzbFQ0NStUcHdFSWNXazZiRXpLdC8yN1VCbzYKNzJHRnBkSWdKUW9CM3NPMkJISm5vUDA3eFVBY2FzVW9uY3BLTklreUZrNndOci9QSUdjWTRVblRlZjR1RVVxRAo4blZveHQvOE1vRE1aWEM3YzJsWE4zeEhkaTdIUW1ZTWR3djJUaVhnNlpLaEczeXU4ZWtYc0htVWN2ZFc0NWhlClFYZVppa2Qrb2Y3aEFvSUJBRW9RWlFua3JKa0hoaUdJZ0Q3L25QVklrTGhZWWwwUjdOT1FlelhlZUR1Yjd0V3EKWEcvdThLZkhxRUtqdlRuanpyRUJadTN4Qmp4SXhJTFpoWjRBQS9oMjNqdkFlSHUzbDVlSGV5V0Y3UGdKSjBrMwpvZDBoQlBQSUF1b1ZKVnFSdXhsV0ZNSDJkay9KZVRLVlZJQ0RISS8rWks4ajh5WDQvaU5LQ0I2blRUVHh6SnJqCmNOSW0vOURneHYyRHJJMFV6ejFVSWdla0Q1OE54ODQ3QjNGODViKzJ5aXczVWYwQlY2TGVZdEZtczNWOHRqNFYKbHllVXdGY1htSDdrMzhVZWxpRXN0b1ZWelVhUnJjY1RHVWs4Z3FnZmMxWmhuMGRDMXNxNXNQYlRIckpJQ1l6agpzTGpGNFBVUVFpSmh1STIwZjgvYXFicjRlTlVnSzFteUhzVUtoNUVDZ2dFQkFJN2U0SEVRdjZoVStlVnhyWENOClJGbk5GbEwrM1pBK2IySVB4cWpGaVQyQW1tVFI1d1cyNGFDYmswVmZ2VEYzVURnNWxkWkFFc0MrWnoxdmkyRjQKU25ZZjN3YnpsbmxEcmV6VEg3QXVEMnExUHYwVmY5b3RPd25MSzdJSnNSa1ZyNmE3b1k5ZmsyYmlWVmRjWWVhdApKVWxCUHlvaTRSTkY4WTl1bTdnZ1NvZFBiNjd6K25QSXphM0gwMy92bDR1ZHFaRlpnOXR3S0RNakJOTUZTeVovClcvMUZTeWtLaDRjTlMyaFkvS3N4d3k5VUJFMU5mQWVkQVhoc3JUZUl6MkFxTXp1SWJpZ1R4VGlhdW4yd2pxQksKbi81U3Z3b2w2ZzlESkMwWnZHTUhBL2txc3hPL1dDTWIwbVhkSk9vTlkveFJCdEgrVFR3YjlkcWtORzRQRkxGSApROEVDZ2dFQVBWbFc2M2pMT2d1Y2xFSzA0dm4wNWxtWlI5REk2QzAvWUpGWU9iWk1kUmcvU0JwdU9kSEc2VDNyCjJaZHJvbTVVUCtoQWd4YldaVUNwVlFpckpnRVBjc2dubFF2aWNRTkxtSCtKeTBJNVBxNnNzdmpRWE02L25BdnkKb2JDem9UY3RIK2xId2NSVG5WUWtLSGRoU3o0QmJHWmNrR3lBeXlTUlk1c1l3Q0w1czNwaTcwdHF2UWpvR0ZvVQpJd3F5RjFaTmZ6ZzRWWjZwOGtSUEk2QS9KdFcrNXh1WGlDNmVYT3ZCb0IvdlJ2M1lLTTZURTNCK0pkY00wRVYvCmx1cHhnN01jY21tK3ZRRjhuWFl5V0R6RUZlWG9vT1RuK1NBTjVseENIZHlJTTBaUElmNk1rODFTY2hLaWd1dEcKbjNqSGhvNVo4ZzloYTA2bUNTUFpkbkNTaVpBUEF3PT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= + --- -apiVersion: v1 -kind: ConfigMap +apiVersion: opentelemetry.io/v1beta1 +kind: OpenTelemetryCollector metadata: - name: opentelemetry-collector-configmap -data: - config: | + name: opentelemetry +spec: + volumeMounts: + - mountPath: /var/run/tls/receiver/ca + name: custom-ca + readOnly: true + - mountPath: /var/run/tls/receiver/cert + name: opentelemetry-collector-cert + readOnly: true + volumes: + - configMap: + defaultMode: 420 + name: custom-ca + name: custom-ca + - name: opentelemetry-collector-cert + secret: + defaultMode: 420 + secretName: opentelemetry-collector-cert + config: exporters: - logging: {} + debug: {} otlp: endpoint: tempo-simplest-distributor:4317 tls: @@ -37,94 +54,6 @@ data: traces: exporters: - otlp + - debug receivers: - otlp ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: opentelemetry-collector - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector -spec: - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - template: - metadata: - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - spec: - containers: - - name: opentelemetry-collector - command: - - /otelcol-contrib - - --config=/conf/config.yaml - image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.107.0" - ports: - - name: otlp - containerPort: 4317 - protocol: TCP - - name: otlp-http - containerPort: 4318 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: 13133 - readinessProbe: - httpGet: - path: / - port: 13133 - resources: - limits: - memory: 200Mi - volumeMounts: - - mountPath: /conf - name: opentelemetry-collector-configmap - - mountPath: /var/run/tls/receiver/ca - name: custom-ca - readOnly: true - - mountPath: /var/run/tls/receiver/cert - name: opentelemetry-collector-cert - readOnly: true - volumes: - - configMap: - defaultMode: 420 - name: custom-ca - name: custom-ca - - name: opentelemetry-collector-configmap - configMap: - name: opentelemetry-collector-configmap - items: - - key: config - path: config.yaml - - name: opentelemetry-collector-cert - secret: - defaultMode: 420 - secretName: opentelemetry-collector-cert ---- -apiVersion: v1 -kind: Service -metadata: - name: opentelemetry-collector -spec: - type: ClusterIP - ports: - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc - selector: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector diff --git a/tests/e2e/receivers-tls/02-assert.yaml b/tests/e2e/receivers-tls/02-assert.yaml index 21fd9dd47..fe2d4dd83 100644 --- a/tests/e2e/receivers-tls/02-assert.yaml +++ b/tests/e2e/receivers-tls/02-assert.yaml @@ -2,18 +2,10 @@ apiVersion: apps/v1 kind: Deployment metadata: name: opentelemetry-collector - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector -spec: - selector: - matchLabels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector status: + availableReplicas: 1 readyReplicas: 1 + replicas: 1 --- apiVersion: v1 @@ -21,14 +13,18 @@ kind: Service metadata: name: opentelemetry-collector spec: - type: ClusterIP ports: - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc + - appProtocol: grpc + name: otlp-grpc + port: 4317 + protocol: TCP + targetPort: 4317 + - appProtocol: http + name: otlp-http + port: 4318 + protocol: TCP + targetPort: 4318 selector: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector + app.kubernetes.io/component: opentelemetry-collector + app.kubernetes.io/managed-by: opentelemetry-operator + app.kubernetes.io/part-of: opentelemetry diff --git a/tests/e2e/receivers-tls/02-install-otel.yaml b/tests/e2e/receivers-tls/02-install-otel.yaml index e24880e7b..55b431b7e 100644 --- a/tests/e2e/receivers-tls/02-install-otel.yaml +++ b/tests/e2e/receivers-tls/02-install-otel.yaml @@ -5,15 +5,32 @@ metadata: data: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVWRENDQXp5Z0F3SUJBZ0lVUE9WcllCNWlKdnhNaVRMQnk0ckd6T1AxZ2o4d0RRWUpLb1pJaHZjTkFRRUwKQlFBd1BERUxNQWtHQTFVRUJoTUNXRmd4RlRBVEJnTlZCQWNNREVSbFptRjFiSFFnUTJsMGVURVdNQlFHQTFVRQpDZ3dOYjJKelpYSjJZV0pwYkdsMGVUQWdGdzB5TXpFeE1ESXdNelEzTlRKYUdBOHlNRFV4TURNeE9UQXpORGMxCk1sb3dJakVnTUI0R0ExVUVBd3dYYjNCbGJuUmxiR1Z0WlhSeWVTMWpiMnhzWldOMGIzSXdnZ0lpTUEwR0NTcUcKU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzNieXhGNEkwSTVkeGcwbXhqdW9FcVFTNFNyRC9HNVFuMgozVnJqUkppMDEzK0NVU1djdFNuZDQvdEdvNHUyUEsxeTdiOTNHVHV5cE8xSWdlRksyYXM4cFNmTUFpWE1jU1dPCnFQQ29aTG83ZnRJY3NLTWk4OXI0T1kzZUF3Q0ZpeGVydWxyT3F4MEd2MGhTM29QaDlHSjVlSWx3UTV3TkQxSEsKbWxraHoxTkNJaGFTQWhJOEttek8yblZjeC9HZGtHL250NjJjUi85QVpaVktQN1drenMrRVJwUmduVTJsU3YrbAo5VHZCeG9VQzdYK0ZvL1Fjd0xYemNUaGlFaTJhd1V2MFNGWitNckxLa1JXRFFyUEhqMUFKdXhhU094TEN4dXVvClJHZTZSOEhrUHZvNENxMmFQb2xnSzJWM2FqcDlQT0pWTUVxUkQxeTFTY0FjZjNGNDZza0pLbjVtSFFnYjZzUUQKckxFcTF0ZTJlRWVBWUVOTnBOYisycFJ2bEdRRGQ4d2o5TW9LNXExQTYxMEE1cXBzSFFPZkEybE9pejRPd0ltRgpnQVFzc1hqc2NEUFdYM29vQkJZaXVvWnE3YzJsRHFERDhxN1BpY1NTTmFkRm80NTZabzBJVjNIeFN6WHQ1UlE5CnQ1Y0FzZWhmSC9ieUpSMFpudmRLWWgvbFczd01ISjhnYnJMYVBodUV6TUlZUnZOVTJoVnZWSzJScnV3OVNLaGkKSmZ0Q2tOK3dNTGh3c0pMMEM4VG92ekJ1cS83T1hiMEVsYjdabnhyU21QcnY5bjFaRm1DRnRPK0orZ2RXaGVLTAp1SXJ5aGJuVGlPZmxJUlRrcEVjWTlwNVBFM0tnbjNHRFdtS2t2NHE1bkcxSFJZQ0N3KzNjSnAxMDA3NFhNZTQwClNWbzlCN1BwM1FJREFRQUJvMll3WkRBaUJnTlZIUkVFR3pBWmdoZHZjR1Z1ZEdWc1pXMWxkSEo1TFdOdmJHeGwKWTNSdmNqQWRCZ05WSFE0RUZnUVVGYTBZUzBLRktCL01CSHduNlYyZ25HdS9laDB3SHdZRFZSMGpCQmd3Rm9BVQpzVU8ycFkxRTNacmZhSmZ0RnFXRDg5OWZmWWt3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUJsanc4M1FTMS9SCjMvRllad0puNkpseURIRlpaUWhwUnU1Z09ZM0pNN0k5SnFDQmpVVVpCSkVrTnIyNG41amlvT1ZhcUMyVk1XOEwKUnRYb0YxZjN4Q1lOa25vc1h6VWZxdEFhd0lFN3FWTURFaEtnblV4ZUJsaFozai85aHk2OEtoNnRqSnJQVGFCZgpMTVRUNGdubkdWTE5CeS92WjBkUGlqekdqOWhvdmwwYS9HYUdRM1RVelU3VGRaR1NPRXBqdjM1UTNmSXhQYU9GClRNd016dzVrSzZ5eHdFM3NXbGFrMUlpMDU5b0hzUGNVbFE0eWx4Q0thREpLSmFURUF3b0FtTCtrVXUyU1FaMkoKQXRVaVF3QStNVlhPM2dIbzJNaTVtUWNXRmwyQ1JMK0FXaGVaZDJTWFcrNWkvdjVBZlcyTitFRmIxZXFJT2JzVgp2SlhSZjV2d1RjVT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRZ0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1N3d2dna29BZ0VBQW9JQ0FRQzNieXhGNEkwSTVkeGcKMG14anVvRXFRUzRTckQvRzVRbjIzVnJqUkppMDEzK0NVU1djdFNuZDQvdEdvNHUyUEsxeTdiOTNHVHV5cE8xSQpnZUZLMmFzOHBTZk1BaVhNY1NXT3FQQ29aTG83ZnRJY3NLTWk4OXI0T1kzZUF3Q0ZpeGVydWxyT3F4MEd2MGhTCjNvUGg5R0o1ZUlsd1E1d05EMUhLbWxraHoxTkNJaGFTQWhJOEttek8yblZjeC9HZGtHL250NjJjUi85QVpaVksKUDdXa3pzK0VScFJnblUybFN2K2w5VHZCeG9VQzdYK0ZvL1Fjd0xYemNUaGlFaTJhd1V2MFNGWitNckxLa1JXRApRclBIajFBSnV4YVNPeExDeHV1b1JHZTZSOEhrUHZvNENxMmFQb2xnSzJWM2FqcDlQT0pWTUVxUkQxeTFTY0FjCmYzRjQ2c2tKS241bUhRZ2I2c1FEckxFcTF0ZTJlRWVBWUVOTnBOYisycFJ2bEdRRGQ4d2o5TW9LNXExQTYxMEEKNXFwc0hRT2ZBMmxPaXo0T3dJbUZnQVFzc1hqc2NEUFdYM29vQkJZaXVvWnE3YzJsRHFERDhxN1BpY1NTTmFkRgpvNDU2Wm8wSVYzSHhTelh0NVJROXQ1Y0FzZWhmSC9ieUpSMFpudmRLWWgvbFczd01ISjhnYnJMYVBodUV6TUlZClJ2TlUyaFZ2VksyUnJ1dzlTS2hpSmZ0Q2tOK3dNTGh3c0pMMEM4VG92ekJ1cS83T1hiMEVsYjdabnhyU21QcnYKOW4xWkZtQ0Z0TytKK2dkV2hlS0x1SXJ5aGJuVGlPZmxJUlRrcEVjWTlwNVBFM0tnbjNHRFdtS2t2NHE1bkcxSApSWUNDdyszY0pwMTAwNzRYTWU0MFNWbzlCN1BwM1FJREFRQUJBb0lDQUNEQ1FlM1l4RmNxZGNqMHkxYWtJQjBqCnRzNnU1RlRvNG5hcjRXZGxBTUNMRzhKeUszMW8vU2tiWmV5Zm1IdmJLajYwSnRWbU5Ec2JLU1Voek5KSlBVTi8KV3pRYnpoUk13S0JSbTJqM1ZDcjc0eG9za1hYVWh1NTltTkJsU05xUWxKR2Vua2o2Vmh5MlhId3dNTzFSYjZTeAoyaG1xZVZ2N3VHZXVXT3lvMGYybGlOSmFmRmN5WEd3MHAzRUNaQ3YzZDRTeVVOYndKSzJqZHAzajh0U1Qrb3RzCjcyS3h0UVFuK0sveXM5RlBXc0hER0ZzTmhMTDkxNEM2WDQ5a0g3RGJoRzBEM2k1N2IyS3R0bUhTcjdpYjUzZFYKYWhxRFlqNVd1QTg4NkNsa1YwUWoyeHZYREZuWGdVRWpmdU5zblRWd2doc2tuS3g3U2RzMmFKQ3VVZDErVUpoOApQQk9CUVdIelZSM0lHdjJ1R2FwbjFjRlhHWlJRNGZjRW1hOE81VXNNSFJDblZOcjFYejFHRDc0a0VyWFdHRlRFCjRpaU1mcUJMSjUwT3c0VHlzWVdJdlc4NjhPMjFtTGFlYzJqQnJDdEtiU2pEV3FSaDlpajNnU05XN004QVFLT2cKdVZvSTJOZ0h4QjJNd2EvUytlQlpiVVhtU0FGTmRTS0lSbXhHSUNlcGZxOXBvR1kwQ0c1ZWJHbkxzVlVSYnFpNApsRWNKVlpBaWhIS0hHdXNsZ21MRmduQ04yZVVRYkpSWEorNnFFMm1mWnA2dlZwZ0hpL3lRQkxGZDM4b2JwbnhQCm1aUCtCK21zdHB2elBabGpXN2FlREZhUnFZblJBbm1zdUR5Mmk1MmtHdVBqeGxObjI0T3UvTWpiaFJvRkt2Q1YKNlVwRkUrcE9hUnRZcmI1VzZ6d0JBb0lCQVFENnhZZWZOWkkvYnRKYnQzQ2YrbkhPcVVQSUN1OFhFZHFDMlA1eApxSzhqVjN0VzFKZ1RNaHQrTGRDZy9EMzR0b1pWTFFVZmVocUZudnhLckhpNExid1VDUG56WkU3aHIvS29IWE1oCm01OUQ5TWFHZDJRYWZXaW5XTE93SGRTQ2NxbjNjZnRZVnFqWVJFSXUybCtlK0VwUlRJSGwrdGlCcXhkakZ5bjIKSnZ6dlVuODk4MW9yS3JnYVAzdUJ6cmlrcDFhR2huamhxVHAvNHVOVGtuV0JhQTBUUTVVc3VTTnpHL0VIOWxkSgp0dk9mZ1p3bnVuTERYeEVJYVNxc1V5V0k4Z1lISUcwQ0h0TUpkTFd1T1Fqa2FIdWswbjd3a0p0eE1FWnZhOUF1Cm0rMDg0QXRIMi81NDBDVXRXcmdJZy9ycDVuZTVxOHh3MGNKK2p2T1hwQTlVdHpaOUFvSUJBUUM3UWp5RUE5QVYKa1Z6RjJPRUpZaEcxc0R2MnBhaXhWRWU0ZTM0L0tLYTNVWTdNWWp6aDlPQmVCcXp6bUVQL1BxOW0zYTFkbkNEUAoxQ0l0emtLZnZHWGE5eEVWZHgvY0Z5Mmo4NUpmRXNSZytPbWpiOFVacDkwanNqK0lXT1ZNazE4NFdFUkxBQ1cyCit1bDk1NU1sK1VoYTRReEE3ZkdOZnZISXhMMDRuV0FvYjVzNzgzbFQ0NStUcHdFSWNXazZiRXpLdC8yN1VCbzYKNzJHRnBkSWdKUW9CM3NPMkJISm5vUDA3eFVBY2FzVW9uY3BLTklreUZrNndOci9QSUdjWTRVblRlZjR1RVVxRAo4blZveHQvOE1vRE1aWEM3YzJsWE4zeEhkaTdIUW1ZTWR3djJUaVhnNlpLaEczeXU4ZWtYc0htVWN2ZFc0NWhlClFYZVppa2Qrb2Y3aEFvSUJBRW9RWlFua3JKa0hoaUdJZ0Q3L25QVklrTGhZWWwwUjdOT1FlelhlZUR1Yjd0V3EKWEcvdThLZkhxRUtqdlRuanpyRUJadTN4Qmp4SXhJTFpoWjRBQS9oMjNqdkFlSHUzbDVlSGV5V0Y3UGdKSjBrMwpvZDBoQlBQSUF1b1ZKVnFSdXhsV0ZNSDJkay9KZVRLVlZJQ0RISS8rWks4ajh5WDQvaU5LQ0I2blRUVHh6SnJqCmNOSW0vOURneHYyRHJJMFV6ejFVSWdla0Q1OE54ODQ3QjNGODViKzJ5aXczVWYwQlY2TGVZdEZtczNWOHRqNFYKbHllVXdGY1htSDdrMzhVZWxpRXN0b1ZWelVhUnJjY1RHVWs4Z3FnZmMxWmhuMGRDMXNxNXNQYlRIckpJQ1l6agpzTGpGNFBVUVFpSmh1STIwZjgvYXFicjRlTlVnSzFteUhzVUtoNUVDZ2dFQkFJN2U0SEVRdjZoVStlVnhyWENOClJGbk5GbEwrM1pBK2IySVB4cWpGaVQyQW1tVFI1d1cyNGFDYmswVmZ2VEYzVURnNWxkWkFFc0MrWnoxdmkyRjQKU25ZZjN3YnpsbmxEcmV6VEg3QXVEMnExUHYwVmY5b3RPd25MSzdJSnNSa1ZyNmE3b1k5ZmsyYmlWVmRjWWVhdApKVWxCUHlvaTRSTkY4WTl1bTdnZ1NvZFBiNjd6K25QSXphM0gwMy92bDR1ZHFaRlpnOXR3S0RNakJOTUZTeVovClcvMUZTeWtLaDRjTlMyaFkvS3N4d3k5VUJFMU5mQWVkQVhoc3JUZUl6MkFxTXp1SWJpZ1R4VGlhdW4yd2pxQksKbi81U3Z3b2w2ZzlESkMwWnZHTUhBL2txc3hPL1dDTWIwbVhkSk9vTlkveFJCdEgrVFR3YjlkcWtORzRQRkxGSApROEVDZ2dFQVBWbFc2M2pMT2d1Y2xFSzA0dm4wNWxtWlI5REk2QzAvWUpGWU9iWk1kUmcvU0JwdU9kSEc2VDNyCjJaZHJvbTVVUCtoQWd4YldaVUNwVlFpckpnRVBjc2dubFF2aWNRTkxtSCtKeTBJNVBxNnNzdmpRWE02L25BdnkKb2JDem9UY3RIK2xId2NSVG5WUWtLSGRoU3o0QmJHWmNrR3lBeXlTUlk1c1l3Q0w1czNwaTcwdHF2UWpvR0ZvVQpJd3F5RjFaTmZ6ZzRWWjZwOGtSUEk2QS9KdFcrNXh1WGlDNmVYT3ZCb0IvdlJ2M1lLTTZURTNCK0pkY00wRVYvCmx1cHhnN01jY21tK3ZRRjhuWFl5V0R6RUZlWG9vT1RuK1NBTjVseENIZHlJTTBaUElmNk1rODFTY2hLaWd1dEcKbjNqSGhvNVo4ZzloYTA2bUNTUFpkbkNTaVpBUEF3PT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= + --- -apiVersion: v1 -kind: ConfigMap +apiVersion: opentelemetry.io/v1beta1 +kind: OpenTelemetryCollector metadata: - name: opentelemetry-collector-configmap -data: - config: | + name: opentelemetry +spec: + volumeMounts: + - mountPath: /var/run/tls/receiver/ca + name: custom-ca + readOnly: true + - mountPath: /var/run/tls/receiver/cert + name: opentelemetry-collector-cert + readOnly: true + volumes: + - configMap: + defaultMode: 420 + name: custom-ca + name: custom-ca + - name: opentelemetry-collector-cert + secret: + defaultMode: 420 + secretName: opentelemetry-collector-cert + config: exporters: - logging: {} + debug: {} otlp: endpoint: tempo-simplest-distributor:4317 tls: @@ -35,94 +52,6 @@ data: traces: exporters: - otlp + - debug receivers: - otlp ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: opentelemetry-collector - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector -spec: - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - template: - metadata: - labels: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector - spec: - containers: - - name: opentelemetry-collector - command: - - /otelcol-contrib - - --config=/conf/config.yaml - image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.107.0" - ports: - - name: otlp - containerPort: 4317 - protocol: TCP - - name: otlp-http - containerPort: 4318 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: 13133 - readinessProbe: - httpGet: - path: / - port: 13133 - resources: - limits: - memory: 200Mi - volumeMounts: - - mountPath: /conf - name: opentelemetry-collector-configmap - - mountPath: /var/run/tls/receiver/ca - name: custom-ca - readOnly: true - - mountPath: /var/run/tls/receiver/cert - name: opentelemetry-collector-cert - readOnly: true - volumes: - - configMap: - defaultMode: 420 - name: custom-ca - name: custom-ca - - name: opentelemetry-collector-configmap - configMap: - name: opentelemetry-collector-configmap - items: - - key: config - path: config.yaml - - name: opentelemetry-collector-cert - secret: - defaultMode: 420 - secretName: opentelemetry-collector-cert ---- -apiVersion: v1 -kind: Service -metadata: - name: opentelemetry-collector -spec: - type: ClusterIP - ports: - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc - selector: - app.kubernetes.io/name: otelcol - app.kubernetes.io/instance: opentelemetry - component: standalone-collector