Merge branch 'main' into additional-service-fields

lucacome · web-flow · commit cb178bed4905 · 2022-05-09T13:28:05.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Check if Codegen changed
         run: |
           cd ../.. && mkdir -p github.com/nginxinc && mv kubernetes-ingress/kubernetes-ingress github.com/nginxinc/ && cd github.com/nginxinc/kubernetes-ingress
-          make update-codegen && git diff --name-only --exit-code pkg/**/zz_generated.deepcopy.go
+          make update-codegen && git diff --name-only --exit-code pkg/**
           cd ../../.. && mv github.com/nginxinc/kubernetes-ingress kubernetes-ingress/kubernetes-ingress
 
   binary:
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -31,8 +31,8 @@ FROM docker.io/library/nginx:1.21.6-alpine AS alpine
 
 RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
 	apk add --no-cache libcap libstdc++ \
-	# temp fix for CVE-2022-1271 and CVE-2022-22576
-	&& apk upgrade --no-cache xz-libs curl libcurl \
+	# temp fix for CVE-2022-1271, CVE-2022-22576 and CVE-2022-27404
+	&& apk upgrade --no-cache xz-libs curl libcurl freetype \
 	&& cp -av /tmp/ot/usr/local/lib/libopentracing.so* /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
 	&& cp -av /tmp/ot/usr/lib/nginx/modules/ngx_http_opentracing_module.so /usr/lib/nginx/modules/ \
 	&& ldconfig /usr/local/lib/
diff --git a/cmd/nginx-ingress/main.go b/cmd/nginx-ingress/main.go
@@ -212,6 +212,11 @@ func main() {
 	}
 	glog.Infof("Starting NGINX Ingress Controller %v PlusFlag=%v", versionInfo, *nginxPlus)
 
+	unparsed := flag.Args()
+	if unparsed != nil {
+		glog.Warningf("Ignoring unhandled arguments: %v", unparsed)
+	}
+
 	if startupCheckFn != nil {
 		err := startupCheckFn()
 		if err != nil {
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
