8000 Merge branch 'master' into pr/fixDosVS · nginx/kubernetes-ingress@6a8d9be · GitHub
[go: up one dir, main page]

Skip to content

Commit 6a8d9be

Browse files
authored
Merge branch 'master' into pr/fixDosVS
2 parents d3a3599 + c4d49db commit 6a8d9be

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ defaults:
3131
shell: bash
3232

3333
env:
34-
K8S_VERSION: 1.23.1
34+
K8S_VERSION: 1.23.3
3535
K8S_TIMEOUT: 75s
3636
HELM_CHART_DIR: deployments/helm-chart
3737
GIT_NAME: NGINX Kubernetes Team
@@ -166,7 +166,7 @@ jobs:
166166
{\"image\": \"opentracing-plus\", \"marker\": \"vsr\"}, \
167167
{\"image\": \"ubi-plus\", \"marker\": \"policies\"}]}"
168168
else
169-
echo "::set-output name=matrix::{\"k8s\": [\"1.19.11\", \"1.20.7\", \"1.21.2\", \"1.22.4\", \"1.23.1\"]}"
169+
echo "::set-output name=matrix::{\"k8s\": [\"1.19.11\", \"1.20.7\", \"1.21.2\", \"1.22.5\", \"1.23.3\"]}"
170170
fi
171171
172172
smoke-tests:

internal/nginx/manager.go

Lines changed: 2 additions & 2 deletions
307
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ func (lm *LocalManager) Start(done chan error) {
278278
glog.V(3).Info("Starting nginx")
279279

280280
binaryFilename := getBinaryFileName(lm.debug)
281-
cmd := exec.Command(binaryFilename)
281+
cmd := exec.Command(binaryFilename, "-e", "stderr") // #nosec G204
282282
cmd.Stdout = os.Stdout
283283
cmd.Stderr = os.Stderr
284284
if err := cmd.Start(); err != nil {
@@ -305,7 +305,7 @@ func (lm *LocalManager) Reload(isEndpointsUpdate bool) error {
305305
t1 := time.Now()
306306

307
binaryFilename := getBinaryFileName(lm.debug)
308-
if err := shellOut(fmt.Sprintf("%v -s %v", binaryFilename, "reload")); err != nil {
308+
if err := shellOut(fmt.Sprintf("%v -s %v -e stderr", binaryFilename, "reload")); err != nil {
309309
lm.metricsCollector.IncNginxReloadErrors()
310310
return fmt.Errorf("nginx reload failed: %w", err)
311311
}

0 commit comments

Comments
 (0)
0