Merge branch 'master' into pr/fixDosVS

nginx · Feb 24, 2022 · 6a8d9be · 6a8d9be
2 parents d3a3599 + c4d49db
commit 6a8d9be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ defaults:
     shell: bash
 
 env:
-  K8S_VERSION: 1.23.1
+  K8S_VERSION: 1.23.3
   K8S_TIMEOUT: 75s
   HELM_CHART_DIR: deployments/helm-chart
   GIT_NAME: NGINX Kubernetes Team
@@ -166,7 +166,7 @@ jobs:
                                                 {\"image\": \"opentracing-plus\", \"marker\": \"vsr\"}, \
                                                 {\"image\": \"ubi-plus\", \"marker\": \"policies\"}]}"
           else
-            echo "::set-output name=matrix::{\"k8s\": [\"1.19.11\", \"1.20.7\", \"1.21.2\", \"1.22.4\", \"1.23.1\"]}"
+            echo "::set-output name=matrix::{\"k8s\": [\"1.19.11\", \"1.20.7\", \"1.21.2\", \"1.22.5\", \"1.23.3\"]}"
           fi
 
   smoke-tests:

diff --git a/internal/nginx/manager.go b/internal/nginx/manager.go
@@ -278,7 +278,7 @@ func (lm *LocalManager) Start(done chan error) {
 	glog.V(3).Info("Starting nginx")
 
 	binaryFilename := getBinaryFileName(lm.debug)
-	cmd := exec.Command(binaryFilename)
+	cmd := exec.Command(binaryFilename, "-e", "stderr") // #nosec G204
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Start(); err != nil {
@@ -305,7 +305,7 @@ func (lm *LocalManager) Reload(isEndpointsUpdate bool) error {
 	t1 := time.Now()
 
 	binaryFilename := getBinaryFileName(lm.debug)
-	if err := shellOut(fmt.Sprintf("%v -s %v", binaryFilename, "reload")); err != nil {
+	if err := shellOut(fmt.Sprintf("%v -s %v -e stderr", binaryFilename, "reload")); err != nil {
 		lm.metricsCollector.IncNginxReloadErrors()
 		return fmt.Errorf("nginx reload failed: %w", err)
 	}