From 5c5afb52d8d0d9b586b6f5278ca84056dcedcfdd Mon Sep 17 00:00:00 2001 From: Hisar Balik Date: Thu, 22 Feb 2024 16:54:36 +0100 Subject: [PATCH] feat: Rename telemetry-operator to telemetry-manager (#811) Co-authored-by: Nina Hingerl <76950046+NHingerl@users.noreply.github.com> --- .github/template/finalize-test/action.yaml | 4 ++-- .github/template/prepare-test/action.yaml | 6 +++--- .github/workflows/pr-lifecycle.yml | 9 +++++++-- Makefile | 2 +- README.md | 2 +- config/default/kustomization.yaml | 6 +++--- config/development/kustomization.yaml | 6 +++--- config/manager/manager.yaml | 12 ++++++------ config/manager/metrics_service.yaml | 6 +++--- config/networking/networkpolicy.yaml | 6 +++--- config/rbac/auth_proxy_role_binding.yaml | 2 +- config/rbac/auth_proxy_service.yaml | 6 +++--- config/rbac/leader_election_role.yaml | 2 +- config/rbac/leader_election_role_binding.yaml | 6 +++--- config/rbac/role.yaml | 4 ++-- config/rbac/role_binding.yaml | 12 ++++++------ config/rbac/service_account.yaml | 2 +- config/samples/operator_v1alpha1_telemetry.yaml | 4 ++-- .../telemetry_v1alpha1_metricpipeline.yaml | 4 ++-- config/webhook/manifests.yaml | 4 ++-- config/webhook/service.yaml | 6 +++--- ...-prometheus-part of-the-istio-service-mesh.md | 2 +- ...heus-with-telemetry-manager-using-alerting.md | 16 ++++++++-------- .../pocs/performance-tests/metrics/metrics.md | 4 ++-- docs/contributor/troubleshooting.md | 4 ++-- docs/user/assets/logs-resources.drawio.svg | 4 ++-- docs/user/assets/manager-lifecycle.drawio.svg | 2 +- docs/user/assets/metrics-resources.drawio.svg | 2 +- docs/user/assets/traces-resources.drawio.svg | 4 ++-- internal/reconciler/telemetry/reconciler.go | 2 +- internal/webhookcert/webhook_cert.go | 4 ++-- internal/webhookcert/webhook_cert_test.go | 6 +++--- main.go | 2 +- test/e2e/assets/tracing-tests.svg | 2 +- test/e2e/manager_test.go | 8 ++++---- test/e2e/overrides_test.go | 6 +++--- test/e2e/telemetry_test.go | 4 ++-- test/testkit/kyma/common_names.go | 2 +- 38 files changed, 95 insertions(+), 90 deletions(-) diff --git a/.github/template/finalize-test/action.yaml b/.github/template/finalize-test/action.yaml index 23fe31988..d71626c2d 100644 --- a/.github/template/finalize-test/action.yaml +++ b/.github/template/finalize-test/action.yaml @@ -15,13 +15,13 @@ runs: shell: bash if: ${{ inputs.failure }} run: | - kubectl -n kyma-system describe pod -l "app.kubernetes.io/instance=telemetry, app.kubernetes.io/name=operator" + kubectl -n kyma-system describe pod -l "app.kubernetes.io/instance=telemetry, app.kubernetes.io/name=manager" - name: Print manager logs shell: bash if: ${{ inputs.failure }} run: | - kubectl -n kyma-system logs -l "app.kubernetes.io/instance=telemetry, app.kubernetes.io/name=operator" + kubectl -n kyma-system logs -l "app.kubernetes.io/instance=telemetry, app.kubernetes.io/name=manager" - name: List Namespaces shell: bash diff --git a/.github/template/prepare-test/action.yaml b/.github/template/prepare-test/action.yaml index 7a969de42..93e9b4f98 100644 --- a/.github/template/prepare-test/action.yaml +++ b/.github/template/prepare-test/action.yaml @@ -3,7 +3,7 @@ description: Prepares everything for integration test execution inputs: release: - description: Deploy operator in release mode + description: Deploy manager in release mode required: false github-token: description: Github token to use for github access @@ -45,9 +45,9 @@ runs: shell: bash run: make deploy-dev - - name: Wait for operator readiness + - name: Wait for manager readiness shell: bash - run: kubectl -n kyma-system rollout status deployment telemetry-operator --timeout=90s + run: kubectl -n kyma-system rollout status deployment telemetry-manager --timeout=90s - name: Print cluster info shell: bash diff --git a/.github/workflows/pr-lifecycle.yml b/.github/workflows/pr-lifecycle.yml index d183a4d50..025f86f9b 100644 --- a/.github/workflows/pr-lifecycle.yml +++ b/.github/workflows/pr-lifecycle.yml @@ -65,14 +65,19 @@ jobs: GITHUB_OWNER: "${{ github.repository_owner }}" GITHUB_REPO: "telemetry-manager" + - name: Undeploy operator deployment + shell: bash + run: | + kubectl -n kyma-system scale deployment telemetry-operator --replicas 0 + - name: Deploy with current version shell: bash run: | IMG=europe-docker.pkg.dev/kyma-project/dev/telemetry-manager:PR-${{ github.event.number }} make deploy-dev - - name: Wait for operator readiness + - name: Wait for manager readiness shell: bash - run: kubectl -n kyma-system rollout status deployment telemetry-operator --timeout=90s + run: kubectl -n kyma-system rollout status deployment telemetry-manager --timeout=90s - name: Run test on current version shell: bash diff --git a/Makefile b/Makefile index a367d0448..a076f3ed9 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ crd-docs-gen: tablegen ## Generates CRD spec into docs folder .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=operator-manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases + $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases $(MAKE) crd-docs-gen .PHONY: generate diff --git a/README.md b/README.md index b66833bd3..f423ad347 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![REUSE status](https://api.reuse.software/badge/github.com/kyma-project/telemetry-manager)](https://api.reuse.software/info/github.com/kyma-project/telemetry-manager) -![GitHub tag checks state](https://img.shields.io/github/checks-status/kyma-project/telemetry-manager/main?label=telemetry-operator&link=https%3A%2F%2Fgithub.com%2Fkyma-project%2Ftelemetry-manager%2Fcommits%2Fmain) +![GitHub tag checks state](https://img.shields.io/github/checks-status/kyma-project/telemetry-manager/main?label=telemetry-manager&link=https%3A%2F%2Fgithub.com%2Fkyma-project%2Ftelemetry-manager%2Fcommits%2Fmain) ## Overview diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 5a47e6c77..7541fed7f 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -12,11 +12,11 @@ namePrefix: telemetry- labels: - includeSelectors: false pairs: - control-plane: telemetry-operator + control-plane: telemetry-manager app.kubernetes.io/component: telemetry app.kubernetes.io/part-of: kyma - app.kubernetes.io/name: telemetry-operator - app.kubernetes.io/instance: telemetry-operator + app.kubernetes.io/name: telemetry-manager + app.kubernetes.io/instance: telemetry-manager app.kubernetes.io/managed-by: kustomize resources: - ../crd diff --git a/config/development/kustomization.yaml b/config/development/kustomization.yaml index 02c52acac..7e1bed19c 100644 --- a/config/development/kustomization.yaml +++ b/config/development/kustomization.yaml @@ -12,11 +12,11 @@ namePrefix: telemetry- labels: - includeSelectors: false pairs: - control-plane: telemetry-operator + control-plane: telemetry-manager app.kubernetes.io/component: telemetry app.kubernetes.io/part-of: kyma - app.kubernetes.io/name: telemetry-operator - app.kubernetes.io/instance: telemetry-operator + app.kubernetes.io/name: telemetry-manager + app.kubernetes.io/instance: telemetry-manager app.kubernetes.io/managed-by: kustomize resources: diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 4f784745e..d9f27a85a 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -1,15 +1,15 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: operator + name: manager namespace: system spec: selector: matchLabels: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager replicas: 1 template: metadata: @@ -17,10 +17,10 @@ spec: sidecar.istio.io/inject: "false" kubectl.kubernetes.io/default-container: manager labels: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager spec: priorityClassName: "telemetry-priority-class" securityContext: @@ -71,5 +71,5 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - serviceAccountName: operator + serviceAccountName: manager terminationGracePeriodSeconds: 10 diff --git a/config/manager/metrics_service.yaml b/config/manager/metrics_service.yaml index 2c23484e0..aa48dc186 100644 --- a/config/manager/metrics_service.yaml +++ b/config/manager/metrics_service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: operator-metrics + name: manager-metrics annotations: prometheus.io/scrape: "true" prometheus.io/port: "8080" @@ -12,7 +12,7 @@ spec: port: 8080 targetPort: 8080 selector: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager diff --git a/config/networking/networkpolicy.yaml b/config/networking/networkpolicy.yaml index cfaadd924..38474ad8d 100644 --- a/config/networking/networkpolicy.yaml +++ b/config/networking/networkpolicy.yaml @@ -1,14 +1,14 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: operator + name: manager spec: podSelector: matchLabels: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager policyTypes: - Ingress - Egress diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml index 3963c8246..136c0b390 100644 --- a/config/rbac/auth_proxy_role_binding.yaml +++ b/config/rbac/auth_proxy_role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: proxy-role subjects: - kind: ServiceAccount - name: operator + name: manager namespace: system diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml index 126c8f458..60bc096b9 100644 --- a/config/rbac/auth_proxy_service.yaml +++ b/config/rbac/auth_proxy_service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: operator-metrics-secured + name: manager-metrics-secured namespace: system spec: ports: @@ -10,7 +10,7 @@ spec: protocol: TCP targetPort: https selector: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml index d9a6db055..ceb49bf7a 100644 --- a/config/rbac/leader_election_role.yaml +++ b/config/rbac/leader_election_role.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: operator-leader-election-role + name: manager-leader-election-role rules: - apiGroups: - "" diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index b521da213..fc87d4cb5 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -1,12 +1,12 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: operator-leader-election-rolebinding + name: manager-leader-election-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: telemetry-operator-leader-election-role + name: telemetry-manager-leader-election-role subjects: - kind: ServiceAccount - name: operator + name: manager namespace: system diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index f998aeb97..76dfbd07f 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: creationTimestamp: null - name: operator-manager-role + name: manager-role rules: - nonResourceURLs: - /metrics @@ -263,7 +263,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: creationTimestamp: null - name: operator-manager-role + name: manager-role namespace: system rules: - apiGroups: diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index f76ada491..b055517f3 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -1,25 +1,25 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: operator-manager-rolebinding + name: manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: telemetry-operator-manager-role + name: manager-role subjects: - kind: ServiceAccount - name: operator + name: manager namespace: system --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: operator-manager-rolebinding + name: manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: telemetry-operator-manager-role + name: manager-role subjects: - kind: ServiceAccount - name: operator + name: manager namespace: system diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml index 38423bc86..77f747b53 100644 --- a/config/rbac/service_account.yaml +++ b/config/rbac/service_account.yaml @@ -1,5 +1,5 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: operator + name: manager namespace: system diff --git a/config/samples/operator_v1alpha1_telemetry.yaml b/config/samples/operator_v1alpha1_telemetry.yaml index 74884e263..e48eb04fa 100644 --- a/config/samples/operator_v1alpha1_telemetry.yaml +++ b/config/samples/operator_v1alpha1_telemetry.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/name: telemetry app.kubernetes.io/instance: default - app.kubernetes.io/part-of: telemetry-operator + app.kubernetes.io/part-of: telemetry-manager app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: telemetry-operator + app.kubernetes.io/created-by: telemetry-manager name: default diff --git a/config/samples/telemetry_v1alpha1_metricpipeline.yaml b/config/samples/telemetry_v1alpha1_metricpipeline.yaml index d29071a72..6d5ce04e6 100644 --- a/config/samples/telemetry_v1alpha1_metricpipeline.yaml +++ b/config/samples/telemetry_v1alpha1_metricpipeline.yaml @@ -146,9 +146,9 @@ metadata: labels: app.kubernetes.io/name: metricpipeline app.kubernetes.io/instance: metricpipeline-sample - app.kubernetes.io/part-of: telemetry-operator + app.kubernetes.io/part-of: telemetry-manager app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: telemetry-operator + app.kubernetes.io/created-by: telemetry-manager name: metricpipeline-sample spec: input: diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 77926982b..c4534242c 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -10,7 +10,7 @@ webhooks: - v1 clientConfig: service: - name: telemetry-operator-webhook + name: telemetry-manager-webhook namespace: system path: /validate-logpipeline port: 443 @@ -37,7 +37,7 @@ webhooks: - v1 clientConfig: service: - name: telemetry-operator-webhook + name: telemetry-manager-webhook namespace: system path: /validate-logparser port: 443 diff --git a/config/webhook/service.yaml b/config/webhook/service.yaml index 7767781e8..32dbc5784 100644 --- a/config/webhook/service.yaml +++ b/config/webhook/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: operator-webhook + name: manager-webhook namespace: system spec: ports: @@ -10,7 +10,7 @@ spec: protocol: TCP targetPort: 9443 selector: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager diff --git a/docs/contributor/arch/005-do-not-make-prometheus-part of-the-istio-service-mesh.md b/docs/contributor/arch/005-do-not-make-prometheus-part of-the-istio-service-mesh.md index dc09a0041..f18566279 100644 --- a/docs/contributor/arch/005-do-not-make-prometheus-part of-the-istio-service-mesh.md +++ b/docs/contributor/arch/005-do-not-make-prometheus-part of-the-istio-service-mesh.md @@ -19,7 +19,7 @@ The Telemetry Manager, which queries metrics from Prometheus, is not part of the ## Problem When Prometheus is not part of the Istio service mesh, it will cause metrics data to be transported unencrypted. Thus, the metrics could be counterfeited. This would mean we get the wrong information about the possible issue with observability components. The side effects could be the following: - Customer gets wrongly notified because of false positives. - - Telemetry operator gets the wrong decision about the scaling, like scaling down when scaling up is needed, thus causing data loss + - Telemetry Manager gets the wrong decision about the scaling, like scaling down when scaling up is needed, thus causing data loss ## Argument - The network policy that enables Telemetry Manager to accept data from a desired IP address in the Kubernetes cluster reduces the attack vector. It also increases the attack complexity because the attacker would need access to the underlying node to perform the attack. diff --git a/docs/contributor/pocs/integrate-prometheus-with-telemetry-manager-using-alerting.md b/docs/contributor/pocs/integrate-prometheus-with-telemetry-manager-using-alerting.md index 5afd93585..4c3644b5b 100644 --- a/docs/contributor/pocs/integrate-prometheus-with-telemetry-manager-using-alerting.md +++ b/docs/contributor/pocs/integrate-prometheus-with-telemetry-manager-using-alerting.md @@ -24,7 +24,7 @@ Follow these steps to set up the required environment: alertmanagers: - static_configs: - targets: - - telemetry-operator-alerts-webhook.kyma-system:9090 + - telemetry-manager-alerts-webhook.kyma-system:9090 serverFiles: alerting_rules.yml: @@ -203,7 +203,7 @@ Follow these steps to set up the required environment: apiVersion: v1 kind: Service metadata: - name: operator-alerts-webhook + name: manager-alerts-webhook namespace: system spec: ports: @@ -211,24 +211,24 @@ Follow these steps to set up the required environment: port: 9090 targetPort: 9090 selector: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager ``` -8. Whitelist the endpoint port (9090) in the operator network policy: +8. Whitelist the endpoint port (9090) in the manager network policy: ```yaml apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: operator + name: manager spec: podSelector: matchLabels: - app.kubernetes.io/name: operator + app.kubernetes.io/name: manager app.kubernetes.io/instance: telemetry kyma-project.io/component: controller - control-plane: telemetry-operator + control-plane: telemetry-manager policyTypes: - Ingress ingress: diff --git a/docs/contributor/pocs/performance-tests/metrics/metrics.md b/docs/contributor/pocs/performance-tests/metrics/metrics.md index a6fdcd8c4..334895065 100644 --- a/docs/contributor/pocs/performance-tests/metrics/metrics.md +++ b/docs/contributor/pocs/performance-tests/metrics/metrics.md @@ -123,9 +123,9 @@ For the test environment, the following setup was used: labels: app.kubernetes.io/name: metricpipeline app.kubernetes.io/instance: metricpipeline-sample - app.kubernetes.io/part-of: telemetry-operator + app.kubernetes.io/part-of: telemetry-manager app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: telemetry-operator + app.kubernetes.io/created-by: telemetry-manager name: metricpipeline-sample spec: input: diff --git a/docs/contributor/troubleshooting.md b/docs/contributor/troubleshooting.md index ec084b7c8..c3f416367 100644 --- a/docs/contributor/troubleshooting.md +++ b/docs/contributor/troubleshooting.md @@ -4,13 +4,13 @@ You must pause reconciliations to be able to debug the pipelines or the Telemetry module. This is also useful to try out a different pipeline configuration or a different OTel configuration. To pause or unpause reconciliations, follow these steps: -1. Create an overriding `telemetry-override-config` ConfigMap in the operator's namespace. +1. Create an overriding `telemetry-override-config` ConfigMap in the manager's namespace. 2. Perform debugging operations. 3. Remove the created ConfigMap. 4. To reset the debug actions, perform a restart of Telemetry Manager. ```bash - kubectl rollout restart deployment telemetry-operator + kubectl rollout restart deployment telemetry-manager ``` Here is an example of such a ConfigMap: diff --git a/docs/user/assets/logs-resources.drawio.svg b/docs/user/assets/logs-resources.drawio.svg index 03cee017f..117c5929b 100644 --- a/docs/user/assets/logs-resources.drawio.svg +++ b/docs/user/assets/logs-resources.drawio.svg @@ -154,7 +154,7 @@
- telemetry-operator + telemetry-manager
Deployment @@ -164,7 +164,7 @@
- telemetry-operator... + telemetry-manager... diff --git a/docs/user/assets/manager-lifecycle.drawio.svg b/docs/user/assets/manager-lifecycle.drawio.svg index a592b76a1..a64bbff9d 100644 --- a/docs/user/assets/manager-lifecycle.drawio.svg +++ b/docs/user/assets/manager-lifecycle.drawio.svg @@ -1,4 +1,4 @@ -
Runtime                                                                                                                                




















Runtime...
manages lifecycle
manages lifecycle
manages lifecycle
manages lifecycle
watches
watches
watches
watches
<<Deployment>>
telemetry-operator
<<Deployment>>...
<<Pod>>
all
<<Pod>>...
discovers metadata
discovers metadata
<<Deployment>>
telemetry-trace-collector
<<Deployment>>...
watches status
watches status
Installer /
Control Plane
Installer /...
discovers metadata
discovers metadata
<<DaemonSet>>
telemetry-fluent-bit
<<DaemonSet>>...
<<TracePipeline>>
custom
<<TracePipeline>>...
<<Pod>>
x
<<Pod>>...
<<LogPipeline>>
custom
<<LogPipeline>>...
<<Service>>
telemetry-otlp-traces
<<Service>>...
<<Telemetry>>
default
<<Telemetry>>...
syncs status
syncs status
manages lifecycle
manages lifecycleText is not SVG - cannot display \ No newline at end of file +
Runtime                                                                                                                                




















Runtime...
manages lifecycle
manages lifecycle
manages lifecycle
manages lifecycle
watches
watches
watches
watches
<<Deployment>>
telemetry-manager
<<Deployment>>...
<<Pod>>
all
<<Pod>>...
discovers metadata
discovers metadata
<<Deployment>>
telemetry-trace-collector
<<Deployment>>...
watches status
watches status
Installer /
Control Plane
Installer /...
discovers metadata
discovers metadata
<<DaemonSet>>
telemetry-fluent-bit
<<DaemonSet>>...
<<TracePipeline>>
custom
<<TracePipeline>>...
<<Pod>>
x
<<Pod>>...
<<LogPipeline>>
custom
<<LogPipeline>>...
<<Service>>
telemetry-otlp-traces
<<Service>>...
<<Telemetry>>
default
<<Telemetry>>...
syncs status
syncs status
manages lifecycle
manages lifecycleText is not SVG - cannot display \ No newline at end of file diff --git a/docs/user/assets/metrics-resources.drawio.svg b/docs/user/assets/metrics-resources.drawio.svg index 573fc8d46..8b2912fce 100644 --- a/docs/user/assets/metrics-resources.drawio.svg +++ b/docs/user/assets/metrics-resources.drawio.svg @@ -1,4 +1,4 @@ -
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%26lt%3Bfont%20style%3D%26quot%3Bfont-size%3A%2015px%26quot%3B%26gt%3B%26lt%3Bb%26gt%3BKyma%20cluster%26lt%3B%2Fb%26gt%3B%26lt%3B%2Ffont%26gt%3B%22%20style%3D%22text%3Bhtml%3D1%3Balign%3Dcenter%3BverticalAlign%3Dmiddle%3Bresizable%3D0%3Bpoints%3D%5B%5D%3B%3Bautosize%3D1%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%22-181%22%20y%3D%22717%22%20width%3D%22110%22%20height%3D%2220%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20i...
LogPipeline
resource
LogPipeline...
Custom
MetricPipeline
Custom...
Secret
resource
Secret...
Custom
Secret
Custom...
Kyma Cluster
Kyma Cluster
User Namespace
User Namespace
telemetry-operator
Deployment
telemetry-operator...
telemetry-metric-gateway
Deployment
telemetry-metric-gatewayD...
telemetry-metric-gateway
ConfigMap
telemetry-metric-gateway...
telemetry-metric-gateway
Secret
telemetry-metric-gatewayS...
Kyma System Namespace
Kyma System Namespace
watches and
validates
watches and...
references
references
watches
watches
manages
manages
generates
generates
mounts
mounts
telemetry-metric-agent
DaemonSet
telemetry-metric-agentDae...
manages
manages
telemetry-metric-agent
ConfigMap
telemetry-metric-agent...
mounts
mountsText is not SVG - cannot display \ No newline at end of file +
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%26lt%3Bfont%20style%3D%26quot%3Bfont-size%3A%2015px%26quot%3B%26gt%3B%26lt%3Bb%26gt%3BKyma%20cluster%26lt%3B%2Fb%26gt%3B%26lt%3B%2Ffont%26gt%3B%22%20style%3D%22text%3Bhtml%3D1%3Balign%3Dcenter%3BverticalAlign%3Dmiddle%3Bresizable%3D0%3Bpoints%3D%5B%5D%3B%3Bautosize%3D1%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%22-181%22%20y%3D%22717%22%20width%3D%22110%22%20height%3D%2220%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20i...
LogPipeline
resource
LogPipeline...
Custom
MetricPipeline
Custom...
Secret
resource
Secret...
Custom
Secret
Custom...
Kyma Cluster
Kyma Cluster
User Namespace
User Namespace
telemetry-manager
Deployment
telemetry-manager...
telemetry-metric-gateway
Deployment
telemetry-metric-gatewayD...
telemetry-metric-gateway
ConfigMap
telemetry-metric-gateway...
telemetry-metric-gateway
Secret
telemetry-metric-gatewayS...
Kyma System Namespace
Kyma System Namespace
watches and
validates
watches and...
references
references
watches
watches
manages
manages
generates
generates
mounts
mounts
telemetry-metric-agent
DaemonSet
telemetry-metric-agentDae...
manages
manages
telemetry-metric-agent
ConfigMap
telemetry-metric-agent...
mounts
mountsText is not SVG - cannot display \ No newline at end of file diff --git a/docs/user/assets/traces-resources.drawio.svg b/docs/user/assets/traces-resources.drawio.svg index f7551e91f..72045cc54 100644 --- a/docs/user/assets/traces-resources.drawio.svg +++ b/docs/user/assets/traces-resources.drawio.svg @@ -154,7 +154,7 @@
- telemetry-operator + telemetry-manager
Deployment @@ -164,7 +164,7 @@
- telemetry-operator... + telemetry-manager... diff --git a/internal/reconciler/telemetry/reconciler.go b/internal/reconciler/telemetry/reconciler.go index c07804ad8..dd9ffdad2 100644 --- a/internal/reconciler/telemetry/reconciler.go +++ b/internal/reconciler/telemetry/reconciler.go @@ -196,7 +196,7 @@ func (r *Reconciler) reconcileWebhook(ctx context.Context, telemetry *operatorv1 func (r *Reconciler) cleanUpOldNetworkPolicies(ctx context.Context) error { oldNetworkPoliciesNames := []string{ - "telemetry-operator-pprof-deny-ingress", + "telemetry-manager-pprof-deny-ingress", "telemetry-metric-gateway-pprof-deny-ingress", "telemetry-metric-agent-pprof-deny-ingress", "telemetry-trace-collector-pprof-deny-ingress", diff --git a/internal/webhookcert/webhook_cert.go b/internal/webhookcert/webhook_cert.go index 0317281a8..4ab1347de 100644 --- a/internal/webhookcert/webhook_cert.go +++ b/internal/webhookcert/webhook_cert.go @@ -66,9 +66,9 @@ func makeValidatingWebhookConfig(certificate []byte, config Config) admissionreg servicePort := int32(443) timeout := int32(15) labels := map[string]string{ - "control-plane": "telemetry-operator", + "control-plane": "telemetry-manager", "app.kubernetes.io/instance": "telemetry", - "app.kubernetes.io/name": "operator", + "app.kubernetes.io/name": "manager", "kyma-project.io/component": "controller", } diff --git a/internal/webhookcert/webhook_cert_test.go b/internal/webhookcert/webhook_cert_test.go index b6d4cb13f..7d19e1fdd 100644 --- a/internal/webhookcert/webhook_cert_test.go +++ b/internal/webhookcert/webhook_cert_test.go @@ -17,7 +17,7 @@ import ( var ( telemetryNamespace = "telemetry-system" webhookService = types.NamespacedName{ - Name: "telemetry-operator-webhook", + Name: "telemetry-manager-webhook", Namespace: telemetryNamespace, } caBundleSecret = types.NamespacedName{ @@ -29,9 +29,9 @@ var ( Name: name, } labels = map[string]string{ - "control-plane": "telemetry-operator", + "control-plane": "telemetry-manager", "app.kubernetes.io/instance": "telemetry", - "app.kubernetes.io/name": "operator", + "app.kubernetes.io/name": "manager", "kyma-project.io/component": "controller", } ) diff --git a/main.go b/main.go index e65a25506..7ec88cded 100644 --- a/main.go +++ b/main.go @@ -132,7 +132,7 @@ const ( fluentBitExporterImage = "europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20240123-4f99d571" fluentBitDaemonSet = "telemetry-fluent-bit" - webhookServiceName = "telemetry-operator-webhook" + webhookServiceName = "telemetry-manager-webhook" metricOTLPServiceName = "telemetry-otlp-metrics" diff --git a/test/e2e/assets/tracing-tests.svg b/test/e2e/assets/tracing-tests.svg index 490bac16d..95e9a7c9a 100644 --- a/test/e2e/assets/tracing-tests.svg +++ b/test/e2e/assets/tracing-tests.svg @@ -1,4 +1,4 @@ -
Tracing e2e tests
Tracing e2e tests
telemetry-trace-collector
telemetry-trace-coll...
mock-trace-reciever
mock-trace-reciever
emptyDir
volume
emptyDir...
Create
TracePipeline
Create...
OTLP spans
OTLP spans
OTLP
spans
OTLP...
File
exporter
File...
Fetch spans
Fetch spans
telemetry-operator
telemetry-operator
webserver
webserver
Read
JSON
Read...
Mock trace backend
Mock trace backend
Deploy
trace gateway
Deploy...Text is not SVG - cannot display +
Tracing e2e tests
Tracing e2e tests
telemetry-trace-collector
telemetry-trace-coll...
mock-trace-reciever
mock-trace-reciever
emptyDir
volume
emptyDir...
Create
TracePipeline
Create...
OTLP spans
OTLP spans
OTLP
spans
OTLP...
File
exporter
File...
Fetch spans
Fetch spans
telemetry-manager
telemetry-manager
webserver
webserver
Read
JSON
Read...
Mock trace backend
Mock trace backend
Deploy
trace gateway
Deploy...Text is not SVG - cannot display diff --git a/test/e2e/manager_test.go b/test/e2e/manager_test.go index bdf032b92..ec650c136 100644 --- a/test/e2e/manager_test.go +++ b/test/e2e/manager_test.go @@ -32,7 +32,7 @@ var _ = Describe("Telemetry Manager", func() { It("Should have a running manager deployment", Label("telemetry"), func() { var deployment appsv1.Deployment key := types.NamespacedName{ - Name: "telemetry-operator", + Name: "telemetry-manager", Namespace: kitkyma.SystemNamespaceName, } err := k8sClient.Get(ctx, key, &deployment) @@ -61,7 +61,7 @@ var _ = Describe("Telemetry Manager", func() { It("Should have a webhook service", Label("telemetry"), func() { var service corev1.Service key := types.NamespacedName{ - Name: "telemetry-operator-webhook", + Name: "telemetry-manager-webhook", Namespace: kitkyma.SystemNamespaceName, } err := k8sClient.Get(ctx, key, &service) @@ -79,7 +79,7 @@ var _ = Describe("Telemetry Manager", func() { It("Should have a metrics service", Label("telemetry"), func() { var service corev1.Service key := types.NamespacedName{ - Name: "telemetry-operator-metrics", + Name: "telemetry-manager-metrics", Namespace: kitkyma.SystemNamespaceName, } err := k8sClient.Get(ctx, key, &service) @@ -189,7 +189,7 @@ var _ = Describe("Telemetry Manager", func() { It("Should have a NetworkPolicy", Label("telemetry"), func() { var networkPolicy networkingv1.NetworkPolicy key := types.NamespacedName{ - Name: "telemetry-operator", + Name: "telemetry-manager", Namespace: kitkyma.SystemNamespaceName, } err := k8sClient.Get(ctx, key, &networkPolicy) diff --git a/test/e2e/overrides_test.go b/test/e2e/overrides_test.go index a679bd4ec..fe340db64 100644 --- a/test/e2e/overrides_test.go +++ b/test/e2e/overrides_test.go @@ -85,7 +85,7 @@ var _ = Describe("Overrides", Label("telemetry"), Ordered, func() { g.Expect(resp).To(HaveHTTPStatus(http.StatusOK)) g.Expect(resp).To(HaveHTTPBody( ContainLd(ContainLogRecord(SatisfyAll( - WithPodName(ContainSubstring("telemetry-operator")), + WithPodName(ContainSubstring("telemetry-manager")), WithLevel(Equal("INFO")), ))), )) @@ -99,7 +99,7 @@ var _ = Describe("Overrides", Label("telemetry"), Ordered, func() { g.Expect(resp).To(HaveHTTPStatus(http.StatusOK)) g.Expect(resp).To(HaveHTTPBody( Not(ContainLd(ContainLogRecord(SatisfyAll( - WithPodName(ContainSubstring("telemetry-operator")), + WithPodName(ContainSubstring("telemetry-manager")), WithLevel(Equal("DEBUG")), WithTimestamp(BeTemporally(">=", now)), )))), @@ -135,7 +135,7 @@ var _ = Describe("Overrides", Label("telemetry"), Ordered, func() { g.Expect(resp).To(HaveHTTPStatus(http.StatusOK)) g.Expect(resp).To(HaveHTTPBody( ContainLd(ContainLogRecord(SatisfyAll( - WithPodName(ContainSubstring("telemetry-operator")), + WithPodName(ContainSubstring("telemetry-manager")), WithLevel(Equal("DEBUG")), WithTimestamp(BeTemporally(">=", now)), ))), diff --git a/test/e2e/telemetry_test.go b/test/e2e/telemetry_test.go index 4cf22ddf2..e66c76c31 100644 --- a/test/e2e/telemetry_test.go +++ b/test/e2e/telemetry_test.go @@ -38,7 +38,7 @@ var _ = Describe("Telemetry Module", Label("telemetry"), Ordered, func() { logPipelineWebhook := validatingWebhookConfiguration.Webhooks[0] g.Expect(logPipelineWebhook.Name).Should(Equal("validation.logpipelines.telemetry.kyma-project.io")) g.Expect(logPipelineWebhook.ClientConfig.CABundle).ShouldNot(BeEmpty()) - g.Expect(logPipelineWebhook.ClientConfig.Service.Name).Should(Equal("telemetry-operator-webhook")) + g.Expect(logPipelineWebhook.ClientConfig.Service.Name).Should(Equal("telemetry-manager-webhook")) g.Expect(logPipelineWebhook.ClientConfig.Service.Namespace).Should(Equal(kitkyma.SystemNamespaceName)) g.Expect(*logPipelineWebhook.ClientConfig.Service.Port).Should(Equal(int32(443))) g.Expect(*logPipelineWebhook.ClientConfig.Service.Path).Should(Equal("/validate-logpipeline")) @@ -50,7 +50,7 @@ var _ = Describe("Telemetry Module", Label("telemetry"), Ordered, func() { logParserWebhook := validatingWebhookConfiguration.Webhooks[1] g.Expect(logParserWebhook.Name).Should(Equal("validation.logparsers.telemetry.kyma-project.io")) g.Expect(logParserWebhook.ClientConfig.CABundle).ShouldNot(BeEmpty()) - g.Expect(logParserWebhook.ClientConfig.Service.Name).Should(Equal("telemetry-operator-webhook")) + g.Expect(logParserWebhook.ClientConfig.Service.Name).Should(Equal("telemetry-manager-webhook")) g.Expect(logParserWebhook.ClientConfig.Service.Namespace).Should(Equal(kitkyma.SystemNamespaceName)) g.Expect(*logParserWebhook.ClientConfig.Service.Port).Should(Equal(int32(443))) g.Expect(*logParserWebhook.ClientConfig.Service.Path).Should(Equal("/validate-logparser")) diff --git a/test/testkit/kyma/common_names.go b/test/testkit/kyma/common_names.go index 4342a131b..7d50fc136 100644 --- a/test/testkit/kyma/common_names.go +++ b/test/testkit/kyma/common_names.go @@ -17,7 +17,7 @@ const ( ) var ( - TelemetryOperatorWebhookServiceName = types.NamespacedName{Name: "telemetry-operator-webhook", Namespace: SystemNamespaceName} + TelemetryOperatorWebhookServiceName = types.NamespacedName{Name: "telemetry-manager-webhook", Namespace: SystemNamespaceName} MetricGatewayName = types.NamespacedName{Name: MetricGatewayBaseName, Namespace: SystemNamespaceName} MetricGatewayMetrics = types.NamespacedName{Name: MetricGatewayBaseName + "-metrics", Namespace: SystemNamespaceName}