From e30200edd8e7e9350279f68440faac0770d721b9 Mon Sep 17 00:00:00 2001 From: Casey Robb Date: Fri, 3 Nov 2023 13:47:21 -0600 Subject: [PATCH 1/2] Add eck-operator with stable overlay --- eck-operator/README.md | 30 +++++++++++++++++++ eck-operator/base/kustomization.yaml | 7 +++++ eck-operator/base/namespace.yaml | 4 +++ eck-operator/base/operatorgroup.yaml | 8 +++++ eck-operator/base/subscription.yaml | 13 ++++++++ .../overlays/stable/kustomization.yaml | 15 ++++++++++ 6 files changed, 77 insertions(+) create mode 100644 eck-operator/README.md create mode 100644 eck-operator/base/kustomization.yaml create mode 100644 eck-operator/base/namespace.yaml create mode 100644 eck-operator/base/operatorgroup.yaml create mode 100644 eck-operator/base/subscription.yaml create mode 100644 eck-operator/overlays/stable/kustomization.yaml diff --git a/eck-operator/README.md b/eck-operator/README.md new file mode 100644 index 00000000..f11e531a --- /dev/null +++ b/eck-operator/README.md @@ -0,0 +1,30 @@ +# Elastic Cloud on Kubernetes Operator + +Install Elastic Cloud on Kubernetes (ECK) Operator to support the setup and management of Elasticsearch, Kibana, APM Server, Enterprise Search, Beats, Elastic Agent, Elastic Maps Server, and Logstash. + +The current *overlays* available are for the following channels: + +* [stable](overlays/stable) + +## Usage + +If you have cloned the `gitops-catalog` repository, you can install the ECK operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. + +``` +oc apply -k eck-operator/overlays/ +``` + +Or, without cloning: + +``` +oc apply -k https://github.com/redhat-cop/gitops-catalog/eck-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/eck-operator/overlays/?ref=main + ``` diff --git a/eck-operator/base/kustomization.yaml b/eck-operator/base/kustomization.yaml new file mode 100644 index 00000000..59ea8312 --- /dev/null +++ b/eck-operator/base/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - namespace.yaml + - operatorgroup.yaml + - subscription.yaml diff --git a/eck-operator/base/namespace.yaml b/eck-operator/base/namespace.yaml new file mode 100644 index 00000000..b2b8e09e --- /dev/null +++ b/eck-operator/base/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: elastic-system diff --git a/eck-operator/base/operatorgroup.yaml b/eck-operator/base/operatorgroup.yaml new file mode 100644 index 00000000..8e19a8c1 --- /dev/null +++ b/eck-operator/base/operatorgroup.yaml @@ -0,0 +1,8 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: elastic-system + namespace: elastic-system +spec: + targetNamespaces: + - elastic-system diff --git a/eck-operator/base/subscription.yaml b/eck-operator/base/subscription.yaml new file mode 100644 index 00000000..22c9e39c --- /dev/null +++ b/eck-operator/base/subscription.yaml @@ -0,0 +1,13 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + labels: + operators.coreos.com/elasticsearch-eck-operator-certified.elastic: "" + name: elasticsearch-eck-operator-certified + namespace: elastic-system +spec: + channel: patch_me_in_overlays + installPlanApproval: Automatic + name: elasticsearch-eck-operator-certified + source: certified-operators + sourceNamespace: openshift-marketplace diff --git a/eck-operator/overlays/stable/kustomization.yaml b/eck-operator/overlays/stable/kustomization.yaml new file mode 100644 index 00000000..f0405ecc --- /dev/null +++ b/eck-operator/overlays/stable/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - patch: |- + - op: replace + path: /spec/channel + value: 'stable' + target: + kind: Subscription + name: elasticsearch-eck-operator-certified + namespace: elastic-system From 3c16d4eee7691bb39343a033cb7a70cadab2c350 Mon Sep 17 00:00:00 2001 From: Casey Robb Date: Fri, 3 Nov 2023 14:18:32 -0600 Subject: [PATCH 2/2] Fix spelling error for lint test --- .wordlist-md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.wordlist-md b/.wordlist-md index 85baa39c..9d53dca9 100644 --- a/.wordlist-md +++ b/.wordlist-md @@ -2,6 +2,7 @@ ACK ACM ACS APIs +APM ARN AdoptedResource AmazonS @@ -24,6 +25,7 @@ DevWorkspace DevWorkspaces Devfile DotNET +ECK Eventing FullAccess GPUs @@ -37,6 +39,7 @@ IgnoreExtraneous Jaeger Jenkins Kafka +Kibana KieApp Koku KokuMetricsConfig @@ -45,6 +48,7 @@ Kyverno LDAP LVM Lifecycle +Logstash MTA MachineConfig MultiClusterHub