Skip to content
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

Jump to bottom

Fix：the chart value tuneSysctlConfig does not work #3988

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Fix：the chart value tuneSysctlConfig does not work #3988

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
1 change: 1 addition & 0 deletions charts/spiderpool/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ data:
{{- else}}
clusterSubnetDefaultFlexibleIPNumber: 0
{{- end }}
tuneSysctlConfig: {{ .Values.spiderpoolAgent.tuneSysctlConfig }}
{{- if .Values.multus.multusCNI.install }}
---
kind: ConfigMap
Expand Down
3 changes: 2 additions & 1 deletion test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,11 @@ endif
@ echo "wait for the cluster ready" ; \
TEST_IMAGE_NAME=$(TEST_IMAGE_NAME) \
RELEASE_NAMESPACE=$(RELEASE_NAMESPACE) \
E2E_IP_FAMILY=$(E2E_IP_FAMILY) \
MULTUS_DEFAULT_CNI_NAME=$(MULTUS_DEFAULT_CNI_VLAN0) \
E2E_CLUSTER_NAME=$(E2E_CLUSTER_NAME) \
INSTALL_OVERLAY_CNI=$(INSTALL_OVERLAY_CNI) \
scripts/installTestPod.sh $(E2E_KUBECONFIG)
scripts/preCheckClusterReady.sh $(E2E_KUBECONFIG)
@echo ""
@echo "-----------------------------------------------------------------------------------------------------"
@echo " ip family: $(E2E_IP_FAMILY)"
Expand Down
14 changes: 14 additions & 0 deletions test/scripts/installTestPod.sh → test/scripts/preCheckClusterReady.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,24 @@ CURRENT_DIR_PATH=$(cd $(dirname $0); pwd)
[ -z "$E2E_CLUSTER_NAME" ] && echo "error, miss E2E_CLUSTER_NAME " && exit 1
echo "$CURRENT_FILENAME : E2E_CLUSTER_NAME $E2E_CLUSTER_NAME "

[ -z "$E2E_IP_FAMILY" ] && echo "error, miss E2E_IP_FAMILY " && exit 1
echo "$CURRENT_FILENAME : E2E_IP_FAMILY $E2E_IP_FAMILY "

[ -z "$TEST_IMAGE_NAME" ] && echo "error, miss TEST_IMAGE_NAME" && exit 1
echo "$CURRENT_FILENAME : TEST_IMAGE_NAME $TEST_IMAGE_NAME "

echo "$CURRENT_FILENAME : E2E_KUBECONFIG $E2E_KUBECONFIG "
kind_nodes=$(kind get nodes --name ${E2E_CLUSTER_NAME})
[ -z "$kind_nodes" ] && echo "error, any kind nodes not found" && exit 1
for node in $kind_nodes; do
echo "preCheckClusterReady.sh: Check the sysctl config for the kind node: ${node}"
value=$(docker exec ${node} sysctl net.ipv4.conf.all.rp_filter | awk -F '=' '{print $2}' | tr -d ' ')
if [ "$value" != "0" ]; then
echo "error, net.ipv4.conf.all.rp_filter should be 0, but got $value"
exit 1
fi
echo "preCheckClusterReady.sh: sysctlConfig net.ipv4.conf.all.rp_filter for $node is expect $value"
done

docker pull ${TEST_IMAGE_NAME}
kind load docker-image ${TEST_IMAGE_NAME} --name $E2E_CLUSTER_NAME
Expand Down
Loading