Merge pull request #836 from frobware/NE-1071-api-bump

NE-1071: Default HAProxy maxconn value to 50000 for OCP 4.12)
openshift · Oct 23, 2022 · 362a3ec · 362a3ec
2 parents 232edb0 + b3044ac
commit 362a3ec
Show file tree

Hide file tree

Showing 16 changed files with 116 additions and 27 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/go-logr/zapr v1.2.3
 	github.com/google/go-cmp v0.5.8
 	github.com/kevinburke/go-bindata v3.11.0+incompatible
-	github.com/openshift/api v0.0.0-20221003191342-e2c96618934f
+	github.com/openshift/api v0.0.0-20221010164355-920c3651ba3f
 	github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
 	github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -541,8 +541,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=
-github.com/openshift/api v0.0.0-20221003191342-e2c96618934f h1:H8jFwVgDpC0Y23cq+8N6zelYmOkmwm4bdUttjKVDxN8=
-github.com/openshift/api v0.0.0-20221003191342-e2c96618934f/go.mod h1:JRz+ZvTqu9u7t6suhhPTacbFl5K65Y6rJbNM7HjWA3g=
+github.com/openshift/api v0.0.0-20221010164355-920c3651ba3f h1:jatN0nxy0dLfzevDe1NMO2mcb0/PeWKMrI2kXpHgGns=
+github.com/openshift/api v0.0.0-20221010164355-920c3651ba3f/go.mod h1:JRz+ZvTqu9u7t6suhhPTacbFl5K65Y6rJbNM7HjWA3g=
 github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea h1:7JbjIzWt3Q75ErY1PAZ+gCA+bErI6HSlpffHFmMMzqM=
 github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea/go.mod h1:+J8DqZC60acCdpYkwVy/KH4cudgWiFZRNOBeghCzdGA=
 github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b h1:LWwB7uN91G/JsMnZFd0+q6ZzAXlB4/oUOfpZWA585gw=

diff --git a/manifests/00-custom-resource-definition.yaml b/manifests/00-custom-resource-definition.yaml
@@ -1294,14 +1294,14 @@ spec:
                       connections but at the cost of additional system resources being
                       consumed. \n Permitted values are: empty, 0, -1, and the range
                       2000-2000000. \n If this field is empty or 0, the IngressController
-                      will use the default value of 20000, but the default is subject
+                      will use the default value of 50000, but the default is subject
                       to change in future releases. \n If the value is -1 then HAProxy
                       will dynamically compute a maximum value based on the available
                       ulimits in the running container. Selecting -1 (i.e., auto)
                       will result in a large value being computed (~520000 on OpenShift
                       >=4.10 clusters) and therefore each HAProxy process will incur
                       significant memory usage compared to the current default of
-                      20000. \n Setting a value that is greater than the current operating
+                      50000. \n Setting a value that is greater than the current operating
                       system limit will prevent the HAProxy process from starting.
                       \n If you choose a discrete value (e.g., 750000) and the router
                       pod is migrated to a new node, there's no guarantee that that

diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
diff --git a/vendor/github.com/openshift/api/config/v1/types_authentication.go b/vendor/github.com/openshift/api/config/v1/types_authentication.go
diff --git a/vendor/github.com/openshift/api/config/v1/types_feature.go b/vendor/github.com/openshift/api/config/v1/types_feature.go
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
diff --git a/vendor/github.com/openshift/api/machine/v1alpha1/register.go b/vendor/github.com/openshift/api/machine/v1alpha1/register.go
diff --git a/...r/github.com/openshift/api/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml b/...r/github.com/openshift/api/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml
diff --git a/...thub.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml b/...thub.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
diff --git a/vendor/github.com/openshift/api/operator/v1/types_ingress.go b/vendor/github.com/openshift/api/operator/v1/types_ingress.go
diff --git a/vendor/github.com/openshift/api/operator/v1/types_kubeapiserver.go b/vendor/github.com/openshift/api/operator/v1/types_kubeapiserver.go
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go