From b36bc6d409ea6fc6c599fdd95d1757b3a42579c2 Mon Sep 17 00:00:00 2001 From: Ken Moini Date: Mon, 19 Jan 2026 13:58:06 -0500 Subject: [PATCH 1/3] v 4.20 updates to acm and odf --- advanced-cluster-management/README.md | 1 + .../overlays/release-2.15/kustomization.yaml | 11 +++++++++++ .../overlays/release-2.15/patch-channel.yaml | 3 +++ openshift-data-foundation-operator/README.md | 1 + .../operator/overlays/stable-4.20/README.md | 1 + .../overlays/stable-4.20/kustomization.yaml | 17 +++++++++++++++++ .../overlays/stable-4.20/patch-channel.yaml | 3 +++ 7 files changed, 37 insertions(+) create mode 100644 advanced-cluster-management/operator/overlays/release-2.15/kustomization.yaml create mode 100644 advanced-cluster-management/operator/overlays/release-2.15/patch-channel.yaml create mode 100644 openshift-data-foundation-operator/operator/overlays/stable-4.20/README.md create mode 100644 openshift-data-foundation-operator/operator/overlays/stable-4.20/kustomization.yaml create mode 100644 openshift-data-foundation-operator/operator/overlays/stable-4.20/patch-channel.yaml diff --git a/advanced-cluster-management/README.md b/advanced-cluster-management/README.md index bfcff961..0286c8a4 100644 --- a/advanced-cluster-management/README.md +++ b/advanced-cluster-management/README.md @@ -6,6 +6,7 @@ Do not use the `base` directory directly, as you will need to patch the `channel The current *overlays* available are for the following channels: +* [release-2.15](operator/overlays/release-2.15) * [release-2.14](operator/overlays/release-2.14) * [release-2.13](operator/overlays/release-2.13) * [release-2.12](operator/overlays/release-2.12) diff --git a/advanced-cluster-management/operator/overlays/release-2.15/kustomization.yaml b/advanced-cluster-management/operator/overlays/release-2.15/kustomization.yaml new file mode 100644 index 00000000..994ef6ce --- /dev/null +++ b/advanced-cluster-management/operator/overlays/release-2.15/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - target: + kind: Subscription + name: advanced-cluster-management + path: patch-channel.yaml diff --git a/advanced-cluster-management/operator/overlays/release-2.15/patch-channel.yaml b/advanced-cluster-management/operator/overlays/release-2.15/patch-channel.yaml new file mode 100644 index 00000000..b38657b6 --- /dev/null +++ b/advanced-cluster-management/operator/overlays/release-2.15/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: release-2.15 diff --git a/openshift-data-foundation-operator/README.md b/openshift-data-foundation-operator/README.md index 361eb688..bdce9704 100644 --- a/openshift-data-foundation-operator/README.md +++ b/openshift-data-foundation-operator/README.md @@ -6,6 +6,7 @@ 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-4.20](operator/overlays/stable-4.20) * [stable-4.19](operator/overlays/stable-4.19) * [stable-4.18](operator/overlays/stable-4.18) * [stable-4.17](operator/overlays/stable-4.17) diff --git a/openshift-data-foundation-operator/operator/overlays/stable-4.20/README.md b/openshift-data-foundation-operator/operator/overlays/stable-4.20/README.md new file mode 100644 index 00000000..a3895833 --- /dev/null +++ b/openshift-data-foundation-operator/operator/overlays/stable-4.20/README.md @@ -0,0 +1 @@ +Installs the *stable-4.20* channel version of the OpenShift Data Foundation Operator diff --git a/openshift-data-foundation-operator/operator/overlays/stable-4.20/kustomization.yaml b/openshift-data-foundation-operator/operator/overlays/stable-4.20/kustomization.yaml new file mode 100644 index 00000000..98f4e86b --- /dev/null +++ b/openshift-data-foundation-operator/operator/overlays/stable-4.20/kustomization.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: openshift-storage + + +resources: + - ../../base +patches: + - path: patch-channel.yaml + target: + group: operators.coreos.com + kind: Subscription + name: odf-operator + namespace: openshift-storage + version: v1alpha1 diff --git a/openshift-data-foundation-operator/operator/overlays/stable-4.20/patch-channel.yaml b/openshift-data-foundation-operator/operator/overlays/stable-4.20/patch-channel.yaml new file mode 100644 index 00000000..20768023 --- /dev/null +++ b/openshift-data-foundation-operator/operator/overlays/stable-4.20/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: stable-4.20 From 4446978f48bfe31863f14c81f64c45efadb84308 Mon Sep 17 00:00:00 2001 From: Ken Moini Date: Mon, 19 Jan 2026 14:20:36 -0500 Subject: [PATCH 2/3] add coo loki and OL updates --- .../operator/base/kustomization.yaml | 2 ++ .../operator/base/namespace.yaml | 6 ++++++ .../operator/base/operatorgroup.yaml | 7 +++++++ .../operator/base/subscription.yaml | 3 ++- .../operator/overlays/development/README.md | 2 +- .../overlays/development/kustomization.yaml | 12 ++++++------ .../overlays/development/subscription.yaml | 11 +++++++++++ .../overlays/stable/kustomization.yaml | 11 +++++++++++ .../overlays/stable/patch-channel.yaml | 3 +++ .../overlays/stable-6.3/kustomization.yaml | 15 +++++++++++++++ .../overlays/stable-6.3/patch-channel.yaml | 3 +++ .../overlays/stable-6.4/kustomization.yaml | 15 +++++++++++++++ .../overlays/stable-6.4/patch-channel.yaml | 3 +++ .../overlays/stable-6.3/kustomization.yaml | 18 ++++++++++++++++++ .../overlays/stable-6.4/kustomization.yaml | 18 ++++++++++++++++++ 15 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 cluster-observability-operator/operator/base/namespace.yaml create mode 100644 cluster-observability-operator/operator/base/operatorgroup.yaml create mode 100644 cluster-observability-operator/operator/overlays/development/subscription.yaml create mode 100644 cluster-observability-operator/operator/overlays/stable/kustomization.yaml create mode 100644 cluster-observability-operator/operator/overlays/stable/patch-channel.yaml create mode 100644 loki-operator/operator/overlays/stable-6.3/kustomization.yaml create mode 100644 loki-operator/operator/overlays/stable-6.3/patch-channel.yaml create mode 100644 loki-operator/operator/overlays/stable-6.4/kustomization.yaml create mode 100644 loki-operator/operator/overlays/stable-6.4/patch-channel.yaml create mode 100644 openshift-logging/operator/overlays/stable-6.3/kustomization.yaml create mode 100644 openshift-logging/operator/overlays/stable-6.4/kustomization.yaml diff --git a/cluster-observability-operator/operator/base/kustomization.yaml b/cluster-observability-operator/operator/base/kustomization.yaml index 00078e0a..59ea8312 100644 --- a/cluster-observability-operator/operator/base/kustomization.yaml +++ b/cluster-observability-operator/operator/base/kustomization.yaml @@ -2,4 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml + - operatorgroup.yaml - subscription.yaml diff --git a/cluster-observability-operator/operator/base/namespace.yaml b/cluster-observability-operator/operator/base/namespace.yaml new file mode 100644 index 00000000..d5653f7a --- /dev/null +++ b/cluster-observability-operator/operator/base/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-cluster-observability-operator + labels: + openshift.io/cluster-monitoring: "true" diff --git a/cluster-observability-operator/operator/base/operatorgroup.yaml b/cluster-observability-operator/operator/base/operatorgroup.yaml new file mode 100644 index 00000000..8316c508 --- /dev/null +++ b/cluster-observability-operator/operator/base/operatorgroup.yaml @@ -0,0 +1,7 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: cco-group + namespace: openshift-cluster-observability-operator +spec: + upgradeStrategy: Default \ No newline at end of file diff --git a/cluster-observability-operator/operator/base/subscription.yaml b/cluster-observability-operator/operator/base/subscription.yaml index 17119561..4847e1a1 100644 --- a/cluster-observability-operator/operator/base/subscription.yaml +++ b/cluster-observability-operator/operator/base/subscription.yaml @@ -2,7 +2,8 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: cluster-observability-operator - namespace: openshift-operators + # namespace: openshift-operators + namespace: openshift-cluster-observability-operator spec: channel: patch-me-see-overlays-dir installPlanApproval: Automatic diff --git a/cluster-observability-operator/operator/overlays/development/README.md b/cluster-observability-operator/operator/overlays/development/README.md index a1c89e57..75093df5 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** +Legacy stub for any consumers of the older Development channel of the Cluster Observability Operator \ 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 index 0a97825a..45bd74dd 100644 --- a/cluster-observability-operator/operator/overlays/development/kustomization.yaml +++ b/cluster-observability-operator/operator/overlays/development/kustomization.yaml @@ -2,10 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base + - subscription.yaml -patches: - - target: - kind: Subscription - name: cluster-observability-operator - path: patch-channel.yaml +# patches: +# - target: +# kind: Subscription +# name: cluster-observability-operator +# path: patch-channel.yaml diff --git a/cluster-observability-operator/operator/overlays/development/subscription.yaml b/cluster-observability-operator/operator/overlays/development/subscription.yaml new file mode 100644 index 00000000..42392ed4 --- /dev/null +++ b/cluster-observability-operator/operator/overlays/development/subscription.yaml @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: cluster-observability-operator + namespace: openshift-operators +spec: + channel: development + installPlanApproval: Automatic + name: cluster-observability-operator + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/cluster-observability-operator/operator/overlays/stable/kustomization.yaml b/cluster-observability-operator/operator/overlays/stable/kustomization.yaml new file mode 100644 index 00000000..0a97825a --- /dev/null +++ b/cluster-observability-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: cluster-observability-operator + path: patch-channel.yaml diff --git a/cluster-observability-operator/operator/overlays/stable/patch-channel.yaml b/cluster-observability-operator/operator/overlays/stable/patch-channel.yaml new file mode 100644 index 00000000..6642eb17 --- /dev/null +++ b/cluster-observability-operator/operator/overlays/stable/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: stable diff --git a/loki-operator/operator/overlays/stable-6.3/kustomization.yaml b/loki-operator/operator/overlays/stable-6.3/kustomization.yaml new file mode 100644 index 00000000..f1c8f957 --- /dev/null +++ b/loki-operator/operator/overlays/stable-6.3/kustomization.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + + +resources: + - ../../base +patches: + - path: patch-channel.yaml + target: + group: operators.coreos.com + kind: Subscription + name: loki-operator + namespace: openshift-operators-redhat + version: v1alpha1 diff --git a/loki-operator/operator/overlays/stable-6.3/patch-channel.yaml b/loki-operator/operator/overlays/stable-6.3/patch-channel.yaml new file mode 100644 index 00000000..66bec0c6 --- /dev/null +++ b/loki-operator/operator/overlays/stable-6.3/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: 'stable-6.3' diff --git a/loki-operator/operator/overlays/stable-6.4/kustomization.yaml b/loki-operator/operator/overlays/stable-6.4/kustomization.yaml new file mode 100644 index 00000000..f1c8f957 --- /dev/null +++ b/loki-operator/operator/overlays/stable-6.4/kustomization.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + + +resources: + - ../../base +patches: + - path: patch-channel.yaml + target: + group: operators.coreos.com + kind: Subscription + name: loki-operator + namespace: openshift-operators-redhat + version: v1alpha1 diff --git a/loki-operator/operator/overlays/stable-6.4/patch-channel.yaml b/loki-operator/operator/overlays/stable-6.4/patch-channel.yaml new file mode 100644 index 00000000..b7830f09 --- /dev/null +++ b/loki-operator/operator/overlays/stable-6.4/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: 'stable-6.4' diff --git a/openshift-logging/operator/overlays/stable-6.3/kustomization.yaml b/openshift-logging/operator/overlays/stable-6.3/kustomization.yaml new file mode 100644 index 00000000..93a23446 --- /dev/null +++ b/openshift-logging/operator/overlays/stable-6.3/kustomization.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - patch: |- + - op: replace + path: /spec/channel + value: 'stable-6.3' + target: + group: operators.coreos.com + kind: Subscription + name: cluster-logging + namespace: openshift-logging + version: v1alpha1 diff --git a/openshift-logging/operator/overlays/stable-6.4/kustomization.yaml b/openshift-logging/operator/overlays/stable-6.4/kustomization.yaml new file mode 100644 index 00000000..d16a98c5 --- /dev/null +++ b/openshift-logging/operator/overlays/stable-6.4/kustomization.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - patch: |- + - op: replace + path: /spec/channel + value: 'stable-6.4' + target: + group: operators.coreos.com + kind: Subscription + name: cluster-logging + namespace: openshift-logging + version: v1alpha1 From d4d89638981b4ac41bbf8a677e317c03aa26608c Mon Sep 17 00:00:00 2001 From: Ken Moini Date: Mon, 19 Jan 2026 14:24:34 -0500 Subject: [PATCH 3/3] you have got to be kidding me --- cluster-observability-operator/operator/base/operatorgroup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-observability-operator/operator/base/operatorgroup.yaml b/cluster-observability-operator/operator/base/operatorgroup.yaml index 8316c508..bb808797 100644 --- a/cluster-observability-operator/operator/base/operatorgroup.yaml +++ b/cluster-observability-operator/operator/base/operatorgroup.yaml @@ -4,4 +4,4 @@ metadata: name: cco-group namespace: openshift-cluster-observability-operator spec: - upgradeStrategy: Default \ No newline at end of file + upgradeStrategy: Default