diff --git a/assets/overlays/aws-ebs/generated/hypershift/controller.yaml b/assets/overlays/aws-ebs/generated/hypershift/controller.yaml index fd0edc30e..f9dde66bd 100644 --- a/assets/overlays/aws-ebs/generated/hypershift/controller.yaml +++ b/assets/overlays/aws-ebs/generated/hypershift/controller.yaml @@ -4,19 +4,19 @@ # Applied strategic merge patch overlays/aws-ebs/patches/controller_add_driver.yaml # Applied strategic merge patch common/sidecars/driver_kube_rbac_proxy.yaml # provisioner.yaml: Loaded from common/sidecars/provisioner.yaml -# provisioner.yaml: Added arguments [--default-fstype=ext4 --feature-gates=Topology=true --extra-create-metadata=true --timeout=60s] +# provisioner.yaml: Added arguments [--default-fstype=ext4 --feature-gates=Topology=true --extra-create-metadata=true --timeout=60s --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # provisioner.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch # Applied strategic merge patch provisioner.yaml # attacher.yaml: Loaded from common/sidecars/attacher.yaml -# attacher.yaml: Added arguments [--timeout=60s] +# attacher.yaml: Added arguments [--timeout=60s --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # attacher.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch # Applied strategic merge patch attacher.yaml # resizer.yaml: Loaded from common/sidecars/resizer.yaml -# resizer.yaml: Added arguments [--timeout=300s] +# resizer.yaml: Added arguments [--timeout=60s --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # resizer.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch # Applied strategic merge patch resizer.yaml # snapshotter.yaml: Loaded from common/sidecars/snapshotter.yaml -# snapshotter.yaml: Added arguments [--timeout=300s --extra-create-metadata] +# snapshotter.yaml: Added arguments [--extra-create-metadata --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # snapshotter.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch # Applied strategic merge patch snapshotter.yaml # livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml @@ -175,6 +175,9 @@ spec: - --feature-gates=Topology=true - --extra-create-metadata=true - --timeout=60s + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 - --kubeconfig=$(KUBECONFIG) env: - name: KUBECONFIG @@ -223,6 +226,9 @@ spec: - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} - --timeout=60s + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 - --kubeconfig=$(KUBECONFIG) env: - name: KUBECONFIG @@ -270,7 +276,10 @@ spec: - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD} - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} - - --timeout=300s + - --timeout=60s + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 - --kubeconfig=$(KUBECONFIG) env: - name: KUBECONFIG @@ -318,8 +327,10 @@ spec: - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD} - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} - - --timeout=300s - --extra-create-metadata + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 - --kubeconfig=$(KUBECONFIG) env: - name: KUBECONFIG diff --git a/assets/overlays/aws-ebs/generated/standalone/controller.yaml b/assets/overlays/aws-ebs/generated/standalone/controller.yaml index 593b31000..2103c0233 100644 --- a/assets/overlays/aws-ebs/generated/standalone/controller.yaml +++ b/assets/overlays/aws-ebs/generated/standalone/controller.yaml @@ -4,16 +4,16 @@ # Applied strategic merge patch overlays/aws-ebs/patches/controller_add_driver.yaml # Applied strategic merge patch common/sidecars/driver_kube_rbac_proxy.yaml # provisioner.yaml: Loaded from common/sidecars/provisioner.yaml -# provisioner.yaml: Added arguments [--default-fstype=ext4 --feature-gates=Topology=true --extra-create-metadata=true --timeout=60s] +# provisioner.yaml: Added arguments [--default-fstype=ext4 --feature-gates=Topology=true --extra-create-metadata=true --timeout=60s --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # Applied strategic merge patch provisioner.yaml # attacher.yaml: Loaded from common/sidecars/attacher.yaml -# attacher.yaml: Added arguments [--timeout=60s] +# attacher.yaml: Added arguments [--timeout=60s --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # Applied strategic merge patch attacher.yaml # resizer.yaml: Loaded from common/sidecars/resizer.yaml -# resizer.yaml: Added arguments [--timeout=300s] +# resizer.yaml: Added arguments [--timeout=60s --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # Applied strategic merge patch resizer.yaml # snapshotter.yaml: Loaded from common/sidecars/snapshotter.yaml -# snapshotter.yaml: Added arguments [--timeout=300s --extra-create-metadata] +# snapshotter.yaml: Added arguments [--extra-create-metadata --kube-api-qps=20 --kube-api-burst=100 --worker-threads=100] # Applied strategic merge patch snapshotter.yaml # livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml # livenessprobe.yaml: Added arguments [--probe-timeout=3s] @@ -145,6 +145,9 @@ spec: - --feature-gates=Topology=true - --extra-create-metadata=true - --timeout=60s + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: [] image: ${PROVISIONER_IMAGE} imagePullPolicy: IfNotPresent @@ -187,6 +190,9 @@ spec: - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} - --timeout=60s + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: [] image: ${ATTACHER_IMAGE} imagePullPolicy: IfNotPresent @@ -228,7 +234,10 @@ spec: - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD} - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} - - --timeout=300s + - --timeout=60s + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: [] image: ${RESIZER_IMAGE} imagePullPolicy: IfNotPresent @@ -270,8 +279,10 @@ spec: - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD} - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} - - --timeout=300s - --extra-create-metadata + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: [] image: ${SNAPSHOTTER_IMAGE} imagePullPolicy: IfNotPresent diff --git a/legacy/aws-ebs-csi-driver-operator/assets/controller.yaml b/legacy/aws-ebs-csi-driver-operator/assets/controller.yaml index 545a58b1a..88b60a38c 100644 --- a/legacy/aws-ebs-csi-driver-operator/assets/controller.yaml +++ b/legacy/aws-ebs-csi-driver-operator/assets/controller.yaml @@ -145,6 +145,9 @@ spec: - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD} - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock @@ -192,6 +195,9 @@ spec: - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD} - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock @@ -229,7 +235,6 @@ spec: imagePullPolicy: IfNotPresent args: - --csi-address=$(ADDRESS) - - --timeout=300s - --http-endpoint=localhost:8204 - --leader-election - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION} @@ -237,6 +242,9 @@ spec: - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD} - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock @@ -275,7 +283,7 @@ spec: args: - --csi-address=$(ADDRESS) - --metrics-address=localhost:8205 - - --timeout=300s + - --timeout=60s - --leader-election - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION} - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE} @@ -283,6 +291,9 @@ spec: - --leader-election-namespace=openshift-cluster-csi-drivers - --v=${LOG_LEVEL} - --extra-create-metadata + - --kube-api-qps=20 + - --kube-api-burst=100 + - --worker-threads=100 env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock diff --git a/pkg/driver/aws-ebs/aws_ebs.go b/pkg/driver/aws-ebs/aws_ebs.go index 5c89cb018..a27082288 100644 --- a/pkg/driver/aws-ebs/aws_ebs.go +++ b/pkg/driver/aws-ebs/aws_ebs.go @@ -65,16 +65,27 @@ func GetAWSEBSGeneratorConfig() *generator.CSIDriverGeneratorConfig { "--feature-gates=Topology=true", "--extra-create-metadata=true", "--timeout=60s", + "--kube-api-qps=20", + "--kube-api-burst=100", + "--worker-threads=100", ), commongenerator.DefaultAttacher.WithExtraArguments( "--timeout=60s", + "--kube-api-qps=20", + "--kube-api-burst=100", + "--worker-threads=100", ), commongenerator.DefaultResizer.WithExtraArguments( - "--timeout=300s", + "--timeout=60s", + "--kube-api-qps=20", + "--kube-api-burst=100", + "--worker-threads=100", ), commongenerator.DefaultSnapshotter.WithExtraArguments( - "--timeout=300s", "--extra-create-metadata", + "--kube-api-qps=20", + "--kube-api-burst=100", + "--worker-threads=100", ), commongenerator.DefaultLivenessProbe.WithExtraArguments( "--probe-timeout=3s",