From 65a4933d58eb7130e244df3b6afd5be0e53a42c5 Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 13:27:41 +1100 Subject: [PATCH 01/12] Adding Tempo Operator --- tempo-operator/README.md | 36 +++++++++++++++++++ tempo-operator/instance/base/Readme.md | 2 ++ .../instance/base/kustomization.yaml | 6 ++++ tempo-operator/instance/base/tempostack.yaml | 22 ++++++++++++ .../overlays/default/kustomization.yaml | 5 +++ .../operator/base/kustomization.yaml | 7 ++++ tempo-operator/operator/base/namespace.yaml | 8 +++++ .../operator/base/operator-group.yaml | 5 +++ .../operator/base/subscription.yaml | 11 ++++++ .../operator/overlays/stable/README.md | 3 ++ .../overlays/stable/kustomization.yaml | 11 ++++++ .../overlays/stable/patch-channel.yaml | 3 ++ 12 files changed, 119 insertions(+) create mode 100644 tempo-operator/README.md create mode 100644 tempo-operator/instance/base/Readme.md create mode 100644 tempo-operator/instance/base/kustomization.yaml create mode 100644 tempo-operator/instance/base/tempostack.yaml create mode 100644 tempo-operator/instance/overlays/default/kustomization.yaml create mode 100644 tempo-operator/operator/base/kustomization.yaml create mode 100644 tempo-operator/operator/base/namespace.yaml create mode 100644 tempo-operator/operator/base/operator-group.yaml create mode 100644 tempo-operator/operator/base/subscription.yaml create mode 100644 tempo-operator/operator/overlays/stable/README.md create mode 100644 tempo-operator/operator/overlays/stable/kustomization.yaml create mode 100644 tempo-operator/operator/overlays/stable/patch-channel.yaml diff --git a/tempo-operator/README.md b/tempo-operator/README.md new file mode 100644 index 00000000..e673631d --- /dev/null +++ b/tempo-operator/README.md @@ -0,0 +1,36 @@ +# Tempo Operator + +Red Hat OpenShift distributed tracing platform based on Tempo. Tempo is an open-source, easy-to-use, and highly scalable distributed tracing backend. It provides observability for microservices architectures by allowing developers to track requests as they flow through distributed systems. Tempo is optimized to handle large volumes of trace data and is designed to be highly performant even under heavy loads. It can ingest common open source tracing protocols including Jaeger, Zipkin, and OpenTelemetry and requires only object storage to operate. + +# Tempo Operator + +Install Tempo Operator by Red Hat. + +Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. + +The current *overlays* available are for the following channels: + +* [stable](operator/overlays/stable) + +## Usage + +If you have cloned the `gitops-catalog` repository, you can install Red Hat Developer Hub Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. + +``` +oc apply -k tempo-operator/operator/overlays/ +``` + +Or, without cloning: + +``` +oc apply -k https://github.com/redhat-cop/gitops-catalog/tempo-operator/operator/overlays/ +``` + +As part of a different overlay in your own GitOps repo: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - https://github.com/redhat-cop/gitops-catalog/tempo-operator/operator/overlays/?ref=main +``` diff --git a/tempo-operator/instance/base/Readme.md b/tempo-operator/instance/base/Readme.md new file mode 100644 index 00000000..8b6d0d7a --- /dev/null +++ b/tempo-operator/instance/base/Readme.md @@ -0,0 +1,2 @@ +### Before you start +TempoStack requires object storage to store its traces. TempoMonolithic can store traces in-memory, in a Persistent Volume and in object storage. Please ensure that your system has a compatible object storage solution that is supported, such as OpenShift Data Foundation, Minio, AWS S3, Azure Storage, or Google Cloud Storage. \ No newline at end of file diff --git a/tempo-operator/instance/base/kustomization.yaml b/tempo-operator/instance/base/kustomization.yaml new file mode 100644 index 00000000..d16571d1 --- /dev/null +++ b/tempo-operator/instance/base/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - tempostack.yaml diff --git a/tempo-operator/instance/base/tempostack.yaml b/tempo-operator/instance/base/tempostack.yaml new file mode 100644 index 00000000..36d78365 --- /dev/null +++ b/tempo-operator/instance/base/tempostack.yaml @@ -0,0 +1,22 @@ +kind: TempoStack +apiVersion: tempo.grafana.com/v1alpha1 +metadata: + name: sample + namespace: openshift-tempo-operator +spec: + resources: + total: + limits: + cpu: 2000m + memory: 2Gi + storage: + secret: + name: my-storage-secret + type: s3 + storageSize: 1Gi + template: + queryFrontend: + jaegerQuery: + enabled: true + ingress: + type: route diff --git a/tempo-operator/instance/overlays/default/kustomization.yaml b/tempo-operator/instance/overlays/default/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/tempo-operator/instance/overlays/default/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/tempo-operator/operator/base/kustomization.yaml b/tempo-operator/operator/base/kustomization.yaml new file mode 100644 index 00000000..1e66bd5f --- /dev/null +++ b/tempo-operator/operator/base/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - namespace.yaml + - operator-group.yaml + - subscription.yaml diff --git a/tempo-operator/operator/base/namespace.yaml b/tempo-operator/operator/base/namespace.yaml new file mode 100644 index 00000000..1701c38a --- /dev/null +++ b/tempo-operator/operator/base/namespace.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Namespace +metadata: + annotations: + openshift.io/display-name: "Tempo Operator" + labels: + openshift.io/cluster-monitoring: 'true' + name: openshift-tempo-operator diff --git a/tempo-operator/operator/base/operator-group.yaml b/tempo-operator/operator/base/operator-group.yaml new file mode 100644 index 00000000..c567a9f3 --- /dev/null +++ b/tempo-operator/operator/base/operator-group.yaml @@ -0,0 +1,5 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-tempo-operator + namespace: openshift-tempo-operator diff --git a/tempo-operator/operator/base/subscription.yaml b/tempo-operator/operator/base/subscription.yaml new file mode 100644 index 00000000..e6fc3bb3 --- /dev/null +++ b/tempo-operator/operator/base/subscription.yaml @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: tempo-product + namespace: openshift-tempo-operator +spec: + channel: patch-me-see-overlays-dir + installPlanApproval: Automatic + name: tempo-product + source: redhat-operators + sourceNamespace: openshift-marketplace \ No newline at end of file diff --git a/tempo-operator/operator/overlays/stable/README.md b/tempo-operator/operator/overlays/stable/README.md new file mode 100644 index 00000000..67900a36 --- /dev/null +++ b/tempo-operator/operator/overlays/stable/README.md @@ -0,0 +1,3 @@ +Installs the *OpenShift 4.15* channel version of the Red Hat Developer Hub Operator + +**Version: 0.8.0-3** \ No newline at end of file diff --git a/tempo-operator/operator/overlays/stable/kustomization.yaml b/tempo-operator/operator/overlays/stable/kustomization.yaml new file mode 100644 index 00000000..39015c0c --- /dev/null +++ b/tempo-operator/operator/overlays/stable/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - target: + kind: Subscription + name: tempo-product + path: patch-channel.yaml diff --git a/tempo-operator/operator/overlays/stable/patch-channel.yaml b/tempo-operator/operator/overlays/stable/patch-channel.yaml new file mode 100644 index 00000000..6642eb17 --- /dev/null +++ b/tempo-operator/operator/overlays/stable/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: stable From 97f9d63b89b3d4013c9369b063210df2995f7e29 Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 13:45:43 +1100 Subject: [PATCH 02/12] Added Cluster Observability Operator --- cluster-observability-operator/README.md | 36 +++++++++++++++++++ .../instance/base/kustomization.yaml | 6 ++++ .../overlays/default/kustomization.yaml | 5 +++ .../operator/base/kustomization.yaml | 5 +++ .../operator/base/subscription.yaml | 11 ++++++ .../operator/overlays/development/README.md | 3 ++ .../overlays/development/kustomization.yaml | 11 ++++++ .../overlays/development/patch-channel.yaml | 3 ++ 8 files changed, 80 insertions(+) create mode 100644 cluster-observability-operator/README.md create mode 100644 cluster-observability-operator/instance/base/kustomization.yaml create mode 100644 cluster-observability-operator/instance/overlays/default/kustomization.yaml create mode 100644 cluster-observability-operator/operator/base/kustomization.yaml create mode 100644 cluster-observability-operator/operator/base/subscription.yaml create mode 100644 cluster-observability-operator/operator/overlays/development/README.md create mode 100644 cluster-observability-operator/operator/overlays/development/kustomization.yaml create mode 100644 cluster-observability-operator/operator/overlays/development/patch-channel.yaml diff --git a/cluster-observability-operator/README.md b/cluster-observability-operator/README.md new file mode 100644 index 00000000..6f285f30 --- /dev/null +++ b/cluster-observability-operator/README.md @@ -0,0 +1,36 @@ +# Cluster Observability Operator + +Cluster Observability Operator is a Go based Kubernetes operator to setup and manage highly available Monitoring stack using Prometheus, Alertmanager and Thanos Querier. + +# Cluster Observability Operator + +Install Cluster Observability Operator by Red Hat. + +Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. + +The current *overlays* available are for the following channels: + +* [stable](operator/overlays/stable) + +## Usage + +If you have cloned the `gitops-catalog` repository, you can install Red Hat Developer Hub Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. + +``` +oc apply -k cluster-observability-operator/operator/overlays/ +``` + +Or, without cloning: + +``` +oc apply -k https://github.com/redhat-cop/gitops-catalog/cluster-observability-operator/operator/overlays/ +``` + +As part of a different overlay in your own GitOps repo: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - https://github.com/redhat-cop/gitops-catalog/cluster-observability-operator/operator/overlays/?ref=main +``` diff --git a/cluster-observability-operator/instance/base/kustomization.yaml b/cluster-observability-operator/instance/base/kustomization.yaml new file mode 100644 index 00000000..c98d8185 --- /dev/null +++ b/cluster-observability-operator/instance/base/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +# resources: +# - diff --git a/cluster-observability-operator/instance/overlays/default/kustomization.yaml b/cluster-observability-operator/instance/overlays/default/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/cluster-observability-operator/instance/overlays/default/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/cluster-observability-operator/operator/base/kustomization.yaml b/cluster-observability-operator/operator/base/kustomization.yaml new file mode 100644 index 00000000..00078e0a --- /dev/null +++ b/cluster-observability-operator/operator/base/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - subscription.yaml diff --git a/cluster-observability-operator/operator/base/subscription.yaml b/cluster-observability-operator/operator/base/subscription.yaml new file mode 100644 index 00000000..68c834db --- /dev/null +++ b/cluster-observability-operator/operator/base/subscription.yaml @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: cluster-observability-operator + namespace: openshift-operators +spec: + channel: patch-me-see-overlays-dir + installPlanApproval: Automatic + name: cluster-observability-operator + source: redhat-operators + sourceNamespace: openshift-marketplace \ No newline at end of file diff --git a/cluster-observability-operator/operator/overlays/development/README.md b/cluster-observability-operator/operator/overlays/development/README.md new file mode 100644 index 00000000..2c845c4b --- /dev/null +++ b/cluster-observability-operator/operator/overlays/development/README.md @@ -0,0 +1,3 @@ +Installs the *OpenShift 4.15* channel version of the Red Hat Developer Hub Operator + +**Version: 0.1.2** \ No newline at end of file diff --git a/cluster-observability-operator/operator/overlays/development/kustomization.yaml b/cluster-observability-operator/operator/overlays/development/kustomization.yaml new file mode 100644 index 00000000..0a97825a --- /dev/null +++ b/cluster-observability-operator/operator/overlays/development/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - target: + kind: Subscription + name: cluster-observability-operator + path: patch-channel.yaml diff --git a/cluster-observability-operator/operator/overlays/development/patch-channel.yaml b/cluster-observability-operator/operator/overlays/development/patch-channel.yaml new file mode 100644 index 00000000..60210b40 --- /dev/null +++ b/cluster-observability-operator/operator/overlays/development/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: development From 206ffb35b7069b1e76f69964f7f83e39e4239ddf Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 14:02:07 +1100 Subject: [PATCH 03/12] Added overlay in openshift-ai instance to enable all components --- .../overlays/all-components/kustomization.yaml | 11 +++++++++++ .../instance/overlays/all-components/patch-dsc.yaml | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 openshift-ai/instance/overlays/all-components/kustomization.yaml create mode 100644 openshift-ai/instance/overlays/all-components/patch-dsc.yaml diff --git a/openshift-ai/instance/overlays/all-components/kustomization.yaml b/openshift-ai/instance/overlays/all-components/kustomization.yaml new file mode 100644 index 00000000..4830958f --- /dev/null +++ b/openshift-ai/instance/overlays/all-components/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - target: + kind: DataScienceCluster + name: default + path: patch-dsc.yaml \ No newline at end of file diff --git a/openshift-ai/instance/overlays/all-components/patch-dsc.yaml b/openshift-ai/instance/overlays/all-components/patch-dsc.yaml new file mode 100644 index 00000000..eaa82969 --- /dev/null +++ b/openshift-ai/instance/overlays/all-components/patch-dsc.yaml @@ -0,0 +1,6 @@ +- op: replace + path: /spec/components/codeflare/managementState + value: Managed +- op: replace + path: /spec/components/ray/managementState + value: Managed \ No newline at end of file From 5aaa4fc0696bc04b580f0bdf8b3248ef1bcf5a5b Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 14:11:08 +1100 Subject: [PATCH 04/12] Added overlay in openshift-ai instance to enable codeflare and ray --- openshift-ai/instance/overlays/enable-codeflare-ray/Readme.md | 1 + .../{all-components => enable-codeflare-ray}/kustomization.yaml | 0 .../{all-components => enable-codeflare-ray}/patch-dsc.yaml | 0 3 files changed, 1 insertion(+) create mode 100644 openshift-ai/instance/overlays/enable-codeflare-ray/Readme.md rename openshift-ai/instance/overlays/{all-components => enable-codeflare-ray}/kustomization.yaml (100%) rename openshift-ai/instance/overlays/{all-components => enable-codeflare-ray}/patch-dsc.yaml (100%) diff --git a/openshift-ai/instance/overlays/enable-codeflare-ray/Readme.md b/openshift-ai/instance/overlays/enable-codeflare-ray/Readme.md new file mode 100644 index 00000000..f744e8f9 --- /dev/null +++ b/openshift-ai/instance/overlays/enable-codeflare-ray/Readme.md @@ -0,0 +1 @@ +Overlay to enable Codeflare and Ray in DataScienceCluster that are Removed by default. diff --git a/openshift-ai/instance/overlays/all-components/kustomization.yaml b/openshift-ai/instance/overlays/enable-codeflare-ray/kustomization.yaml similarity index 100% rename from openshift-ai/instance/overlays/all-components/kustomization.yaml rename to openshift-ai/instance/overlays/enable-codeflare-ray/kustomization.yaml diff --git a/openshift-ai/instance/overlays/all-components/patch-dsc.yaml b/openshift-ai/instance/overlays/enable-codeflare-ray/patch-dsc.yaml similarity index 100% rename from openshift-ai/instance/overlays/all-components/patch-dsc.yaml rename to openshift-ai/instance/overlays/enable-codeflare-ray/patch-dsc.yaml From 1e369cfe900d00dd599577471550929db15c8e39 Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 15:10:27 +1100 Subject: [PATCH 05/12] Added Red Hat build of Opentelemetry operator --- redhat-build-of-opentelemetry/README.md | 36 +++++++++++++++++++ .../instance/base/kustomization.yaml | 6 ++++ .../overlays/default/kustomization.yaml | 5 +++ .../operator/base/kustomization.yaml | 7 ++++ .../operator/base/namespace.yaml | 8 +++++ .../operator/base/operator-group.yaml | 5 +++ .../operator/base/subscription.yaml | 11 ++++++ .../operator/overlays/stable/README.md | 3 ++ .../overlays/stable/kustomization.yaml | 11 ++++++ .../overlays/stable/patch-channel.yaml | 3 ++ 10 files changed, 95 insertions(+) create mode 100644 redhat-build-of-opentelemetry/README.md create mode 100644 redhat-build-of-opentelemetry/instance/base/kustomization.yaml create mode 100644 redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml create mode 100644 redhat-build-of-opentelemetry/operator/base/kustomization.yaml create mode 100644 redhat-build-of-opentelemetry/operator/base/namespace.yaml create mode 100644 redhat-build-of-opentelemetry/operator/base/operator-group.yaml create mode 100644 redhat-build-of-opentelemetry/operator/base/subscription.yaml create mode 100644 redhat-build-of-opentelemetry/operator/overlays/stable/README.md create mode 100644 redhat-build-of-opentelemetry/operator/overlays/stable/kustomization.yaml create mode 100644 redhat-build-of-opentelemetry/operator/overlays/stable/patch-channel.yaml diff --git a/redhat-build-of-opentelemetry/README.md b/redhat-build-of-opentelemetry/README.md new file mode 100644 index 00000000..e673631d --- /dev/null +++ b/redhat-build-of-opentelemetry/README.md @@ -0,0 +1,36 @@ +# Tempo Operator + +Red Hat OpenShift distributed tracing platform based on Tempo. Tempo is an open-source, easy-to-use, and highly scalable distributed tracing backend. It provides observability for microservices architectures by allowing developers to track requests as they flow through distributed systems. Tempo is optimized to handle large volumes of trace data and is designed to be highly performant even under heavy loads. It can ingest common open source tracing protocols including Jaeger, Zipkin, and OpenTelemetry and requires only object storage to operate. + +# Tempo Operator + +Install Tempo Operator by Red Hat. + +Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. + +The current *overlays* available are for the following channels: + +* [stable](operator/overlays/stable) + +## Usage + +If you have cloned the `gitops-catalog` repository, you can install Red Hat Developer Hub Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. + +``` +oc apply -k tempo-operator/operator/overlays/ +``` + +Or, without cloning: + +``` +oc apply -k https://github.com/redhat-cop/gitops-catalog/tempo-operator/operator/overlays/ +``` + +As part of a different overlay in your own GitOps repo: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - https://github.com/redhat-cop/gitops-catalog/tempo-operator/operator/overlays/?ref=main +``` diff --git a/redhat-build-of-opentelemetry/instance/base/kustomization.yaml b/redhat-build-of-opentelemetry/instance/base/kustomization.yaml new file mode 100644 index 00000000..008e4aab --- /dev/null +++ b/redhat-build-of-opentelemetry/instance/base/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +# resources: +# - opentelemetrycollector.yaml \ No newline at end of file diff --git a/redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml b/redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/redhat-build-of-opentelemetry/operator/base/kustomization.yaml b/redhat-build-of-opentelemetry/operator/base/kustomization.yaml new file mode 100644 index 00000000..9e8dca5b --- /dev/null +++ b/redhat-build-of-opentelemetry/operator/base/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - namespace.yaml + - operator-group.yaml + - subscription.yaml \ No newline at end of file diff --git a/redhat-build-of-opentelemetry/operator/base/namespace.yaml b/redhat-build-of-opentelemetry/operator/base/namespace.yaml new file mode 100644 index 00000000..bc72bc2d --- /dev/null +++ b/redhat-build-of-opentelemetry/operator/base/namespace.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Namespace +metadata: + annotations: + openshift.io/display-name: "Red Hat build of OpenTelemetry" + labels: + openshift.io/cluster-monitoring: 'true' + name: openshift-telemetry-operator diff --git a/redhat-build-of-opentelemetry/operator/base/operator-group.yaml b/redhat-build-of-opentelemetry/operator/base/operator-group.yaml new file mode 100644 index 00000000..813cee9c --- /dev/null +++ b/redhat-build-of-opentelemetry/operator/base/operator-group.yaml @@ -0,0 +1,5 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-opentelemetry-operator + namespace: openshift-opentelemetry-operator diff --git a/redhat-build-of-opentelemetry/operator/base/subscription.yaml b/redhat-build-of-opentelemetry/operator/base/subscription.yaml new file mode 100644 index 00000000..9e8ae8df --- /dev/null +++ b/redhat-build-of-opentelemetry/operator/base/subscription.yaml @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: opentelemetry-product + namespace: openshift-opentelemetry-operator +spec: + channel: patch-me-see-overlays-dir + installPlanApproval: Automatic + name: opentelemetry-product + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/redhat-build-of-opentelemetry/operator/overlays/stable/README.md b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md new file mode 100644 index 00000000..67900a36 --- /dev/null +++ b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md @@ -0,0 +1,3 @@ +Installs the *OpenShift 4.15* channel version of the Red Hat Developer Hub Operator + +**Version: 0.8.0-3** \ No newline at end of file diff --git a/redhat-build-of-opentelemetry/operator/overlays/stable/kustomization.yaml b/redhat-build-of-opentelemetry/operator/overlays/stable/kustomization.yaml new file mode 100644 index 00000000..50b28c8b --- /dev/null +++ b/redhat-build-of-opentelemetry/operator/overlays/stable/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - target: + kind: Subscription + name: opentelemetry-product + path: patch-channel.yaml diff --git a/redhat-build-of-opentelemetry/operator/overlays/stable/patch-channel.yaml b/redhat-build-of-opentelemetry/operator/overlays/stable/patch-channel.yaml new file mode 100644 index 00000000..6642eb17 --- /dev/null +++ b/redhat-build-of-opentelemetry/operator/overlays/stable/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: stable From f4801d23b4f01d6724f2832c57f259445ec02a80 Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 15:18:24 +1100 Subject: [PATCH 06/12] fixed namespace --- redhat-build-of-opentelemetry/operator/base/namespace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat-build-of-opentelemetry/operator/base/namespace.yaml b/redhat-build-of-opentelemetry/operator/base/namespace.yaml index bc72bc2d..b8adab0c 100644 --- a/redhat-build-of-opentelemetry/operator/base/namespace.yaml +++ b/redhat-build-of-opentelemetry/operator/base/namespace.yaml @@ -5,4 +5,4 @@ metadata: openshift.io/display-name: "Red Hat build of OpenTelemetry" labels: openshift.io/cluster-monitoring: 'true' - name: openshift-telemetry-operator + name: openshift-opentelemetry-operator From f1b08f5b9184e973894a6500d5012320683e32be Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 15:31:00 +1100 Subject: [PATCH 07/12] updated Readme --- cluster-observability-operator/README.md | 4 ++-- redhat-build-of-opentelemetry/README.md | 16 +++++++--------- .../operator/overlays/stable/README.md | 2 +- tempo-operator/README.md | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cluster-observability-operator/README.md b/cluster-observability-operator/README.md index 6f285f30..6d42d915 100644 --- a/cluster-observability-operator/README.md +++ b/cluster-observability-operator/README.md @@ -10,11 +10,11 @@ Do not use the `base` directory directly, as you will need to patch the `channel The current *overlays* available are for the following channels: -* [stable](operator/overlays/stable) +* [development](operator/overlays/development) ## Usage -If you have cloned the `gitops-catalog` repository, you can install Red Hat Developer Hub Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. +If you have cloned the `gitops-catalog` repository, you can install Cluster Observability Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. ``` oc apply -k cluster-observability-operator/operator/overlays/ diff --git a/redhat-build-of-opentelemetry/README.md b/redhat-build-of-opentelemetry/README.md index e673631d..0d64f40a 100644 --- a/redhat-build-of-opentelemetry/README.md +++ b/redhat-build-of-opentelemetry/README.md @@ -1,10 +1,8 @@ -# Tempo Operator +# Red Hat build of OpenTelemetry -Red Hat OpenShift distributed tracing platform based on Tempo. Tempo is an open-source, easy-to-use, and highly scalable distributed tracing backend. It provides observability for microservices architectures by allowing developers to track requests as they flow through distributed systems. Tempo is optimized to handle large volumes of trace data and is designed to be highly performant even under heavy loads. It can ingest common open source tracing protocols including Jaeger, Zipkin, and OpenTelemetry and requires only object storage to operate. +Red Hat build of OpenTelemetry is a collection of tools, APIs, and SDKs. You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior. This operator was previously called Red Hat OpenShift distributed tracing data collection. -# Tempo Operator - -Install Tempo Operator by Red Hat. +# Install Red Hat build of OpenTelemetry by Red Hat. Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. @@ -14,16 +12,16 @@ The current *overlays* available are for the following channels: ## Usage -If you have cloned the `gitops-catalog` repository, you can install Red Hat Developer Hub Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. +If you have cloned the `gitops-catalog` repository, you can install Red Hat build of OpenTelemetry Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. ``` -oc apply -k tempo-operator/operator/overlays/ +oc apply -k redhat-build-of-opentelemetry/operator/overlays/ ``` Or, without cloning: ``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/tempo-operator/operator/overlays/ +oc apply -k https://github.com/redhat-cop/gitops-catalog/redhat-build-of-opentelemetry/operator/overlays/ ``` As part of a different overlay in your own GitOps repo: @@ -32,5 +30,5 @@ As part of a different overlay in your own GitOps repo: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://github.com/redhat-cop/gitops-catalog/tempo-operator/operator/overlays/?ref=main + - https://github.com/redhat-cop/gitops-catalog/redhat-build-of-opentelemetry/operator/overlays/?ref=main ``` diff --git a/redhat-build-of-opentelemetry/operator/overlays/stable/README.md b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md index 67900a36..23db6e82 100644 --- a/redhat-build-of-opentelemetry/operator/overlays/stable/README.md +++ b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md @@ -1,3 +1,3 @@ Installs the *OpenShift 4.15* channel version of the Red Hat Developer Hub Operator -**Version: 0.8.0-3** \ No newline at end of file +**Version: 0.93.0-3** \ No newline at end of file diff --git a/tempo-operator/README.md b/tempo-operator/README.md index e673631d..3919f3af 100644 --- a/tempo-operator/README.md +++ b/tempo-operator/README.md @@ -14,7 +14,7 @@ The current *overlays* available are for the following channels: ## Usage -If you have cloned the `gitops-catalog` repository, you can install Red Hat Developer Hub Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. +If you have cloned the `gitops-catalog` repository, you can install Tempo Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. ``` oc apply -k tempo-operator/operator/overlays/ From 774aa22cc92f4b99628613adbe046647dac09eb9 Mon Sep 17 00:00:00 2001 From: Arslan Date: Thu, 28 Mar 2024 15:34:31 +1100 Subject: [PATCH 08/12] updated Readme --- .../operator/overlays/development/README.md | 2 -- .../operator/overlays/stable/README.md | 2 -- tempo-operator/operator/overlays/stable/README.md | 2 -- 3 files changed, 6 deletions(-) diff --git a/cluster-observability-operator/operator/overlays/development/README.md b/cluster-observability-operator/operator/overlays/development/README.md index 2c845c4b..126b1a87 100644 --- a/cluster-observability-operator/operator/overlays/development/README.md +++ b/cluster-observability-operator/operator/overlays/development/README.md @@ -1,3 +1 @@ -Installs the *OpenShift 4.15* channel version of the Red Hat Developer Hub Operator - **Version: 0.1.2** \ No newline at end of file diff --git a/redhat-build-of-opentelemetry/operator/overlays/stable/README.md b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md index 23db6e82..83483208 100644 --- a/redhat-build-of-opentelemetry/operator/overlays/stable/README.md +++ b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md @@ -1,3 +1 @@ -Installs the *OpenShift 4.15* channel version of the Red Hat Developer Hub Operator - **Version: 0.93.0-3** \ No newline at end of file diff --git a/tempo-operator/operator/overlays/stable/README.md b/tempo-operator/operator/overlays/stable/README.md index 67900a36..0306ff0b 100644 --- a/tempo-operator/operator/overlays/stable/README.md +++ b/tempo-operator/operator/overlays/stable/README.md @@ -1,3 +1 @@ -Installs the *OpenShift 4.15* channel version of the Red Hat Developer Hub Operator - **Version: 0.8.0-3** \ No newline at end of file From a606fa6c98fb3d814f830d5874877ed7516a92f9 Mon Sep 17 00:00:00 2001 From: Arslan Date: Mon, 1 Apr 2024 00:07:02 +1100 Subject: [PATCH 09/12] Fixing: new-line-at-end-of-file --- cluster-observability-operator/operator/base/subscription.yaml | 3 ++- .../instance/overlays/enable-codeflare-ray/kustomization.yaml | 2 +- .../instance/overlays/enable-codeflare-ray/patch-dsc.yaml | 2 +- redhat-build-of-opentelemetry/instance/base/kustomization.yaml | 2 +- redhat-build-of-opentelemetry/operator/base/kustomization.yaml | 3 ++- tempo-operator/operator/base/subscription.yaml | 3 ++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cluster-observability-operator/operator/base/subscription.yaml b/cluster-observability-operator/operator/base/subscription.yaml index 68c834db..daa3b03c 100644 --- a/cluster-observability-operator/operator/base/subscription.yaml +++ b/cluster-observability-operator/operator/base/subscription.yaml @@ -8,4 +8,5 @@ spec: installPlanApproval: Automatic name: cluster-observability-operator source: redhat-operators - sourceNamespace: openshift-marketplace \ No newline at end of file + sourceNamespace: openshift-marketplace + \ No newline at end of file diff --git a/openshift-ai/instance/overlays/enable-codeflare-ray/kustomization.yaml b/openshift-ai/instance/overlays/enable-codeflare-ray/kustomization.yaml index 4830958f..6d5686ba 100644 --- a/openshift-ai/instance/overlays/enable-codeflare-ray/kustomization.yaml +++ b/openshift-ai/instance/overlays/enable-codeflare-ray/kustomization.yaml @@ -8,4 +8,4 @@ patches: - target: kind: DataScienceCluster name: default - path: patch-dsc.yaml \ No newline at end of file + path: patch-dsc.yaml diff --git a/openshift-ai/instance/overlays/enable-codeflare-ray/patch-dsc.yaml b/openshift-ai/instance/overlays/enable-codeflare-ray/patch-dsc.yaml index eaa82969..9fdccbed 100644 --- a/openshift-ai/instance/overlays/enable-codeflare-ray/patch-dsc.yaml +++ b/openshift-ai/instance/overlays/enable-codeflare-ray/patch-dsc.yaml @@ -3,4 +3,4 @@ value: Managed - op: replace path: /spec/components/ray/managementState - value: Managed \ No newline at end of file + value: Managed diff --git a/redhat-build-of-opentelemetry/instance/base/kustomization.yaml b/redhat-build-of-opentelemetry/instance/base/kustomization.yaml index 008e4aab..6bfcbe3d 100644 --- a/redhat-build-of-opentelemetry/instance/base/kustomization.yaml +++ b/redhat-build-of-opentelemetry/instance/base/kustomization.yaml @@ -3,4 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization # resources: -# - opentelemetrycollector.yaml \ No newline at end of file +# - opentelemetrycollector.yaml diff --git a/redhat-build-of-opentelemetry/operator/base/kustomization.yaml b/redhat-build-of-opentelemetry/operator/base/kustomization.yaml index 9e8dca5b..19b1d089 100644 --- a/redhat-build-of-opentelemetry/operator/base/kustomization.yaml +++ b/redhat-build-of-opentelemetry/operator/base/kustomization.yaml @@ -4,4 +4,5 @@ kind: Kustomization resources: - namespace.yaml - operator-group.yaml - - subscription.yaml \ No newline at end of file + - subscription.yaml + \ No newline at end of file diff --git a/tempo-operator/operator/base/subscription.yaml b/tempo-operator/operator/base/subscription.yaml index e6fc3bb3..032e0fd9 100644 --- a/tempo-operator/operator/base/subscription.yaml +++ b/tempo-operator/operator/base/subscription.yaml @@ -8,4 +8,5 @@ spec: installPlanApproval: Automatic name: tempo-product source: redhat-operators - sourceNamespace: openshift-marketplace \ No newline at end of file + sourceNamespace: openshift-marketplace + \ No newline at end of file From 29c24f8708ff85f1746ed48ca262bb0730cdc7c5 Mon Sep 17 00:00:00 2001 From: Arslan Date: Mon, 1 Apr 2024 00:21:30 +1100 Subject: [PATCH 10/12] Adding words to wordlist --- .wordlist-md | 15 +++++++++++++++ .../operator/overlays/development/README.md | 2 +- .../operator/overlays/stable/README.md | 2 +- tempo-operator/operator/overlays/stable/README.md | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.wordlist-md b/.wordlist-md index 6a30c431..731ba538 100644 --- a/.wordlist-md +++ b/.wordlist-md @@ -5,6 +5,7 @@ APIs APM ARN AdoptedResource +Alertmanager AmazonS AmazonSageMakerFullAccess Ansible @@ -18,7 +19,9 @@ CheCluster ClusterRoleBindings ClusterTask CodeReady +Codeflare DNS +DataScienceCluster Dev DevSpaces DevWorkspace @@ -52,6 +55,7 @@ Lifecycle Logstash MTA MachineConfig +Minio MultiClusterHub NFD NMState @@ -64,15 +68,18 @@ OLM Observability OpenDataHub OpenShift +OpenTelemetry OperatorGroup PV PolicyReport Prometheus +Querier RBAC README RHACM Rollout SAR +SDKs SNO SSO Sagemaker @@ -91,10 +98,13 @@ TLS TODO TaskRun Tekton +TempoMonolithic +TempoStack Thanos UI VolSync Workspaces +Zipkin ack acm amq @@ -106,6 +116,7 @@ argocd argoproj arn aws +backend canada ceph che @@ -165,6 +176,7 @@ letsencrypt libvirt lifecycle linux +microservices namespace namespaces newman @@ -173,6 +185,7 @@ nodeFeatureDiscovery noobaa nvidia oauth +observability oc ocp ocs @@ -183,6 +196,7 @@ openshift operatorGroup operatorGroups patchesJson +performant postgres pre prem @@ -195,6 +209,7 @@ rhpds runtime sagemaker sandboxed +scalable seldon selectable serverless diff --git a/cluster-observability-operator/operator/overlays/development/README.md b/cluster-observability-operator/operator/overlays/development/README.md index 126b1a87..a1c89e57 100644 --- a/cluster-observability-operator/operator/overlays/development/README.md +++ b/cluster-observability-operator/operator/overlays/development/README.md @@ -1 +1 @@ -**Version: 0.1.2** \ No newline at end of file +**Version: 0.1.2** diff --git a/redhat-build-of-opentelemetry/operator/overlays/stable/README.md b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md index 83483208..170b2806 100644 --- a/redhat-build-of-opentelemetry/operator/overlays/stable/README.md +++ b/redhat-build-of-opentelemetry/operator/overlays/stable/README.md @@ -1 +1 @@ -**Version: 0.93.0-3** \ No newline at end of file +**Version: 0.93.0-3** diff --git a/tempo-operator/operator/overlays/stable/README.md b/tempo-operator/operator/overlays/stable/README.md index 0306ff0b..eea0cb5b 100644 --- a/tempo-operator/operator/overlays/stable/README.md +++ b/tempo-operator/operator/overlays/stable/README.md @@ -1 +1 @@ -**Version: 0.8.0-3** \ No newline at end of file +**Version: 0.8.0-3** From 9719c1560d4fc2bbb5d64906dc8bdcb7979c7857 Mon Sep 17 00:00:00 2001 From: Arslan Date: Tue, 2 Apr 2024 10:32:26 +1100 Subject: [PATCH 11/12] Remove unused kustomization files --- .../instance/base/kustomization.yaml | 6 ------ .../instance/overlays/default/kustomization.yaml | 5 ----- .../instance/base/kustomization.yaml | 6 ------ .../instance/overlays/default/kustomization.yaml | 5 ----- 4 files changed, 22 deletions(-) delete mode 100644 cluster-observability-operator/instance/base/kustomization.yaml delete mode 100644 cluster-observability-operator/instance/overlays/default/kustomization.yaml delete mode 100644 redhat-build-of-opentelemetry/instance/base/kustomization.yaml delete mode 100644 redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml diff --git a/cluster-observability-operator/instance/base/kustomization.yaml b/cluster-observability-operator/instance/base/kustomization.yaml deleted file mode 100644 index c98d8185..00000000 --- a/cluster-observability-operator/instance/base/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -# resources: -# - diff --git a/cluster-observability-operator/instance/overlays/default/kustomization.yaml b/cluster-observability-operator/instance/overlays/default/kustomization.yaml deleted file mode 100644 index 774a422d..00000000 --- a/cluster-observability-operator/instance/overlays/default/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base diff --git a/redhat-build-of-opentelemetry/instance/base/kustomization.yaml b/redhat-build-of-opentelemetry/instance/base/kustomization.yaml deleted file mode 100644 index 6bfcbe3d..00000000 --- a/redhat-build-of-opentelemetry/instance/base/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -# resources: -# - opentelemetrycollector.yaml diff --git a/redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml b/redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml deleted file mode 100644 index 774a422d..00000000 --- a/redhat-build-of-opentelemetry/instance/overlays/default/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base From 169a9a86650ba62c457050b1370a2fb048242975 Mon Sep 17 00:00:00 2001 From: Arslan Date: Sun, 21 Apr 2024 16:54:32 +1000 Subject: [PATCH 12/12] Fixed trailing spaces warnings --- cluster-observability-operator/operator/base/subscription.yaml | 1 - redhat-build-of-opentelemetry/operator/base/kustomization.yaml | 1 - tempo-operator/operator/base/subscription.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/cluster-observability-operator/operator/base/subscription.yaml b/cluster-observability-operator/operator/base/subscription.yaml index daa3b03c..17119561 100644 --- a/cluster-observability-operator/operator/base/subscription.yaml +++ b/cluster-observability-operator/operator/base/subscription.yaml @@ -9,4 +9,3 @@ spec: name: cluster-observability-operator source: redhat-operators sourceNamespace: openshift-marketplace - \ No newline at end of file diff --git a/redhat-build-of-opentelemetry/operator/base/kustomization.yaml b/redhat-build-of-opentelemetry/operator/base/kustomization.yaml index 19b1d089..1e66bd5f 100644 --- a/redhat-build-of-opentelemetry/operator/base/kustomization.yaml +++ b/redhat-build-of-opentelemetry/operator/base/kustomization.yaml @@ -5,4 +5,3 @@ resources: - namespace.yaml - operator-group.yaml - subscription.yaml - \ No newline at end of file diff --git a/tempo-operator/operator/base/subscription.yaml b/tempo-operator/operator/base/subscription.yaml index 032e0fd9..50c87e91 100644 --- a/tempo-operator/operator/base/subscription.yaml +++ b/tempo-operator/operator/base/subscription.yaml @@ -9,4 +9,3 @@ spec: name: tempo-product source: redhat-operators sourceNamespace: openshift-marketplace - \ No newline at end of file