From 7bc8d0f1bd62c51b6d914d9ee9c73db6491d3b06 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Wed, 27 Aug 2025 14:08:32 -0400 Subject: [PATCH 1/3] add clickhouse operator bundle --- .../namespaces/clickhouse-operator/kustomization.yaml | 4 ++++ .../namespaces/clickhouse-operator/namespace.yaml | 5 +++++ .../catalogsources/operatorhubio/catalogsource.yaml | 9 +++++++++ .../catalogsources/operatorhubio/kustomization.yaml | 5 +++++ .../clickhouse-operator/kustomization.yaml | 5 +++++ .../clickhouse-operator/operatorgroup.yaml | 7 +++++++ .../clickhouse-operator/kustomization.yaml | 5 +++++ .../clickhouse-operator/subscription.yaml | 11 +++++++++++ .../bundles/clickhouse-operator/kustomization.yaml | 9 +++++++++ 9 files changed, 60 insertions(+) create mode 100644 cluster-scope/base/core/namespaces/clickhouse-operator/kustomization.yaml create mode 100644 cluster-scope/base/core/namespaces/clickhouse-operator/namespace.yaml create mode 100644 cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/catalogsource.yaml create mode 100644 cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/kustomization.yaml create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/kustomization.yaml create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/operatorgroup.yaml create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/kustomization.yaml create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/subscription.yaml create mode 100644 cluster-scope/bundles/clickhouse-operator/kustomization.yaml diff --git a/cluster-scope/base/core/namespaces/clickhouse-operator/kustomization.yaml b/cluster-scope/base/core/namespaces/clickhouse-operator/kustomization.yaml new file mode 100644 index 000000000..c313b5408 --- /dev/null +++ b/cluster-scope/base/core/namespaces/clickhouse-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/clickhouse-operator/namespace.yaml b/cluster-scope/base/core/namespaces/clickhouse-operator/namespace.yaml new file mode 100644 index 000000000..1cb227012 --- /dev/null +++ b/cluster-scope/base/core/namespaces/clickhouse-operator/namespace.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: clickhouse-operator +spec: {} diff --git a/cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/catalogsource.yaml b/cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/catalogsource.yaml new file mode 100644 index 000000000..3be21296b --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/catalogsource.yaml @@ -0,0 +1,9 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: operatorhubio-catalog +spec: + sourceType: grpc + image: quay.io/operatorhubio/catalog:latest + displayName: OperatorHub.io Operators + publisher: OperatorHub.io diff --git a/cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/kustomization.yaml b/cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/kustomization.yaml new file mode 100644 index 000000000..32845d5f4 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/catalogsources/operatorhubio/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openshift-marketplace +resources: +- catalogsource.yaml diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/kustomization.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/kustomization.yaml new file mode 100644 index 000000000..e6216e52f --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: clickhouse-operator +resources: +- operatorgroup.yaml diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/operatorgroup.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/operatorgroup.yaml new file mode 100644 index 000000000..a293ceaa6 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/operatorgroups/clickhouse-operator/operatorgroup.yaml @@ -0,0 +1,7 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: clickhouse-operator-group +spec: + targetNamespaces: + - clickhouse-operator diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/kustomization.yaml new file mode 100644 index 000000000..c187ee864 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: clickhouse-operator +resources: +- subscription.yaml diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/subscription.yaml new file mode 100644 index 000000000..4c65ecba0 --- /dev/null +++ b/cluster-scope/base/operators.coreos.com/subscriptions/clickhouse-operator/subscription.yaml @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: clickhouse-operator-sub + namespace: clickhouse-operator +spec: + channel: latest + installPlanApproval: Automatic + name: clickhouse + source: operatorhubio-catalog + sourceNamespace: openshift-marketplace diff --git a/cluster-scope/bundles/clickhouse-operator/kustomization.yaml b/cluster-scope/bundles/clickhouse-operator/kustomization.yaml new file mode 100644 index 000000000..596e5ba60 --- /dev/null +++ b/cluster-scope/bundles/clickhouse-operator/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +commonLabels: + nerc.mghpcc.org/bundle: clickhouse-operator +resources: +- ../../base/core/namespaces/clickhouse-operator +- ../../base/operators.coreos.com/catalogsources/operatorhubio +- ../../base/operators.coreos.com/operatorgroups/clickhouse-operator +- ../../base/operators.coreos.com/subscriptions/clickhouse-operator From 14aff812d9f1dfe640481390c3b8aabe943019de Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Tue, 26 Aug 2025 14:41:29 -0400 Subject: [PATCH 2/3] ocp-test: add clickhouse operator for testing --- cluster-scope/overlays/nerc-ocp-test/kustomization.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml index e1b6c6fdf..ce30bd0f4 100644 --- a/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml @@ -42,6 +42,7 @@ resources: - ../../bundles/authorino-operator - ../../bundles/servicemesh-operator - ../../bundles/cluster-observability-operator +- ../../bundles/clickhouse-operator components: - ../../components/nerc-oauth-github From 48d2fb0406be8e660d648d155ccfb097824c2ca3 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Wed, 27 Aug 2025 15:27:05 -0400 Subject: [PATCH 3/3] add clickhouse operator config --- .../watch-all-namespaces.yaml | 8 ++++++++ clickhouse-operator/base/kustomization.yaml | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 clickhouse-operator/base/clickhouse.altinity.com/clickhouseoperatorconfigurations/watch-all-namespaces.yaml create mode 100644 clickhouse-operator/base/kustomization.yaml diff --git a/clickhouse-operator/base/clickhouse.altinity.com/clickhouseoperatorconfigurations/watch-all-namespaces.yaml b/clickhouse-operator/base/clickhouse.altinity.com/clickhouseoperatorconfigurations/watch-all-namespaces.yaml new file mode 100644 index 000000000..a9e9fe4aa --- /dev/null +++ b/clickhouse-operator/base/clickhouse.altinity.com/clickhouseoperatorconfigurations/watch-all-namespaces.yaml @@ -0,0 +1,8 @@ +apiVersion: "clickhouse.altinity.com/v1" +kind: "ClickHouseOperatorConfiguration" +metadata: + name: "watch-all-namespaces" +spec: + watch: + namespaces: + - ".*" diff --git a/clickhouse-operator/base/kustomization.yaml b/clickhouse-operator/base/kustomization.yaml new file mode 100644 index 000000000..06bcc75e7 --- /dev/null +++ b/clickhouse-operator/base/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: clickhouse-operator +resources: + - clickhouse.altinity.com/clickhouseoperatorconfigurations/watch-all-namespaces.yaml