Skip to content

Address the cluster-logging subscription by overriding the channel at… #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2025
Merged

Address the cluster-logging subscription by overriding the channel at… #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ansible/roles/telco-core-ztp/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
# Currently only the 4.18 profile has been placed and adjusted for this testing in this repo
telco_core_profile_version: 4.18

# Enable means uncommented, so false means comment out for now
# Enable overriding the clusterlogging subscription reference CR channel
telco_core_reference_cluster_logging_channel_override_enable: true
telco_core_reference_cluster_logging_channel_override: stable-6.1

# Enabling a cluster logging version refers to enabling a specific target version for
# the cluster logging operator status to be compliant with. Setting as false means the
# version will be commented and your policy will be compliant regardless of the version
# of the cluster logging operator installed.
telco_core_cluster_logging_version_enable: false
telco_core_cluster_logging_version: cluster-logging.v6.0.0
2 changes: 1 addition & 1 deletion ...co-core-ztp/files/release-4.18/reference-crs/optional/logging/ClusterLogSubscription.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: cluster-logging
namespace: openshift-logging
spec:
channel: "stable-6.1"
channel: "stable-6.0"
name: cluster-logging
source: redhat-operators-disconnected
sourceNamespace: openshift-marketplace
Expand Down
9 changes: 9 additions & 0 deletions ansible/roles/telco-core-ztp/templates/release-4.18/core-baseline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ policies:
- path: reference-crs/optional/logging/ClusterLogNS.yaml
- path: reference-crs/optional/logging/ClusterLogOperGroup.yaml
- path: reference-crs/optional/logging/ClusterLogSubscription.yaml
{% if telco_core_reference_cluster_logging_channel_override_enable %}
patches:
- spec:
channel: "{{ telco_core_reference_cluster_logging_channel_override }}"
{% else %}
# patches:
# - spec:
# channel: "{{ telco_core_reference_cluster_logging_channel_override }}"
{% endif %}
- path: reference-crs/optional/logging/ClusterLogOperatorStatus.yaml
patches:
- status:
Expand Down