diff --git a/config/crd/bases/cluster.ytsaurus.tech_offshoredatagateways.yaml b/config/crd/bases/cluster.ytsaurus.tech_offshoredatagateways.yaml index f56b68a44..e3fa8a49f 100644 --- a/config/crd/bases/cluster.ytsaurus.tech_offshoredatagateways.yaml +++ b/config/crd/bases/cluster.ytsaurus.tech_offshoredatagateways.yaml @@ -801,9 +801,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/config/crd/bases/cluster.ytsaurus.tech_remotedatanodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remotedatanodes.yaml index 86cf507a8..8fe2ce9a5 100644 --- a/config/crd/bases/cluster.ytsaurus.tech_remotedatanodes.yaml +++ b/config/crd/bases/cluster.ytsaurus.tech_remotedatanodes.yaml @@ -799,9 +799,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml index eb3c7f003..9bf800273 100644 --- a/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml +++ b/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml @@ -799,9 +799,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/config/crd/bases/cluster.ytsaurus.tech_remotetabletnodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remotetabletnodes.yaml index 8fe24c539..5dbda1a9a 100644 --- a/config/crd/bases/cluster.ytsaurus.tech_remotetabletnodes.yaml +++ b/config/crd/bases/cluster.ytsaurus.tech_remotetabletnodes.yaml @@ -799,9 +799,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/config/crd/bases/cluster.ytsaurus.tech_remoteytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_remoteytsaurus.yaml index 28c691ce2..1ee3d9b01 100644 --- a/config/crd/bases/cluster.ytsaurus.tech_remoteytsaurus.yaml +++ b/config/crd/bases/cluster.ytsaurus.tech_remoteytsaurus.yaml @@ -741,9 +741,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml index 13ffae011..70e850f4f 100644 --- a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml +++ b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml @@ -807,9 +807,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -2718,9 +2721,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -4578,9 +4584,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -6443,9 +6452,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -8317,9 +8329,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -9479,9 +9494,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -10220,9 +10238,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -12355,9 +12376,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -14281,9 +14305,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -16154,9 +16181,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -18099,9 +18129,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -19984,9 +20017,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -21840,9 +21876,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -23705,9 +23744,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -25612,9 +25654,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -27479,9 +27524,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -28694,9 +28742,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -29506,9 +29557,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -31371,9 +31425,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -33253,9 +33310,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -34477,9 +34537,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -35482,9 +35545,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/go.mod b/go.mod index 7adf1d7da..91a4e82f7 100644 --- a/go.mod +++ b/go.mod @@ -15,10 +15,12 @@ require ( github.com/stretchr/testify v1.10.0 go.uber.org/mock v0.5.0 go.uber.org/zap v1.27.0 + go.ytsaurus.tech/library/go/core/log v0.0.4 go.ytsaurus.tech/yt/go v0.0.29 - k8s.io/api v0.31.13 - k8s.io/apimachinery v0.31.13 - k8s.io/client-go v0.31.13 + k8s.io/api v0.32.10 + k8s.io/apimachinery v0.32.10 + k8s.io/client-go v0.32.10 + k8s.io/component-helpers v0.32.10 k8s.io/utils v0.0.0-20241210054802-24370beab758 sigs.k8s.io/controller-runtime v0.19.7 sigs.k8s.io/yaml v1.4.0 @@ -35,20 +37,18 @@ require ( github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/go-openapi/jsonpointer v0.20.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.4 // indirect - github.com/go-openapi/swag v0.22.7 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect github.com/google/tink/go v1.7.0 // indirect - github.com/imdario/mergo v0.3.16 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.18.0 // indirect @@ -74,7 +74,6 @@ require ( go.yaml.in/yaml/v3 v3.0.4 // indirect go.ytsaurus.tech/library/go/blockcodecs v0.0.3 // indirect go.ytsaurus.tech/library/go/core/buildinfo v0.0.0-20250809130132-fa050e73ac17 // indirect - go.ytsaurus.tech/library/go/core/log v0.0.4 // indirect go.ytsaurus.tech/library/go/core/xerrors v0.0.4 // indirect go.ytsaurus.tech/library/go/ptr v0.0.2 // indirect go.ytsaurus.tech/library/go/x/xreflect v0.0.3 // indirect @@ -93,12 +92,11 @@ require ( google.golang.org/protobuf v1.36.8 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.31.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect sigs.k8s.io/gateway-api v1.0.0 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect ) diff --git a/go.sum b/go.sum index 950309673..de91a43cb 100644 --- a/go.sum +++ b/go.sum @@ -32,20 +32,18 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= -github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= -github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU= github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4= -github.com/go-openapi/swag v0.22.7 h1:JWrc1uc/P9cSomxfnsFSVWoE1FW6bNbrVPmpQYpCcR8= -github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= @@ -64,8 +62,6 @@ github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w= github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -218,32 +214,31 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.13 h1:sco9Cq2pY4Ysv9qZiWzcR97MmA/35nwYQ/VCTzOcWmc= -k8s.io/api v0.31.13/go.mod h1:4D8Ry8RqqLDemNLwGYC6v5wOy51N7hitr4WQ6oSWfLY= +k8s.io/api v0.32.10 h1:ocp4turNfa1V40TuBW/LuA17TeXG9g/GI2ebg0KxBNk= +k8s.io/api v0.32.10/go.mod h1:AsMsc4b6TuampYqgMEGSv0HBFpRS4BlKTXAVCAa7oF4= k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= -k8s.io/apimachinery v0.31.13 h1:rkG0EiBkBkEzURo/8dKGx/oBF202Z2LqHuSD8Cm3bG4= -k8s.io/apimachinery v0.31.13/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/client-go v0.31.13 h1:Q0LG51uFbzNd9fzIj5ilA0Sm1wUholHvDaNwVKzqdCA= -k8s.io/client-go v0.31.13/go.mod h1:UB4yTzQeRAv+vULOKp2jdqA5LSwV55bvc3RQ5tM48LM= +k8s.io/apimachinery v0.32.10 h1:SAg2kUPLYRcBJQj66oniP1BnXSqw+l1GvJFsJlBmVvQ= +k8s.io/apimachinery v0.32.10/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/client-go v0.32.10 h1:MFmIjsKtcnn7mStjrJG1ZW2WzLsKKn6ZtL9hHM/W0xU= +k8s.io/client-go v0.32.10/go.mod h1:qJy/Ws3zSwnu/nD75D+/of1uxbwWHxrYT5P3FuobVLI= +k8s.io/component-helpers v0.32.10 h1:hMdA0wF5GkUAqjtY/d4y5WJK1OqvdAA0xREL1OceXS0= +k8s.io/component-helpers v0.32.10/go.mod h1:bSxQeNzLYUrll2RFtkVTXKFnjVrgb5OWSIgW4rECOus= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.19.7 h1:DLABZfMr20A+AwCZOHhcbcu+TqBXnJZaVBri9K3EO48= sigs.k8s.io/controller-runtime v0.19.7/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/gateway-api v1.0.0 h1:iPTStSv41+d9p0xFydll6d7f7MOBGuqXM6p2/zVYMAs= sigs.k8s.io/gateway-api v1.0.0/go.mod h1:4cUgr0Lnp5FZ0Cdq8FdRwCvpiWws7LVhLHGIudLlf4c= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/testutil/spec_builders.go b/pkg/testutil/spec_builders.go index 3c7fa4d17..5713e54a5 100644 --- a/pkg/testutil/spec_builders.go +++ b/pkg/testutil/spec_builders.go @@ -170,6 +170,31 @@ var ( masterVolumeSize = resource.MustParse("5Gi") dataNodeVolumeSize = resource.MustParse("10Gi") execNodeVolumeSize = resource.MustParse("5Gi") + + defaultNodeResources = corev1.ResourceRequirements{ + Requests: corev1.ResourceList{ + corev1.ResourceCPU: resource.MustParse("0"), + corev1.ResourceMemory: resource.MustParse("0"), + }, + Limits: corev1.ResourceList{ + corev1.ResourceCPU: resource.MustParse("1"), + corev1.ResourceMemory: resource.MustParse("2Gi"), + }, + } + dataNodeResources = defaultNodeResources + tabletNodeResources = defaultNodeResources + execNodeResources = defaultNodeResources + + execNodeJobResources = corev1.ResourceRequirements{ + Requests: corev1.ResourceList{ + corev1.ResourceCPU: resource.MustParse("0"), + corev1.ResourceMemory: resource.MustParse("0"), + }, + Limits: corev1.ResourceList{ + corev1.ResourceCPU: resource.MustParse("4"), + corev1.ResourceMemory: resource.MustParse("8Gi"), + }, + } ) type YtsaurusBuilder struct { @@ -237,6 +262,7 @@ func (b *YtsaurusBuilder) CreateMinimal() { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, }, @@ -247,6 +273,7 @@ func (b *YtsaurusBuilder) CreateMinimal() { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Locations: []ytv1.LocationSpec{ { LocationType: "MasterChangelogs", @@ -350,6 +377,7 @@ func (b *YtsaurusBuilder) WithMasterCaches() { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, } @@ -405,6 +433,7 @@ func (b *YtsaurusBuilder) WithScheduler() { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, } @@ -415,6 +444,7 @@ func (b *YtsaurusBuilder) WithControllerAgents() { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, } @@ -443,6 +473,7 @@ func (b *YtsaurusBuilder) WithQueryTracker() { Image: ptr.To(b.Images.QueryTracker), InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, } @@ -454,6 +485,7 @@ func (b *YtsaurusBuilder) WithYqlAgent() { Image: ptr.To(b.Images.QueryTracker), InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, } @@ -469,6 +501,7 @@ func (b *YtsaurusBuilder) WithQueueAgent() { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), Image: ptr.To(image), }, @@ -489,6 +522,7 @@ func (b *YtsaurusBuilder) CreateHTTPProxiesSpec() ytv1.HTTPProxiesSpec { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, HttpNodePort: getPortFromEnv("E2E_HTTP_PROXY_INTERNAL_PORT"), @@ -502,6 +536,7 @@ func (b *YtsaurusBuilder) CreateRPCProxiesSpec() ytv1.RPCProxiesSpec { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *defaultNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), }, NodePort: getPortFromEnv("E2E_RPC_PROXY_INTERNAL_PORT"), @@ -525,6 +560,7 @@ func (b *YtsaurusBuilder) CreateExecNodeSpec() ytv1.ExecNodesSpec { InstanceSpec: ytv1.InstanceSpec{ InstanceCount: 1, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *execNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), Locations: []ytv1.LocationSpec{ { @@ -546,6 +582,7 @@ func (b *YtsaurusBuilder) CreateExecNodeSpec() ytv1.ExecNodesSpec { }, }, }, + JobResources: execNodeJobResources.DeepCopy(), } } @@ -555,7 +592,6 @@ func (b *YtsaurusBuilder) SetupCRIJobEnvironment(node *ytv1.ExecNodesSpec) { Path: "/yt/node-data/image-cache", }) node.JobEnvironment = &ytv1.JobEnvironmentSpec{ - UserSlots: ptr.To(4), CRI: &ytv1.CRIJobEnvironmentSpec{ CRIService: b.CRIService, SandboxImage: b.SandboxImage, @@ -582,6 +618,7 @@ func (b *YtsaurusBuilder) CreateDataNodeInstanceSpec(instanceCount int32) ytv1.I return ytv1.InstanceSpec{ InstanceCount: instanceCount, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *dataNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), Locations: []ytv1.LocationSpec{ { @@ -605,6 +642,7 @@ func (b *YtsaurusBuilder) CreateTabletNodeSpec(instanceCount int32) ytv1.Instanc return ytv1.InstanceSpec{ InstanceCount: instanceCount, MinReadyInstanceCount: b.MinReadyInstanceCount, + Resources: *tabletNodeResources.DeepCopy(), Loggers: b.CreateLoggersSpec(), } } diff --git a/test/e2e/helpers_test.go b/test/e2e/helpers_test.go index 9d50439d3..aa535e61f 100644 --- a/test/e2e/helpers_test.go +++ b/test/e2e/helpers_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/types" + "k8s.io/component-helpers/resource" "k8s.io/utils/ptr" ctrlcli "sigs.k8s.io/controller-runtime/pkg/client" @@ -53,6 +54,44 @@ func getKindControlPlaneNode(ctx context.Context) corev1.Node { return nodeList.Items[0] } +func logNodesState(ctx context.Context) { + var nodes corev1.NodeList + var pods corev1.PodList + Expect(k8sClient.List(ctx, &nodes)).Should(Succeed()) + Expect(k8sClient.List(ctx, &pods)).Should(Succeed()) + for _, node := range nodes.Items { + available := node.Status.Allocatable.DeepCopy() + for _, pod := range pods.Items { + if pod.Spec.NodeName != node.Name { + continue + } + requests := resource.PodRequests(&pod, resource.PodResourcesOptions{}) + log.Info("Pod", + "namespace", pod.Namespace, + "name", pod.Name, + "qosClass", pod.Status.QOSClass, + "phase", pod.Status.Phase, + "reason", pod.Status.Reason, + "message", pod.Status.Message, + "requests", requests, + ) + if pod.Status.Phase == corev1.PodSucceeded || pod.Status.Phase == corev1.PodFailed { + continue + } + for k, v := range requests { + res := available[k] + res.Sub(v) + available[k] = res + } + } + log.Info("Node", + "name", node.Name, + "allocatable", node.Status.Allocatable, + "available", available, + ) + } +} + func getNodesAddresses(ctx context.Context) []string { var nodes corev1.NodeList Expect(k8sClient.List(ctx, &nodes)).Should(Succeed()) @@ -556,23 +595,36 @@ func discoverProxies(httpClient *http.Client, proxyAddress string, params url.Va return proxies.Proxies } -func fetchFailedPods(ctx context.Context, namespace string) []string { +func fetchStuckPods(ctx context.Context, namespace string) (pending, failed []string) { podList := corev1.PodList{} err := k8sClient.List(ctx, &podList, ctrlcli.InNamespace(namespace)) Expect(err).Should(Succeed()) - var failedPods []string for _, pod := range podList.Items { - if pod.Status.Phase != corev1.PodFailed { + switch pod.Status.Phase { + case corev1.PodPending: + pending = append(pending, pod.Name) + case corev1.PodFailed: + failed = append(failed, pod.Name) + default: continue } - failedPods = append(failedPods, pod.Name) - log.Info("Failed pod", - "pod", pod.Name, + + requests := resource.PodRequests(&pod, resource.PodResourcesOptions{}) + log.Info("Pod", + "name", pod.Name, + "phase", pod.Status.Phase, "message", pod.Status.Message, "reason", pod.Status.Reason, + "requests", requests, + "nodeName", pod.Spec.NodeName, + "conditions", pod.Status.Conditions, ) + if pod.Status.Phase != corev1.PodFailed { + continue + } + logRequest := clientset.CoreV1().Pods(namespace).GetLogs(pod.Name, &corev1.PodLogOptions{ Timestamps: true, TailLines: ptr.To[int64](20), @@ -588,7 +640,7 @@ func fetchFailedPods(ctx context.Context, namespace string) []string { Expect(err).To(Succeed()) } - return failedPods + return pending, failed } func pullImages(ctx context.Context, namaspace string, images []string, timeout time.Duration) { diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index f60eb6d1b..d25d2a04b 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -160,6 +160,10 @@ var _ = SynchronizedBeforeSuite(func(ctx context.Context) []byte { clientset, err = kubernetes.NewForConfig(cfg) Expect(err).NotTo(HaveOccurred()) Expect(clientset).NotTo(BeNil()) + + By("Logging nodes state", func() { + logNodesState(ctx) + }) }) func ShouldPreserveArtifacts() bool { diff --git a/test/e2e/ytsaurus_controller_test.go b/test/e2e/ytsaurus_controller_test.go index c3840ce72..ce31b99a7 100644 --- a/test/e2e/ytsaurus_controller_test.go +++ b/test/e2e/ytsaurus_controller_test.go @@ -56,6 +56,9 @@ const ( chytBootstrapTimeout = time.Minute * 5 + operationCPULimit = 1 + operationMemoryLimit = 256 << 20 + operationPollInterval = time.Millisecond * 250 operationTimeout = time.Second * 120 lightRequestTimeout = time.Minute * 2 @@ -224,6 +227,10 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func() } BeforeEach(func(ctx context.Context) { + By("Logging nodes state", func() { + logNodesState(ctx) + }) + By("Creating namespace") currentSpec := CurrentSpecReport() namespaceObject := corev1.Namespace{ @@ -367,9 +374,12 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func() })) DeferCleanup(AttachProgressReporterWithContext(specCtx, func(ctx context.Context) string { - failedPods := fetchFailedPods(ctx, namespace) - if len(failedPods) != 0 { - return fmt.Sprintf("Failed pods: %v", failedPods) + pending, failed := fetchStuckPods(specCtx, namespace) + if len(pending) != 0 { + logNodesState(specCtx) + } + if len(pending)+len(failed) != 0 { + return fmt.Sprintf("Pods pending: %v, failed: %v", pending, failed) } return "" })) @@ -387,6 +397,10 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func() }) JustBeforeEach(func(ctx context.Context) { + By("Logging nodes state", func() { + logNodesState(ctx) + }) + var err error if !ytBuilder.WithHTTPSOnlyProxy { @@ -2273,9 +2287,10 @@ func NewVanillaOperation(ytClient yt.Client) *TestOperation { Title: "e2e test operation", Tasks: map[string]*ytspec.UserScript{ "test": { - Command: "true", - CPULimit: 0, - JobCount: 1, + Command: "true", + CPULimit: operationCPULimit, + MemoryLimit: operationMemoryLimit, + JobCount: 1, }, }, MaxFailedJobCount: 1, @@ -2389,8 +2404,9 @@ func NewMapTestOperation(ytClient yt.Client) *TestOperation { InputTablePaths: []ypath.YPath{testTablePathIn}, OutputTablePaths: []ypath.YPath{testTablePathOut}, Mapper: &ytspec.UserScript{ - Command: "cat", - CPULimit: 0, + Command: "cat", + CPULimit: operationCPULimit, + MemoryLimit: operationMemoryLimit, }, MaxFailedJobCount: 1, }, diff --git a/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ds.yaml b/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ds.yaml index 3c2ab0877..ac8e07336 100644 --- a/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ds.yaml +++ b/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ds.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet hp.yaml b/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet hp.yaml index 78ffd0350..eaae47662 100644 --- a/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet hp.yaml +++ b/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet hp.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /ping port: 80 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ms.yaml b/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ms.yaml index fd25abeb4..b6706e143 100644 --- a/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ms.yaml +++ b/test/r8r/canondata/Components reconciler Minimal Test/StatefulSet ms.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /yt/master-data name: master-data diff --git a/test/r8r/canondata/Components reconciler Minimal Test/Ytsaurus.yaml b/test/r8r/canondata/Components reconciler Minimal Test/Ytsaurus.yaml index 725d710ef..fa503fc63 100644 --- a/test/r8r/canondata/Components reconciler Minimal Test/Ytsaurus.yaml +++ b/test/r8r/canondata/Components reconciler Minimal Test/Ytsaurus.yaml @@ -16,7 +16,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" enableFullUpdate: true ephemeralCluster: true hostNetwork: false @@ -28,7 +34,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" serviceType: NodePort transport: {} isManaged: true @@ -47,7 +59,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/ConfigMap yt-exec-node-config.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/ConfigMap yt-exec-node-config.yaml index 321cb1515..2c3d7991a 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/ConfigMap yt-exec-node-config.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/ConfigMap yt-exec-node-config.yaml @@ -77,12 +77,20 @@ data: exec; ]; "resource_limits"={ - "node_dedicated_cpu"=0.000000; + "total_memory"=10737418240; + "total_cpu"=5.000000; + "node_dedicated_cpu"=1.000000; + "memory_limits"={ + "user_jobs"={ + type=static; + value=8589934592; + }; + }; }; "skynet_http_port"=11029; "job_resource_manager"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; }; "exec_node"={ @@ -125,7 +133,7 @@ data: }; "job_controller"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; "gpu_manager"={ "gpu_info_source"={ diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ds.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ds.yaml index 3c2ab0877..ac8e07336 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ds.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ds.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet end.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet end.yaml index 9e09af631..f3effb102 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet end.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet end.yaml @@ -71,7 +71,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: false volumeMounts: @@ -112,7 +118,13 @@ spec: - containerPort: 10026 name: cri-metrics protocol: TCP - resources: {} + resources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: true volumeMounts: diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet hp.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet hp.yaml index 78ffd0350..eaae47662 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet hp.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet hp.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /ping port: 80 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ms.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ms.yaml index fd25abeb4..b6706e143 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ms.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/StatefulSet ms.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /yt/master-data name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/Ytsaurus.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/Ytsaurus.yaml index bdad8c420..4dc4df19e 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/Ytsaurus.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime - CRI-O Test/Ytsaurus.yaml @@ -16,7 +16,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" enableFullUpdate: true ephemeralCluster: true execNodes: @@ -27,7 +33,13 @@ spec: criService: crio runtime: nvidia: {} - userSlots: 4 + jobResources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" locations: - locationType: ChunkCache path: /yt/node-data/chunk-cache @@ -42,7 +54,13 @@ spec: writerType: stderr minReadyInstanceCount: 0 privileged: false - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: node-data @@ -64,7 +82,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" serviceType: NodePort transport: {} isManaged: true @@ -83,7 +107,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/ConfigMap yt-exec-node-config.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/ConfigMap yt-exec-node-config.yaml index bcdff35e2..39f921b6b 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/ConfigMap yt-exec-node-config.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/ConfigMap yt-exec-node-config.yaml @@ -77,12 +77,20 @@ data: exec; ]; "resource_limits"={ - "node_dedicated_cpu"=0.000000; + "total_memory"=10737418240; + "total_cpu"=5.000000; + "node_dedicated_cpu"=1.000000; + "memory_limits"={ + "user_jobs"={ + type=static; + value=8589934592; + }; + }; }; "skynet_http_port"=11029; "job_resource_manager"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; }; "exec_node"={ @@ -125,7 +133,7 @@ data: }; "job_controller"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; "gpu_manager"={ "gpu_info_source"={ diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ds.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ds.yaml index 3c2ab0877..ac8e07336 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ds.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ds.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet end.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet end.yaml index f68ab9e3c..faeaa49ad 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet end.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet end.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: false volumeMounts: @@ -118,7 +124,13 @@ spec: - containerPort: 10026 name: cri-metrics protocol: TCP - resources: {} + resources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: true volumeMounts: diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet hp.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet hp.yaml index 78ffd0350..eaae47662 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet hp.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet hp.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /ping port: 80 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ms.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ms.yaml index fd25abeb4..b6706e143 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ms.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/StatefulSet ms.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /yt/master-data name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/Ytsaurus.yaml b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/Ytsaurus.yaml index afd8b2b35..ccbed890c 100644 --- a/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/Ytsaurus.yaml +++ b/test/r8r/canondata/Components reconciler With CRI and NVIDIA container runtime Test/Ytsaurus.yaml @@ -18,7 +18,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" enableFullUpdate: true ephemeralCluster: true execNodes: @@ -28,7 +34,13 @@ spec: apiRetryTimeoutSeconds: 120 runtime: nvidia: {} - userSlots: 4 + jobResources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" locations: - locationType: ChunkCache path: /yt/node-data/chunk-cache @@ -43,7 +55,13 @@ spec: writerType: stderr minReadyInstanceCount: 0 privileged: false - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: node-data @@ -65,7 +83,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" serviceType: NodePort transport: {} isManaged: true @@ -84,7 +108,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/ConfigMap yt-exec-node-config.yaml b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/ConfigMap yt-exec-node-config.yaml index 0549cc4e7..0a645b107 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/ConfigMap yt-exec-node-config.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/ConfigMap yt-exec-node-config.yaml @@ -77,12 +77,20 @@ data: exec; ]; "resource_limits"={ - "node_dedicated_cpu"=0.000000; + "total_memory"=10737418240; + "total_cpu"=5.000000; + "node_dedicated_cpu"=1.000000; + "memory_limits"={ + "user_jobs"={ + type=static; + value=8589934592; + }; + }; }; "skynet_http_port"=11029; "job_resource_manager"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; }; "exec_node"={ @@ -123,7 +131,7 @@ data: }; "job_controller"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; "gpu_manager"={ "gpu_info_source"={ diff --git a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ds.yaml b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ds.yaml index 3c2ab0877..ac8e07336 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ds.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ds.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet end.yaml b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet end.yaml index 9e09af631..f3effb102 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet end.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet end.yaml @@ -71,7 +71,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: false volumeMounts: @@ -112,7 +118,13 @@ spec: - containerPort: 10026 name: cri-metrics protocol: TCP - resources: {} + resources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: true volumeMounts: diff --git a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet hp.yaml b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet hp.yaml index 78ffd0350..eaae47662 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet hp.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet hp.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /ping port: 80 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ms.yaml b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ms.yaml index fd25abeb4..b6706e143 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ms.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/StatefulSet ms.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /yt/master-data name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/Ytsaurus.yaml b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/Ytsaurus.yaml index dec5fde0f..9a5438814 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/Ytsaurus.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment - CRI-O Test/Ytsaurus.yaml @@ -16,7 +16,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" enableFullUpdate: true ephemeralCluster: true execNodes: @@ -25,7 +31,13 @@ spec: cri: apiRetryTimeoutSeconds: 120 criService: crio - userSlots: 4 + jobResources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" locations: - locationType: ChunkCache path: /yt/node-data/chunk-cache @@ -40,7 +52,13 @@ spec: writerType: stderr minReadyInstanceCount: 0 privileged: false - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: node-data @@ -62,7 +80,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" serviceType: NodePort transport: {} isManaged: true @@ -81,7 +105,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI job environment Test/ConfigMap yt-exec-node-config.yaml b/test/r8r/canondata/Components reconciler With CRI job environment Test/ConfigMap yt-exec-node-config.yaml index e04776802..7235c75f9 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment Test/ConfigMap yt-exec-node-config.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment Test/ConfigMap yt-exec-node-config.yaml @@ -77,12 +77,20 @@ data: exec; ]; "resource_limits"={ - "node_dedicated_cpu"=0.000000; + "total_memory"=10737418240; + "total_cpu"=5.000000; + "node_dedicated_cpu"=1.000000; + "memory_limits"={ + "user_jobs"={ + type=static; + value=8589934592; + }; + }; }; "skynet_http_port"=11029; "job_resource_manager"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; }; "exec_node"={ @@ -123,7 +131,7 @@ data: }; "job_controller"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; "gpu_manager"={ "gpu_info_source"={ diff --git a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ds.yaml b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ds.yaml index 3c2ab0877..ac8e07336 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ds.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ds.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet end.yaml b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet end.yaml index f68ab9e3c..faeaa49ad 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet end.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet end.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: false volumeMounts: @@ -118,7 +124,13 @@ spec: - containerPort: 10026 name: cri-metrics protocol: TCP - resources: {} + resources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: true volumeMounts: diff --git a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet hp.yaml b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet hp.yaml index 78ffd0350..eaae47662 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet hp.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet hp.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /ping port: 80 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ms.yaml b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ms.yaml index fd25abeb4..b6706e143 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ms.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment Test/StatefulSet ms.yaml @@ -69,7 +69,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /yt/master-data name: master-data diff --git a/test/r8r/canondata/Components reconciler With CRI job environment Test/Ytsaurus.yaml b/test/r8r/canondata/Components reconciler With CRI job environment Test/Ytsaurus.yaml index 2ad57fa36..abdbde8aa 100644 --- a/test/r8r/canondata/Components reconciler With CRI job environment Test/Ytsaurus.yaml +++ b/test/r8r/canondata/Components reconciler With CRI job environment Test/Ytsaurus.yaml @@ -18,7 +18,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" enableFullUpdate: true ephemeralCluster: true execNodes: @@ -26,7 +32,13 @@ spec: jobEnvironment: cri: apiRetryTimeoutSeconds: 120 - userSlots: 4 + jobResources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" locations: - locationType: ChunkCache path: /yt/node-data/chunk-cache @@ -41,7 +53,13 @@ spec: writerType: stderr minReadyInstanceCount: 0 privileged: false - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: node-data @@ -63,7 +81,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" serviceType: NodePort transport: {} isManaged: true @@ -82,7 +106,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: master-data diff --git a/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-data-node-config.yaml b/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-data-node-config.yaml index b0a03ba8d..e2d05d386 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-data-node-config.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-data-node-config.yaml @@ -105,6 +105,7 @@ data: data; ]; "resource_limits"={ + "total_memory"=2147483648; "total_cpu"=0.000000; "node_dedicated_cpu"=0.000000; }; diff --git a/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-exec-node-config.yaml b/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-exec-node-config.yaml index 91890b198..a4769c99c 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-exec-node-config.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/ConfigMap yt-exec-node-config.yaml @@ -105,12 +105,20 @@ data: exec; ]; "resource_limits"={ - "node_dedicated_cpu"=0.000000; + "total_memory"=10737418240; + "total_cpu"=5.000000; + "node_dedicated_cpu"=1.000000; + "memory_limits"={ + "user_jobs"={ + type=static; + value=8589934592; + }; + }; }; "skynet_http_port"=11029; "job_resource_manager"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; }; "exec_node"={ @@ -158,7 +166,7 @@ data: }; "job_controller"={ "resource_limits"={ - "user_slots"=4; + "user_slots"=20; }; "gpu_manager"={ "gpu_info_source"={ diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ca.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ca.yaml index 1b7c3ab27..b4540bd0f 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ca.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ca.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet dnd.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet dnd.yaml index 014d78049..c5f2fa686 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet dnd.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet dnd.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /yt/node-data name: node-data diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ds.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ds.yaml index b12a8e100..087518396 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ds.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ds.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet end.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet end.yaml index 6c3084c71..792ed997c 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet end.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet end.yaml @@ -81,7 +81,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: false volumeMounts: @@ -142,7 +148,13 @@ spec: - containerPort: 10026 name: cri-metrics protocol: TCP - resources: {} + resources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" securityContext: privileged: true volumeMounts: diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet hp.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet hp.yaml index 98f907742..ccb139812 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet hp.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet hp.yaml @@ -87,7 +87,13 @@ spec: httpGet: path: /ping port: 80 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ms.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ms.yaml index 054ffaf2e..c9e980786 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ms.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet ms.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /yt/master-data name: master-data diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet msc.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet msc.yaml index 98e0400d4..2938d9208 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet msc.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet msc.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet rp.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet rp.yaml index 30b228f3b..d890be41f 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet rp.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet rp.yaml @@ -78,7 +78,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet sch.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet sch.yaml index 95a772122..827876ef5 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet sch.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet sch.yaml @@ -75,7 +75,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet yqla.yaml b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet yqla.yaml index 54a343308..6c99f8f62 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/StatefulSet yqla.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/StatefulSet yqla.yaml @@ -83,7 +83,13 @@ spec: httpGet: path: /orchid/service port: metrics - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeMounts: - mountPath: /config_template name: config-template diff --git a/test/r8r/canondata/Components reconciler With all components Test/Ytsaurus.yaml b/test/r8r/canondata/Components reconciler With all components Test/Ytsaurus.yaml index 35e41c935..d5f609585 100644 --- a/test/r8r/canondata/Components reconciler With all components Test/Ytsaurus.yaml +++ b/test/r8r/canondata/Components reconciler With all components Test/Ytsaurus.yaml @@ -25,7 +25,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" coreImage: ghcr.io/ytsaurus/ytsaurus:stable-24.2.1 dataNodes: - instanceCount: 3 @@ -38,7 +44,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: node-data @@ -59,7 +71,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" enableFullUpdate: true ephemeralCluster: true execNodes: @@ -67,7 +85,13 @@ spec: jobEnvironment: cri: apiRetryTimeoutSeconds: 120 - userSlots: 4 + jobResources: + limits: + cpu: "4" + memory: 8Gi + requests: + cpu: "0" + memory: "0" locations: - locationType: ChunkCache path: /yt/node-data/chunk-cache @@ -82,7 +106,13 @@ spec: writerType: stderr minReadyInstanceCount: 0 privileged: false - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: node-data @@ -104,7 +134,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" serviceType: NodePort transport: httpsSecret: @@ -120,7 +156,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" nativeTransport: tlsClientSecret: name: native-client-cert @@ -142,7 +184,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" volumeClaimTemplates: - metadata: name: master-data @@ -164,7 +212,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" queueAgents: image: ghcr.io/ytsaurus/ytsaurus:stable-24.2.1 instanceCount: 1 @@ -174,7 +228,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" rpcProxies: - instanceCount: 1 loggers: @@ -183,7 +243,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" serviceType: NodePort transport: {} schedulers: @@ -194,7 +260,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" strawberry: image: ghcr.io/ytsaurus/strawberry:0.0.14 resources: {} @@ -211,7 +283,13 @@ spec: useTimestampSuffix: false writerType: stderr minReadyInstanceCount: 0 - resources: {} + resources: + limits: + cpu: "1" + memory: 2Gi + requests: + cpu: "0" + memory: "0" status: conditions: - lastTransitionTime: null diff --git a/ytop-chart/templates/crds/cluster.ytsaurus.tech_offshoredatagateways.yaml b/ytop-chart/templates/crds/cluster.ytsaurus.tech_offshoredatagateways.yaml index c35912aa7..dc69b496a 100644 --- a/ytop-chart/templates/crds/cluster.ytsaurus.tech_offshoredatagateways.yaml +++ b/ytop-chart/templates/crds/cluster.ytsaurus.tech_offshoredatagateways.yaml @@ -806,9 +806,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotedatanodes.yaml b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotedatanodes.yaml index 2b159ed16..1784e2653 100644 --- a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotedatanodes.yaml +++ b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotedatanodes.yaml @@ -804,9 +804,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteexecnodes.yaml b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteexecnodes.yaml index a6e88b9bd..b690e5f6b 100644 --- a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteexecnodes.yaml +++ b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteexecnodes.yaml @@ -804,9 +804,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotetabletnodes.yaml b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotetabletnodes.yaml index c63a02296..28fbb4c5f 100644 --- a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotetabletnodes.yaml +++ b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remotetabletnodes.yaml @@ -804,9 +804,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteytsaurus.yaml b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteytsaurus.yaml index d05a810e7..978888617 100644 --- a/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteytsaurus.yaml +++ b/ytop-chart/templates/crds/cluster.ytsaurus.tech_remoteytsaurus.yaml @@ -746,9 +746,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array diff --git a/ytop-chart/templates/crds/cluster.ytsaurus.tech_ytsaurus.yaml b/ytop-chart/templates/crds/cluster.ytsaurus.tech_ytsaurus.yaml index 2cfc9edc8..ff2241ed6 100644 --- a/ytop-chart/templates/crds/cluster.ytsaurus.tech_ytsaurus.yaml +++ b/ytop-chart/templates/crds/cluster.ytsaurus.tech_ytsaurus.yaml @@ -812,9 +812,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -2723,9 +2726,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -4583,9 +4589,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -6448,9 +6457,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -8322,9 +8334,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -9484,9 +9499,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -10225,9 +10243,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -12360,9 +12381,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -14286,9 +14310,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -16159,9 +16186,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -18104,9 +18134,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -19989,9 +20022,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -21845,9 +21881,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -23710,9 +23749,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -25617,9 +25659,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -27484,9 +27529,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -28699,9 +28747,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -29511,9 +29562,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -31376,9 +31430,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -33258,9 +33315,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -34482,9 +34542,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array @@ -35487,9 +35550,12 @@ spec: of a pod. properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string type: object type: array