Skip to content

[WIP]Update openshift cluster logging version to 6.1 #13146

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP]Update openshift cluster logging version to 6.1 #13146

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
10 changes: 5 additions & 5 deletions applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
set -xe

ocp_version=$(oc version -ojson | jq -r '.openshiftVersion')
clo_v6_available_from="4.14.0"
clo_v6_1_available_from="4.15.0"

if [ "$(printf '%s\n' "$ocp_version" "$clo_v6_available_from" | sort -V | head -n1)" = "$clo_v6_available_from" ]; then
echo "OCP ${ocp_version} has CLO 6.0 is available for install";
if [ "$(printf '%s\n' "$ocp_version" "$clo_v6_1_available_from" | sort -V | head -n1)" = "$clo_v6_1_available_from" ]; then
echo "OCP ${ocp_version} has CLO 6.1 is available for install";
install_v6=true
fi

if [ "$install_v6" = true ] ; then
echo "installing cluster-logging-operator V6.0"
echo "installing cluster-logging-operator V6.1"
oc apply -f ${ROOT_DIR}/ocp-resources/e2e/cluster-logging-install-observability.yaml
else
echo "installing cluster-logging-operator"
Expand All @@ -29,7 +29,7 @@ oc wait -n openshift-logging --for=condition=Available --timeout=120s \
deployment/cluster-logging-operator

if [ "$install_v6" = true ] ; then
echo "installing clusterlogforwarder 6.0"
echo "installing clusterlogforwarder 6.1"
oc apply -f ${ROOT_DIR}/ocp-resources/e2e/forward-logs-observability.yaml
else
echo "installing clusterlogging instance"
Expand Down
2 changes: 1 addition & 1 deletion ocp-resources/e2e/cluster-logging-install-observability.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ metadata:
name: cluster-logging
namespace: openshift-logging
spec:
channel: stable-6.0
channel: stable-6.1
name: cluster-logging
source: redhat-operators
sourceNamespace: openshift-marketplace
Expand Down
Loading