diff --git a/hack/.ci/lib/e2e.sh b/hack/.ci/lib/e2e.sh index ea5e075f069..4fdc793db5c 100755 --- a/hack/.ci/lib/e2e.sh +++ b/hack/.ci/lib/e2e.sh @@ -211,15 +211,6 @@ function run-e2e { kubectl create clusterrolebinding e2e --clusterrole=cluster-admin --serviceaccount=e2e:default --dry-run=client -o=yaml | kubectl_create -f=- kubectl create -n=e2e pdb my-pdb --selector='app=e2e' --min-available=1 --dry-run=client -o=yaml | kubectl_create -f=- - - # Raise loglevel in CI. - # TODO: Replace it with ScyllaOperatorConfig field when available. - kubectl -n=scylla-operator patch --field-manager="${FIELD_MANAGER}" deployment/scylla-operator --type=json -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--loglevel=4"}]' - kubectl -n=scylla-operator rollout status deployment/scylla-operator - - kubectl -n=scylla-manager patch --field-manager="${FIELD_MANAGER}" deployment/scylla-manager-controller --type=json -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--loglevel=4"}]' - kubectl -n=scylla-manager rollout status deployment/scylla-manager-controller - kubectl create -n=e2e secret generic kubeconfigs ${KUBECONFIGS[@]/#/--from-file=} --dry-run=client -o=yaml | kubectl_create -f=- kubeconfigs_in_container_path=$( IFS=','; basenames=( "${KUBECONFIGS[@]##*/}" ) && in_container_paths="${basenames[@]/#//var/run/secrets/kubeconfigs/}" && echo "${in_container_paths[*]}" ) diff --git a/hack/.ci/run-e2e-gke-release.sh b/hack/.ci/run-e2e-gke-release.sh index 89493b505ee..f99733925ca 100755 --- a/hack/.ci/run-e2e-gke-release.sh +++ b/hack/.ci/run-e2e-gke-release.sh @@ -23,6 +23,9 @@ export SO_NODECONFIG_PATH SO_SCYLLACLUSTER_STORAGECLASS_NAME="${SO_SCYLLACLUSTER_STORAGECLASS_NAME=scylladb-local-xfs}" export SO_SCYLLACLUSTER_STORAGECLASS_NAME +SO_SCYLLA_OPERATOR_LOGLEVEL="${SO_SCYLLA_OPERATOR_LOGLEVEL:-4}" +export SO_SCYLLA_OPERATOR_LOGLEVEL + SCYLLA_OPERATOR_FEATURE_GATES="${SCYLLA_OPERATOR_FEATURE_GATES:-AllAlpha=true,AllBeta=true}" export SCYLLA_OPERATOR_FEATURE_GATES diff --git a/hack/.ci/run-e2e-gke.sh b/hack/.ci/run-e2e-gke.sh index 2cde5c43dc0..9e52be06781 100755 --- a/hack/.ci/run-e2e-gke.sh +++ b/hack/.ci/run-e2e-gke.sh @@ -30,6 +30,9 @@ if [[ "${SO_DISABLE_NODECONFIG:-false}" == "true" ]]; then SO_CSI_DRIVER_PATH="" fi +SO_SCYLLA_OPERATOR_LOGLEVEL="${SO_SCYLLA_OPERATOR_LOGLEVEL:-4}" +export SO_SCYLLA_OPERATOR_LOGLEVEL + SCYLLA_OPERATOR_FEATURE_GATES="${SCYLLA_OPERATOR_FEATURE_GATES:-AllAlpha=true,AllBeta=true}" export SCYLLA_OPERATOR_FEATURE_GATES diff --git a/hack/.ci/run-e2e-openshift-aws.sh b/hack/.ci/run-e2e-openshift-aws.sh index a49e164babc..4752fd049cd 100755 --- a/hack/.ci/run-e2e-openshift-aws.sh +++ b/hack/.ci/run-e2e-openshift-aws.sh @@ -29,6 +29,9 @@ export SO_CSI_DRIVER_PATH SO_SCYLLACLUSTER_STORAGECLASS_NAME="${SO_SCYLLACLUSTER_STORAGECLASS_NAME=scylladb-local-xfs}" export SO_SCYLLACLUSTER_STORAGECLASS_NAME +SO_SCYLLA_OPERATOR_LOGLEVEL="${SO_SCYLLA_OPERATOR_LOGLEVEL:-4}" +export SO_SCYLLA_OPERATOR_LOGLEVEL + SCYLLA_OPERATOR_FEATURE_GATES="${SCYLLA_OPERATOR_FEATURE_GATES:-AllAlpha=true,AllBeta=true}" export SCYLLA_OPERATOR_FEATURE_GATES diff --git a/hack/ci-deploy-release.sh b/hack/ci-deploy-release.sh index 3accfa37731..847d49c3643 100755 --- a/hack/ci-deploy-release.sh +++ b/hack/ci-deploy-release.sh @@ -53,6 +53,7 @@ for d in cert-manager{,-cainjector,-webhook}; do done wait-for-object-creation cert-manager secret/cert-manager-webhook-ca +# TODO: modify log level cat > "${ARTIFACTS_DEPLOY_DIR}/operator/kustomization.yaml" << EOF resources: - ${source_url}/${revision}/deploy/operator.yaml @@ -96,6 +97,7 @@ else echo "Skipping CSI driver creation" fi +# TODO: modify log level if [[ -z "${SO_SCYLLACLUSTER_STORAGECLASS_NAME+x}" ]]; then kubectl_create -n=scylla-manager -f="${source_url}/${revision}/deploy/manager-prod.yaml" elif [[ -n "${SO_SCYLLACLUSTER_STORAGECLASS_NAME}" ]]; then diff --git a/hack/ci-deploy.sh b/hack/ci-deploy.sh index d4dae040a9d..b897e7eba37 100755 --- a/hack/ci-deploy.sh +++ b/hack/ci-deploy.sh @@ -37,6 +37,12 @@ for f in $( find "${DEPLOY_DIR}"/ -type f -name '*.yaml' ); do sed -i -E -e "s~docker\.io/scylladb/scylla-operator:[^ @]+$~${OPERATOR_IMAGE_REF}~" "${f}" done +# TODO: Replace it with ScyllaOperatorConfig field when available. +if [[ -n "${SO_SCYLLA_OPERATOR_LOGLEVEL:-}" ]]; then + yq e --inplace '.spec.template.spec.containers[0].args += "--loglevel=" + env(SO_SCYLLA_OPERATOR_LOGLEVEL)' "${DEPLOY_DIR}/operator/50_operator.deployment.yaml" + yq e --inplace '.spec.template.spec.containers[0].args += "--loglevel=" + env(SO_SCYLLA_OPERATOR_LOGLEVEL)' "${DEPLOY_DIR}/manager/50_controller_deployment.yaml" +fi + yq e --inplace '.spec.template.spec.containers[0].args += ["--qps=200", "--burst=400"]' "${DEPLOY_DIR}/operator/50_operator.deployment.yaml" yq e --inplace '.spec.template.spec.containers[0].args += ["--crypto-key-buffer-size-min=3", "--crypto-key-buffer-size-max=6", "--crypto-key-buffer-delay=2s"]' "${DEPLOY_DIR}/operator/50_operator.deployment.yaml"