From 8a1749d1e4305dc45e18b926b4c9c80d241e70f9 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 22 Nov 2023 12:42:52 -0700 Subject: [PATCH] Add missing jaeger and tempo operators for OpenTelemetry The Red Hat OpenShift distributed tracing data collection operator, which was already installed in this PR[1], was missing two required components for distributed tracing. See the Red Hat documentation[2] for more details on the other 2 required operators: - Red Hat OpenShift distributed tracing platform (Jaeger) - Red Hat OpenShift distributed tracing platform (Tempo) [1] https://github.com/OCP-on-NERC/nerc-ocp-config/pull/282 [2] https://docs.openshift.com/container-platform/4.13/distr_tracing/distr_tracing_arch/distr-tracing-architecture.html#distr-tracing-product-overview_distributed-tracing-architecture --- .../openshift-distributed-tracing/kustomization.yaml | 4 ++++ .../openshift-distributed-tracing/namespace.yaml | 5 +++++ .../openshift-tempo-operator/kustomization.yaml | 4 ++++ .../openshift-tempo-operator/namespace.yaml | 5 +++++ .../openshift-distributed-tracing/kustomization.yaml | 4 ++++ .../openshift-distributed-tracing/operatorgroup.yaml | 6 ++++++ .../openshift-tempo-operator/kustomization.yaml | 4 ++++ .../openshift-tempo-operator/operatorgroup.yaml | 6 ++++++ .../subscriptions/jaeger-product/kustomization.yaml | 4 ++++ .../subscriptions/jaeger-product/subscription.yaml | 11 +++++++++++ .../subscriptions/tempo-product/kustomization.yaml | 4 ++++ .../subscriptions/tempo-product/subscription.yaml | 11 +++++++++++ .../kustomization.yaml | 8 +++++++- 13 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 cluster-scope/base/core/namespaces/openshift-distributed-tracing/kustomization.yaml create mode 100644 cluster-scope/base/core/namespaces/openshift-distributed-tracing/namespace.yaml create mode 100644 cluster-scope/base/core/namespaces/openshift-tempo-operator/kustomization.yaml create mode 100644 cluster-scope/base/core/namespaces/openshift-tempo-operator/namespace.yaml create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/kustomization.yaml create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/operatorgroup.yaml create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/kustomization.yaml create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/operatorgroup.yaml create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/kustomization.yaml create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/subscription.yaml create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/kustomization.yaml create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/subscription.yaml diff --git a/cluster-scope/base/core/namespaces/openshift-distributed-tracing/kustomization.yaml b/cluster-scope/base/core/namespaces/openshift-distributed-tracing/kustomization.yaml new file mode 100644 index 00000000..c313b540 --- /dev/null +++ b/cluster-scope/base/core/namespaces/openshift-distributed-tracing/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- namespace.yaml diff --git a/cluster-scope/base/core/namespaces/openshift-distributed-tracing/namespace.yaml b/cluster-scope/base/core/namespaces/openshift-distributed-tracing/namespace.yaml new file mode 100644 index 00000000..34a840f1 --- /dev/null +++ b/cluster-scope/base/core/namespaces/openshift-distributed-tracing/namespace.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-distributed-tracing +spec: {} diff --git a/cluster-scope/base/core/namespaces/openshift-tempo-operator/kustomization.yaml b/cluster-scope/base/core/namespaces/openshift-tempo-operator/kustomization.yaml new file mode 100644 index 00000000..c313b540 --- /dev/null +++ b/cluster-scope/base/core/namespaces/openshift-tempo-operator/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- namespace.yaml diff --git a/cluster-scope/base/core/namespaces/openshift-tempo-operator/namespace.yaml b/cluster-scope/base/core/namespaces/openshift-tempo-operator/namespace.yaml new file mode 100644 index 00000000..291f492b --- /dev/null +++ b/cluster-scope/base/core/namespaces/openshift-tempo-operator/namespace.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-tempo-operator +spec: {} diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/kustomization.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/kustomization.yaml new file mode 100644 index 00000000..81ebb3d1 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- operatorgroup.yaml diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/operatorgroup.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/operatorgroup.yaml new file mode 100644 index 00000000..94c671df --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-distributed-tracing/operatorgroup.yaml @@ -0,0 +1,6 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-distributed-tracing + namespace: openshift-distributed-tracing +spec: {} diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/kustomization.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/kustomization.yaml new file mode 100644 index 00000000..81ebb3d1 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- operatorgroup.yaml diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/operatorgroup.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/operatorgroup.yaml new file mode 100644 index 00000000..82aa4156 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-tempo-operator/operatorgroup.yaml @@ -0,0 +1,6 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-tempo-operator + namespace: openshift-tempo-operator +spec: {} diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/kustomization.yaml new file mode 100644 index 00000000..0da2c897 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - subscription.yaml diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/subscription.yaml new file mode 100644 index 00000000..0e8745db --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/subscriptions/jaeger-product/subscription.yaml @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: jaeger-product + namespace: openshift-distributed-tracing +spec: + channel: stable + installPlanApproval: Automatic + name: jaeger-product + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/kustomization.yaml new file mode 100644 index 00000000..0da2c897 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - subscription.yaml diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/subscription.yaml new file mode 100644 index 00000000..f8c62019 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/subscriptions/tempo-product/subscription.yaml @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: tempo-product + namespace: openshift-tempo-operator +spec: + channel: stable + installPlanApproval: Automatic + name: tempo-product + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/cluster-scope/bundles/openshift-opentelemetry-operator/kustomization.yaml b/cluster-scope/bundles/openshift-opentelemetry-operator/kustomization.yaml index 5a810f85..67ce6f20 100644 --- a/cluster-scope/bundles/openshift-opentelemetry-operator/kustomization.yaml +++ b/cluster-scope/bundles/openshift-opentelemetry-operator/kustomization.yaml @@ -1,8 +1,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization commonLabels: - nerc.mghpcc.org/bundle: openshift-serverless-operator + nerc.mghpcc.org/bundle: openshift-opentelemetry-operator resources: - ../../base/core/namespaces/openshift-opentelemetry-operator +- ../../base/core/namespaces/openshift-distributed-tracing +- ../../base/core/namespaces/openshift-tempo-operator - ../../base/operators.coreos.com/operatorgroups/openshift-opentelemetry-operator +- ../../base/operators.coreos.com/operatorgroups/openshift-distributed-tracing +- ../../base/operators.coreos.com/operatorgroups/openshift-tempo-operator - ../../base/operators.coreos.com/subscriptions/opentelemetry-product +- ../../base/operators.coreos.com/subscriptions/jaeger-product +- ../../base/operators.coreos.com/subscriptions/tempo-product