Cherry pick fcgi fix and release v1.9.4 (#10544)

* Fix fcgi configmap value parsing (#10528) * Tidy on cherrypick * Release v1.9.4

Author: rikatz

TAG

@@ -1 +1 @@
-v1.9.3
+v1.9.4

go.mod

@@ -45,7 +45,7 @@ require (
 )
 
 require (
-github.com/BurntSushi/toml v1.0.0 // indirect
+github.com/BurntSushi/toml v1.3.2 // indirect
 github.com/beorn7/perks v1.0.1 // indirect
 github.com/blang/semver/v4 v4.0.0 // indirect
 github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -102,7 +102,7 @@ require (
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 golang.org/x/mod v0.12.0 // indirect
 golang.org/x/net v0.17.0 // indirect
-golang.org/x/oauth2 v0.10.0 // indirect
+golang.org/x/oauth2 v0.12.0 // indirect
 golang.org/x/sys v0.13.0 // indirect
 golang.org/x/term v0.13.0 // indirect
 golang.org/x/text v0.13.0 // indirect

go.sum

@@ -32,8 +32,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
-github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -472,8 +472,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
-golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
+golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
+golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

go.work

@@ -1,6 +1,7 @@
-go 1.21.1
+go 1.21.3
 
 use (
 .
+./images/kube-webhook-certgen/rootfs
 ./magefiles
 )

go.work.sum

@@ -5,44 +5,57 @@ go 1.21.1
 require (
 github.com/onrik/logrus v0.9.0
 github.com/sirupsen/logrus v1.8.1
-github.com/spf13/cobra v1.1.3
-k8s.io/api v0.22.6
-k8s.io/apimachinery v0.22.6
-k8s.io/client-go v0.22.6
+github.com/spf13/cobra v1.7.0
+k8s.io/api v0.27.4
+k8s.io/apimachinery v0.27.4
+k8s.io/client-go v0.27.4
 k8s.io/kube-aggregator v0.22.6
 )
 
 require (
 github.com/davecgh/go-spew v1.1.1 // indirect
-github.com/evanphx/json-patch v4.11.0+incompatible // indirect
-github.com/go-logr/logr v0.4.0 // indirect
+github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+github.com/go-logr/logr v1.2.4 // indirect
+github.com/go-openapi/jsonpointer v0.19.6 // indirect
+github.com/go-openapi/jsonreference v0.20.1 // indirect
+github.com/go-openapi/swag v0.22.3 // indirect
 github.com/gogo/protobuf v1.3.2 // indirect
-github.com/golang/protobuf v1.5.2 // indirect
-github.com/google/go-cmp v0.5.5 // indirect
+github.com/golang/protobuf v1.5.3 // indirect
+github.com/google/gnostic v0.5.7-v3refs // indirect
+github.com/google/go-cmp v0.5.9 // indirect
 github.com/google/gofuzz v1.1.0 // indirect
-github.com/googleapis/gnostic v0.5.5 // indirect
-github.com/imdario/mergo v0.3.5 // indirect
-github.com/inconshreveable/mousetrap v1.0.0 // indirect
-github.com/json-iterator/go v1.1.11 // indirect
+github.com/google/uuid v1.3.0 // indirect
+github.com/imdario/mergo v0.3.16 // indirect
+github.com/inconshreveable/mousetrap v1.1.0 // indirect
+github.com/josharian/intern v1.0.0 // indirect
+github.com/json-iterator/go v1.1.12 // indirect
+github.com/kr/pretty v0.3.1 // indirect
+github.com/mailru/easyjson v0.7.7 // indirect
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-github.com/modern-go/reflect2 v1.0.1 // indirect
+github.com/modern-go/reflect2 v1.0.2 // indirect
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+github.com/onsi/ginkgo/v2 v2.12.0 // indirect
+github.com/onsi/gomega v1.27.10 // indirect
 github.com/pkg/errors v0.9.1 // indirect
 github.com/spf13/pflag v1.0.5 // indirect
+github.com/stretchr/testify v1.8.4 // indirect
 github.com/tidwall/gjson v1.14.0 // indirect
-golang.org/x/net v0.7.0 // indirect
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
-golang.org/x/sys v0.5.0 // indirect
-golang.org/x/term v0.5.0 // indirect
-golang.org/x/text v0.7.0 // indirect
-golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-google.golang.org/appengine v1.6.5 // indirect
-google.golang.org/protobuf v1.26.0 // indirect
+golang.org/x/net v0.17.0 // indirect
+golang.org/x/oauth2 v0.12.0 // indirect
+golang.org/x/sys v0.13.0 // indirect
+golang.org/x/term v0.13.0 // indirect
+golang.org/x/text v0.13.0 // indirect
+golang.org/x/time v0.3.0 // indirect
+google.golang.org/appengine v1.6.7 // indirect
+google.golang.org/protobuf v1.31.0 // indirect
 gopkg.in/inf.v0 v0.9.1 // indirect
 gopkg.in/yaml.v2 v2.4.0 // indirect
-gopkg.in/yaml.v3 v3.0.0 // indirect
-k8s.io/klog/v2 v2.9.0 // indirect
-k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
-k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
-sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-sigs.k8s.io/yaml v1.2.0 // indirect
+gopkg.in/yaml.v3 v3.0.1 // indirect
+k8s.io/klog/v2 v2.100.1 // indirect
+k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+sigs.k8s.io/yaml v1.3.0 // indirect
 )