diff --git a/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh b/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh index c3abb77af55..797e9d86cf4 100755 --- a/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh +++ b/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh @@ -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" @@ -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" diff --git a/ocp-resources/e2e/cluster-logging-install-observability.yaml b/ocp-resources/e2e/cluster-logging-install-observability.yaml index d85be80c05f..61e1f90d5be 100644 --- a/ocp-resources/e2e/cluster-logging-install-observability.yaml +++ b/ocp-resources/e2e/cluster-logging-install-observability.yaml @@ -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