Skip to content

feat: enable real ip forawrding #5

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
Dallas98 merged 2 commits into from
Mar 26, 2026
Merged

feat: enable real ip forawrding #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9bf2fc
feat: add switch to enable real-ip forwarding
MoeexT Mar 25, 2026
ec10239
feat: set DataMate branch
MoeexT Mar 25, 2026
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 .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
owner: ModelEngine-Group
repository: 'DataMate'
access-token: ${{ secrets.ACCESS_TOKEN }}
branch: 'add-oms-authentication'

- name: DataMate Package
run: |
Expand Down
12 changes: 10 additions & 2 deletions tools/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ SKIP_LOAD=false
INSTALL_MILVUS=true
INSTALL_LABEL_STUDIO=true
EXECUTE_HAPROXY=true
REAL_IP_MODE=proxy_protocol


# --- 脚本内部变量 ---
Expand Down Expand Up @@ -126,6 +127,10 @@ function read_value() {
sed -i "s/type: ClusterIP/type: NodePort/g" "$VALUES_FILE"
sed -i "s/^\(\s*nodePort:\s*\).*/\1${NODE_PORT}/" "$VALUES_FILE"
fi

if [ -n "${REAL_IP_MODE}" ]; then
sed -i "/- name: REAL_IP_MODE/{n;s/value: \".*\"/value: \"$REAL_IP_MODE\"/}" "$VALUES_FILE"
fi
}

function read_storage_value() {
Expand Down Expand Up @@ -264,7 +269,8 @@ function add_nginx_route_to_haproxy() {
nginx_service_ip=$(kubectl get svc datamate-frontend -n "${NAMESPACE}" -o=jsonpath='{.spec.clusterIP}')

## 更新 datamate 转发规则, 保存到 cluster_info_new.json
if ! python3 "${UTILS_PATH}"/config_haproxy.py update -n "${NAMESPACE}" -p "${PORT}" -b "${nginx_service_ip}" -a "${ADDRESS_TYPE}" -P "3000" -m "datamate"; then
if ! python3 "${UTILS_PATH}"/config_haproxy.py update -n "${NAMESPACE}" -p "${PORT}" -b "${nginx_service_ip}" \
-a "${ADDRESS_TYPE}" -P "3000" -m "datamate" --real-ip-mode "${REAL_IP_MODE}"; then
log_error "Add nginx route to haproxy failed"
exit 1
fi
Expand All @@ -277,7 +283,8 @@ function add_label_studio_route_to_haproxy() {
label_studio_service_ip=$(kubectl get svc label-studio -n "${NAMESPACE}" -o=jsonpath='{.spec.clusterIP}')

## 更新 datamate 转发规则, 保存到 cluster_info_new.json
if ! python3 "${UTILS_PATH}"/config_haproxy.py update -n "${NAMESPACE}" -p $((PORT + 1)) -b "${label_studio_service_ip}" -a "${ADDRESS_TYPE}" -P "8000" -m "label-studio"; then
if ! python3 "${UTILS_PATH}"/config_haproxy.py update -n "${NAMESPACE}" -p $((PORT + 1)) -b "${label_studio_service_ip}" \
-a "${ADDRESS_TYPE}" -P "8000" -m "label-studio" --real-ip-mode "${REAL_IP_MODE}"; then
log_error "Add label studio route to haproxy failed"
exit 1
fi
Expand Down Expand Up @@ -309,6 +316,7 @@ function main() {
--package) PACKAGE_PATH="$2"; shift 2 ;;
--skip-haproxy) EXECUTE_HAPROXY=false; shift ;;
--node-port) NODE_PORT="$2"; shift 2 ;;
--real-ip-mode) REAL_IP_MODE="$2"; shift 2 ;;
-h|--help) print_help "${SCRIPT_PATH}"; exit 0 ;;
*) log_info "错误: 未知参数: $1"; shift ;;
esac
Expand Down
16 changes: 10 additions & 6 deletions tools/utils/config_haproxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def get_json_data(self):
return None

def update_haproxy_data(self, namespace, current_haproxy, front_ip, front_port, backend_ip, backend_port,
address_type, module_name):
address_type, module_name, real_ip_mode):
# 将当前配置分割成行
lines = current_haproxy.splitlines()
updated_lines = []
Expand Down Expand Up @@ -123,6 +123,7 @@ def update_haproxy_data(self, namespace, current_haproxy, front_ip, front_port,

# 添加新配置到文件末尾
logger.info(f'在文件末尾添加新的配置')
send_proxy = " send-proxy" if real_ip_mode == "proxy_protocol" else ""
if address_type == "management":
if front_ip is None:
front_ip = '{{.ApisvrFrontVIP}}'
Expand All @@ -138,7 +139,7 @@ def update_haproxy_data(self, namespace, current_haproxy, front_ip, front_port,
f" default-server inter 2s downinter 5s rise 2 fall 2 slowstart 60s maxconn 2000 maxqueue"
f" 200 weight 100",
f" balance roundrobin",
f" server app0 {backend_ip}:{backend_port}",
f" server app0 {backend_ip}:{backend_port}{send_proxy}",
f" mode tcp",
f"{section_end}",
])
Expand All @@ -157,7 +158,7 @@ def update_haproxy_data(self, namespace, current_haproxy, front_ip, front_port,
f" default-server inter 2s downinter 5s rise 2 fall 2 slowstart 60s maxconn 2000 maxqueue"
f" 200 weight 100",
f" balance roundrobin",
f" server app0 {backend_ip}:{backend_port}",
f" server app0 {backend_ip}:{backend_port}{send_proxy}",
f" mode tcp",
f"{section_end}",
])
Expand All @@ -166,7 +167,8 @@ def update_haproxy_data(self, namespace, current_haproxy, front_ip, front_port,
new_haproxy_content = '\n'.join(updated_lines)
return new_haproxy_content

def update(self, namespace, front_ip, front_port, backend_ip, backend_port, address_type, module_name):
def update(self, namespace, front_ip, front_port, backend_ip, backend_port, address_type, module_name,
real_ip_mode):
if not self.dump():
logger.error("dump cluster info failed.")
return False
Expand All @@ -179,7 +181,7 @@ def update(self, namespace, front_ip, front_port, backend_ip, backend_port, addr

# 更新 haproxy 配置数据
new_haproxy_content = self.update_haproxy_data(namespace, current_haproxy, front_ip, front_port, backend_ip,
backend_port, address_type, module_name)
backend_port, address_type, module_name, real_ip_mode)

# 更新配置数据
config_data['data']['haproxy'] = new_haproxy_content
Expand Down Expand Up @@ -273,6 +275,8 @@ def parse_args():
parser_obj.add_argument('-a', '--address-type', dest="address_type", default="management", type=str,
help='use management id or business ip')
parser_obj.add_argument('-m', '--module', required=False, default="datamate", type=str, help='module name')
parser_obj.add_argument('--real-ip-mode', required=False, default="off", type=str,
help='enable forwarding real ip')

return parser.parse_args()

Expand All @@ -282,7 +286,7 @@ def parse_args():
operator = ClusterInfoOperator()
if args.command == 'update':
operator.update(args.namespace, args.frontend_ip, args.frontend_port, args.backend_ip, args.backend_port,
address_type=args.address_type, module_name=args.module)
address_type=args.address_type, module_name=args.module, real_ip_mode=args.real_ip_mode)
operator.clear()
else:
print("Illegal command!")
Loading