Skip to content

Commit 1d4a5a9

Browse files
middlewarebizmiddlewarebiz
authored
Merge pull request #137 from corezoid/develop
add
2 parents bad3f69 + dc38e10 commit 1d4a5a9

10 files changed

Lines changed: 120 additions & 1 deletion

File tree

‎corezoid/CHANGELOG.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
## Changelog
22
https://doc.corezoid.com/docs/release-notes
33

4+
### Chart 0.24.7 [ Corezoid 6.10.2 ]
5+
6+
#### Applications versions:
7+
- capi - 8.7.1.1
8+
- mult - 3.6.1.1
9+
- web - 6.10.2
10+
- http-worker - 4.4.0.1
11+
- usercode - 9.2.0
12+
- worker - 5.5.1.1
13+
- syncapi - 3.8.1
14+
- web_superadm - 2.6.2
15+
- conf_agent_server - 2.9.1
16+
- limits - 2.5.1
17+
18+
#### Updated applications
19+
- No application version changes
20+
21+
#### New Features
22+
- Added proxy configuration support for http-worker subchart
23+
- Configurable proxy host and port via `global.http.proxy.enabled`, `global.http.proxy.host`, and `global.http.proxy.port`
24+
- Support for excluded hosts list via `global.http.proxy.excluded_hosts`
25+
- Proxy block is conditionally added to http_worker.config only when enabled
26+
427
### Chart 0.24.6 [ Corezoid 6.10.2 ]
528

629
#### Applications versions:

‎corezoid/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: corezoid
3-
version: "0.24.6"
3+
version: "0.24.7"
44
appVersion: "6.10.2"
55
description: Chart for Corezoid.
66
home: https://corezoid.com/

‎corezoid/charts/http-worker/templates/http-worker-configmap.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,21 @@ data:
244244
{http_worker, [
245245
{prometheus_metrics, {{ .Values.global.prometheus_metrics | default false }} },
246246
{worker_id, <<"">>},
247+
248+
{{- if and (hasKey .Values.global.http "proxy") (.Values.global.http.proxy.enabled) (.Values.global.http.proxy.host) (.Values.global.http.proxy.port) }}
249+
{proxy, [
250+
{host, "{{ .Values.global.http.proxy.host }}"},
251+
{port, {{ .Values.global.http.proxy.port }}},
252+
{excluded_hosts, [
253+
{{- if .Values.global.http.proxy.excluded_hosts }}
254+
{{- range $index, $item := .Values.global.http.proxy.excluded_hosts }}
255+
"{{ $item.host }}"{{ if ne (add1 $index) (len $.Values.global.http.proxy.excluded_hosts) }},{{ end }}
256+
{{- end }}
257+
{{- end }}
258+
]}
259+
]},
260+
{{- end }}
261+
247262
{max_keep_alive_connections_len, {{ .Values.global.http.max_keep_alive_connections_len | default "0" }} }, %% use for poolling keep-alive connections. If zerro it'll open new connection each query
248263
{blocked_domains, [
249264
{{- range .Values.global.http.blocked_domains }}

‎corezoid/charts/http-worker/templates/http-worker-deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,24 @@ spec:
128128
RETRY_COUNT=0
129129
until wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ | grep -qF "conf_agent_direct"; do
130130
RETRY_COUNT=$((RETRY_COUNT + 1))
131+
if [ $RETRY_COUNT -eq 1 ] || [ $RETRY_COUNT -eq 10 ]; then
132+
echo "DEBUG: Fetching exchanges list from RabbitMQ API..."
133+
RESPONSE=$(wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ 2>&1)
134+
if [ $? -eq 0 ]; then
135+
echo "API Response (first 500 chars): ${RESPONSE:0:500}"
136+
else
137+
echo "ERROR: Failed to fetch exchanges. Response: $RESPONSE"
138+
fi
139+
fi
131140
if [ $RETRY_COUNT -gt $MAX_RETRIES ]; then
132141
echo "ERROR: Timeout waiting for exchange 'conf_agent_direct'"
133142
echo "Please check:"
134143
echo "1. RabbitMQ load definitions are properly configured"
135144
echo "2. User $MQ_USERNAME has access to vhost /conveyor"
136145
echo "3. Exchange 'conf_agent_direct' is created"
146+
echo ""
147+
echo "Final API check:"
148+
wget -O - --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/
137149
exit 1
138150
fi
139151
echo "Attempt $RETRY_COUNT/$MAX_RETRIES: waiting for exchanges to be ready...";

‎corezoid/charts/limits/templates/limits-deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,24 @@ spec:
135135
RETRY_COUNT=0
136136
until wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ | grep -qF "conf_agent_direct"; do
137137
RETRY_COUNT=$((RETRY_COUNT + 1))
138+
if [ $RETRY_COUNT -eq 1 ] || [ $RETRY_COUNT -eq 10 ]; then
139+
echo "DEBUG: Fetching exchanges list from RabbitMQ API..."
140+
RESPONSE=$(wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ 2>&1)
141+
if [ $? -eq 0 ]; then
142+
echo "API Response (first 500 chars): ${RESPONSE:0:500}"
143+
else
144+
echo "ERROR: Failed to fetch exchanges. Response: $RESPONSE"
145+
fi
146+
fi
138147
if [ $RETRY_COUNT -gt $MAX_RETRIES ]; then
139148
echo "ERROR: Timeout waiting for exchange 'conf_agent_direct'"
140149
echo "Please check:"
141150
echo "1. RabbitMQ load definitions are properly configured"
142151
echo "2. User $MQ_USERNAME has access to vhost /conveyor"
143152
echo "3. Exchange 'conf_agent_direct' is created"
153+
echo ""
154+
echo "Final API check:"
155+
wget -O - --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/
144156
exit 1
145157
fi
146158
echo "Attempt $RETRY_COUNT/$MAX_RETRIES: waiting for exchanges to be ready...";

‎corezoid/charts/mult/templates/mult-deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,24 @@ spec:
117117
RETRY_COUNT=0
118118
until wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ | grep -qF "conf_agent_direct"; do
119119
RETRY_COUNT=$((RETRY_COUNT + 1))
120+
if [ $RETRY_COUNT -eq 1 ] || [ $RETRY_COUNT -eq 10 ]; then
121+
echo "DEBUG: Fetching exchanges list from RabbitMQ API..."
122+
RESPONSE=$(wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ 2>&1)
123+
if [ $? -eq 0 ]; then
124+
echo "API Response (first 500 chars): ${RESPONSE:0:500}"
125+
else
126+
echo "ERROR: Failed to fetch exchanges. Response: $RESPONSE"
127+
fi
128+
fi
120129
if [ $RETRY_COUNT -gt $MAX_RETRIES ]; then
121130
echo "ERROR: Timeout waiting for exchange 'conf_agent_direct'"
122131
echo "Please check:"
123132
echo "1. RabbitMQ load definitions are properly configured"
124133
echo "2. User $MQ_USERNAME has access to vhost /conveyor"
125134
echo "3. Exchange 'conf_agent_direct' is created"
135+
echo ""
136+
echo "Final API check:"
137+
wget -O - --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/
126138
exit 1
127139
fi
128140
echo "Attempt $RETRY_COUNT/$MAX_RETRIES: waiting for exchanges to be ready...";

‎corezoid/charts/syncapi/templates/syncapi-deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,24 @@ spec:
9999
RETRY_COUNT=0
100100
until wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ | grep -qF "conf_agent_direct"; do
101101
RETRY_COUNT=$((RETRY_COUNT + 1))
102+
if [ $RETRY_COUNT -eq 1 ] || [ $RETRY_COUNT -eq 10 ]; then
103+
echo "DEBUG: Fetching exchanges list from RabbitMQ API..."
104+
RESPONSE=$(wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ 2>&1)
105+
if [ $? -eq 0 ]; then
106+
echo "API Response (first 500 chars): ${RESPONSE:0:500}"
107+
else
108+
echo "ERROR: Failed to fetch exchanges. Response: $RESPONSE"
109+
fi
110+
fi
102111
if [ $RETRY_COUNT -gt $MAX_RETRIES ]; then
103112
echo "ERROR: Timeout waiting for exchange 'conf_agent_direct'"
104113
echo "Please check:"
105114
echo "1. RabbitMQ load definitions are properly configured"
106115
echo "2. User $MQ_USERNAME has access to vhost /conveyor"
107116
echo "3. Exchange 'conf_agent_direct' is created"
117+
echo ""
118+
echo "Final API check:"
119+
wget -O - --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/
108120
exit 1
109121
fi
110122
echo "Attempt $RETRY_COUNT/$MAX_RETRIES: waiting for exchanges to be ready...";

‎corezoid/charts/usercode/templates/usercode-deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,24 @@ spec:
126126
RETRY_COUNT=0
127127
until wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ | grep -qF "conf_agent_direct"; do
128128
RETRY_COUNT=$((RETRY_COUNT + 1))
129+
if [ $RETRY_COUNT -eq 1 ] || [ $RETRY_COUNT -eq 10 ]; then
130+
echo "DEBUG: Fetching exchanges list from RabbitMQ API..."
131+
RESPONSE=$(wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ 2>&1)
132+
if [ $? -eq 0 ]; then
133+
echo "API Response (first 500 chars): ${RESPONSE:0:500}"
134+
else
135+
echo "ERROR: Failed to fetch exchanges. Response: $RESPONSE"
136+
fi
137+
fi
129138
if [ $RETRY_COUNT -gt $MAX_RETRIES ]; then
130139
echo "ERROR: Timeout waiting for exchange 'conf_agent_direct'"
131140
echo "Please check:"
132141
echo "1. RabbitMQ load definitions are properly configured"
133142
echo "2. User $MQ_USERNAME has access to vhost /conveyor"
134143
echo "3. Exchange 'conf_agent_direct' is created"
144+
echo ""
145+
echo "Final API check:"
146+
wget -O - --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/
135147
exit 1
136148
fi
137149
echo "Attempt $RETRY_COUNT/$MAX_RETRIES: waiting for exchanges to be ready...";

‎corezoid/charts/worker/templates/worker-deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,24 @@ spec:
127127
RETRY_COUNT=0
128128
until wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ | grep -qF "conf_agent_direct"; do
129129
RETRY_COUNT=$((RETRY_COUNT + 1))
130+
if [ $RETRY_COUNT -eq 1 ] || [ $RETRY_COUNT -eq 10 ]; then
131+
echo "DEBUG: Fetching exchanges list from RabbitMQ API..."
132+
RESPONSE=$(wget -O - -q --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/ 2>&1)
133+
if [ $? -eq 0 ]; then
134+
echo "API Response (first 500 chars): ${RESPONSE:0:500}"
135+
else
136+
echo "ERROR: Failed to fetch exchanges. Response: $RESPONSE"
137+
fi
138+
fi
130139
if [ $RETRY_COUNT -gt $MAX_RETRIES ]; then
131140
echo "ERROR: Timeout waiting for exchange 'conf_agent_direct'"
132141
echo "Please check:"
133142
echo "1. RabbitMQ load definitions are properly configured"
134143
echo "2. User $MQ_USERNAME has access to vhost /conveyor"
135144
echo "3. Exchange 'conf_agent_direct' is created"
145+
echo ""
146+
echo "Final API check:"
147+
wget -O - --header "Authorization: Basic `echo -n \"$MQ_USERNAME:$MQ_PASSWORD\" | base64`" ${MQ_API_SCHEME}://$TARGET_HOST:${MQ_API_PORT}/api/exchanges/%2Fconveyor/
136148
exit 1
137149
fi
138150
echo "Attempt $RETRY_COUNT/$MAX_RETRIES: waiting for exchanges to be ready...";

‎corezoid/values.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,15 @@ global:
562562
blocked_domains:
563563
- "169.254.169.254"
564564
- "mail.ru"
565+
# Proxy configuration for http-worker
566+
# proxy:
567+
# enabled: false
568+
# host: "proxy.example.com"
569+
# port: 3128
570+
# excluded_hosts:
571+
# - host: "localhost"
572+
# - host: "127.0.0.1"
573+
# - host: "internal.example.com"
565574
tune:
566575
http_consumer_queues_count: 8
567576
## The specified number of tcp connections will be created for each queue

0 commit comments

Comments
 (0)