From 40097ca78fac0b9745abffb907de70b423a45474 Mon Sep 17 00:00:00 2001 From: Alejandro Acevedo Date: Wed, 30 Oct 2024 13:37:31 +0100 Subject: [PATCH] Add extra examples when using the image.registry and global.imageRegistry --- .../rendered/configmap.yaml | 86 +++++++++++++++ .../rendered/deployment.yaml | 100 ++++++++++++++++++ .../rendered/service.yaml | 49 +++++++++ .../rendered/serviceaccount.yaml | 13 +++ .../values.yaml | 18 ++++ .../rendered/configmap.yaml | 86 +++++++++++++++ .../rendered/deployment.yaml | 100 ++++++++++++++++++ .../rendered/service.yaml | 49 +++++++++ .../rendered/serviceaccount.yaml | 13 +++ .../deployment-image-registry/values.yaml | 15 +++ 10 files changed, 529 insertions(+) create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml new file mode 100644 index 000000000..b7f158522 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml @@ -0,0 +1,86 @@ +--- +# Source: opentelemetry-collector/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +data: + relay: | + exporters: + debug: {} + extensions: + health_check: + endpoint: ${env:MY_POD_IP}:13133 + processors: + batch: {} + memory_limiter: + check_interval: 5s + limit_percentage: 80 + spike_limit_percentage: 25 + receivers: + jaeger: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:14250 + thrift_compact: + endpoint: ${env:MY_POD_IP}:6831 + thrift_http: + endpoint: ${env:MY_POD_IP}:14268 + otlp: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:4317 + http: + endpoint: ${env:MY_POD_IP}:4318 + prometheus: + config: + scrape_configs: + - job_name: opentelemetry-collector + scrape_interval: 10s + static_configs: + - targets: + - ${env:MY_POD_IP}:8888 + zipkin: + endpoint: ${env:MY_POD_IP}:9411 + service: + extensions: + - health_check + pipelines: + logs: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + metrics: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + - prometheus + traces: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + - jaeger + - zipkin + telemetry: + metrics: + address: ${env:MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml new file mode 100644 index 000000000..50b383121 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml @@ -0,0 +1,100 @@ +--- +# Source: opentelemetry-collector/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +spec: + replicas: 3 + revisionHistoryLimit: 10 + selector: + matchLabels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + strategy: + type: RollingUpdate + template: + metadata: + annotations: + checksum/config: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 + + labels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + + spec: + + serviceAccountName: example-opentelemetry-collector + securityContext: + {} + containers: + - name: opentelemetry-collector + command: + - /otelcol-k8s + args: + - --config=/conf/relay.yaml + securityContext: + {} + image: "custom.io/otel/opentelemetry-collector-k8s:0.111.0" + imagePullPolicy: IfNotPresent + ports: + + - name: jaeger-compact + containerPort: 6831 + protocol: UDP + - name: jaeger-grpc + containerPort: 14250 + protocol: TCP + - name: jaeger-thrift + containerPort: 14268 + protocol: TCP + - name: otlp + containerPort: 4317 + protocol: TCP + - name: otlp-http + containerPort: 4318 + protocol: TCP + - name: zipkin + containerPort: 9411 + protocol: TCP + env: + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + - name: GOMEMLIMIT + value: "3276MiB" + livenessProbe: + httpGet: + path: / + port: 13133 + readinessProbe: + httpGet: + path: / + port: 13133 + resources: + limits: + cpu: 2 + memory: 4Gi + volumeMounts: + - mountPath: /conf + name: opentelemetry-collector-configmap + volumes: + - name: opentelemetry-collector-configmap + configMap: + name: example-opentelemetry-collector + items: + - key: relay + path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml new file mode 100644 index 000000000..754c3d02e --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml @@ -0,0 +1,49 @@ +--- +# Source: opentelemetry-collector/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + + component: standalone-collector +spec: + type: ClusterIP + ports: + + - name: jaeger-compact + port: 6831 + targetPort: 6831 + protocol: UDP + - name: jaeger-grpc + port: 14250 + targetPort: 14250 + protocol: TCP + - name: jaeger-thrift + port: 14268 + targetPort: 14268 + protocol: TCP + - name: otlp + port: 4317 + targetPort: 4317 + protocol: TCP + appProtocol: grpc + - name: otlp-http + port: 4318 + targetPort: 4318 + protocol: TCP + - name: zipkin + port: 9411 + targetPort: 9411 + protocol: TCP + selector: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml new file mode 100644 index 000000000..2bf47143b --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: opentelemetry-collector/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml new file mode 100644 index 000000000..b0822aac8 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml @@ -0,0 +1,18 @@ +mode: deployment + +global: + imageRegistry: "custom.io" + +image: + registry: "quay.io" + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + +replicaCount: 3 + +resources: + limits: + cpu: 2 + memory: 4Gi diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml new file mode 100644 index 000000000..b7f158522 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml @@ -0,0 +1,86 @@ +--- +# Source: opentelemetry-collector/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +data: + relay: | + exporters: + debug: {} + extensions: + health_check: + endpoint: ${env:MY_POD_IP}:13133 + processors: + batch: {} + memory_limiter: + check_interval: 5s + limit_percentage: 80 + spike_limit_percentage: 25 + receivers: + jaeger: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:14250 + thrift_compact: + endpoint: ${env:MY_POD_IP}:6831 + thrift_http: + endpoint: ${env:MY_POD_IP}:14268 + otlp: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:4317 + http: + endpoint: ${env:MY_POD_IP}:4318 + prometheus: + config: + scrape_configs: + - job_name: opentelemetry-collector + scrape_interval: 10s + static_configs: + - targets: + - ${env:MY_POD_IP}:8888 + zipkin: + endpoint: ${env:MY_POD_IP}:9411 + service: + extensions: + - health_check + pipelines: + logs: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + metrics: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + - prometheus + traces: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + - jaeger + - zipkin + telemetry: + metrics: + address: ${env:MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml new file mode 100644 index 000000000..11d7c13ed --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml @@ -0,0 +1,100 @@ +--- +# Source: opentelemetry-collector/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +spec: + replicas: 3 + revisionHistoryLimit: 10 + selector: + matchLabels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + strategy: + type: RollingUpdate + template: + metadata: + annotations: + checksum/config: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 + + labels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + + spec: + + serviceAccountName: example-opentelemetry-collector + securityContext: + {} + containers: + - name: opentelemetry-collector + command: + - /otelcol-k8s + args: + - --config=/conf/relay.yaml + securityContext: + {} + image: "quay.io/otel/opentelemetry-collector-k8s:0.111.0" + imagePullPolicy: IfNotPresent + ports: + + - name: jaeger-compact + containerPort: 6831 + protocol: UDP + - name: jaeger-grpc + containerPort: 14250 + protocol: TCP + - name: jaeger-thrift + containerPort: 14268 + protocol: TCP + - name: otlp + containerPort: 4317 + protocol: TCP + - name: otlp-http + containerPort: 4318 + protocol: TCP + - name: zipkin + containerPort: 9411 + protocol: TCP + env: + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + - name: GOMEMLIMIT + value: "3276MiB" + livenessProbe: + httpGet: + path: / + port: 13133 + readinessProbe: + httpGet: + path: / + port: 13133 + resources: + limits: + cpu: 2 + memory: 4Gi + volumeMounts: + - mountPath: /conf + name: opentelemetry-collector-configmap + volumes: + - name: opentelemetry-collector-configmap + configMap: + name: example-opentelemetry-collector + items: + - key: relay + path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml new file mode 100644 index 000000000..754c3d02e --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml @@ -0,0 +1,49 @@ +--- +# Source: opentelemetry-collector/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + + component: standalone-collector +spec: + type: ClusterIP + ports: + + - name: jaeger-compact + port: 6831 + targetPort: 6831 + protocol: UDP + - name: jaeger-grpc + port: 14250 + targetPort: 14250 + protocol: TCP + - name: jaeger-thrift + port: 14268 + targetPort: 14268 + protocol: TCP + - name: otlp + port: 4317 + targetPort: 4317 + protocol: TCP + appProtocol: grpc + - name: otlp-http + port: 4318 + targetPort: 4318 + protocol: TCP + - name: zipkin + port: 9411 + targetPort: 9411 + protocol: TCP + selector: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml new file mode 100644 index 000000000..2bf47143b --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: opentelemetry-collector/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml new file mode 100644 index 000000000..c3654ed21 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml @@ -0,0 +1,15 @@ +mode: deployment + +image: + registry: "quay.io" + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + +replicaCount: 3 + +resources: + limits: + cpu: 2 + memory: 4Gi