diff --git a/pkg/apis/config/v1alpha1/kwokctl_configuration_types.go b/pkg/apis/config/v1alpha1/kwokctl_configuration_types.go index 4afe5df3f7..3889c8b5ba 100644 --- a/pkg/apis/config/v1alpha1/kwokctl_configuration_types.go +++ b/pkg/apis/config/v1alpha1/kwokctl_configuration_types.go @@ -454,6 +454,7 @@ type KwokctlConfigurationOptions struct { DisableQPSLimits *bool `json:"disableQPSLimits,omitempty"` // EtcdQuotaBackendSize is the backend quota for etcd. + // +default="8Gi" EtcdQuotaBackendSize string `json:"etcdQuotaBackendSize,omitempty"` } diff --git a/pkg/apis/config/v1alpha1/zz_generated.defaults.go b/pkg/apis/config/v1alpha1/zz_generated.defaults.go index 2651a28642..dd6d1c6b5c 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.defaults.go +++ b/pkg/apis/config/v1alpha1/zz_generated.defaults.go @@ -112,6 +112,9 @@ func SetObjectDefaults_KwokctlConfiguration(in *KwokctlConfiguration) { var ptrVar1 bool = false in.Options.DisableQPSLimits = &ptrVar1 } + if in.Options.EtcdQuotaBackendSize == "" { + in.Options.EtcdQuotaBackendSize = "8Gi" + } for i := range in.Components { a := &in.Components[i] for j := range a.Ports { diff --git a/site/content/en/docs/generated/kwokctl_create_cluster.md b/site/content/en/docs/generated/kwokctl_create_cluster.md index 65351b35be..702dcabdbe 100644 --- a/site/content/en/docs/generated/kwokctl_create_cluster.md +++ b/site/content/en/docs/generated/kwokctl_create_cluster.md @@ -25,7 +25,7 @@ kwokctl create cluster [flags] (default "registry.k8s.io/etcd:3.5.15-0") --etcd-port uint32 Port of etcd given to the host. The behavior is unstable for kind/kind-podman runtime and may be modified in the future --etcd-prefix string prefix of the key (default "/registry") - --etcd-quota-backend-size string Quota backend size for etcd + --etcd-quota-backend-size string Quota backend size for etcd (default "8Gi") --extra-args component=key=value Pass a single extra arg key-value pair to the component in the format component=key=value --heartbeat-factor float Scale factor for all about heartbeat (default 5) -h, --help help for cluster diff --git a/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster.txt b/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster.txt index 6eb1804921..cce949b7e1 100644 --- a/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster.txt +++ b/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster.txt @@ -25,6 +25,8 @@ kubeadmConfigPatches: etcd: local: dataDir: /var/lib/etcd + extraArgs: + quota-backend-bytes: "8589934592" kind: ClusterConfiguration networking: {} scheduler: diff --git a/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_extra.txt b/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_extra.txt index 73e4470ae3..d7e98a776c 100644 --- a/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_extra.txt +++ b/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_extra.txt @@ -39,6 +39,7 @@ kubeadmConfigPatches: dataDir: /var/lib/etcd extraArgs: log-level: debug + quota-backend-bytes: "8589934592" kind: ClusterConfiguration networking: {} scheduler: diff --git a/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_verbosity.txt b/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_verbosity.txt index 3540a9d534..0d0b95a113 100644 --- a/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_verbosity.txt +++ b/test/e2e/kwokctl/dryrun/testdata/kind-podman/create_cluster_with_verbosity.txt @@ -57,6 +57,8 @@ kubeadmConfigPatches: etcd: local: dataDir: /var/lib/etcd + extraArgs: + quota-backend-bytes: "8589934592" kind: ClusterConfiguration networking: {} scheduler: diff --git a/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster.txt b/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster.txt index 5f6d4e101d..91a0b6b8b5 100644 --- a/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster.txt +++ b/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster.txt @@ -25,6 +25,8 @@ kubeadmConfigPatches: etcd: local: dataDir: /var/lib/etcd + extraArgs: + quota-backend-bytes: "8589934592" kind: ClusterConfiguration networking: {} scheduler: diff --git a/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_extra.txt b/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_extra.txt index 4f785ce825..ff666de592 100644 --- a/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_extra.txt +++ b/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_extra.txt @@ -39,6 +39,7 @@ kubeadmConfigPatches: dataDir: /var/lib/etcd extraArgs: log-level: debug + quota-backend-bytes: "8589934592" kind: ClusterConfiguration networking: {} scheduler: diff --git a/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_verbosity.txt b/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_verbosity.txt index 05b69c9bc9..a4194803de 100644 --- a/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_verbosity.txt +++ b/test/e2e/kwokctl/dryrun/testdata/kind/create_cluster_with_verbosity.txt @@ -57,6 +57,8 @@ kubeadmConfigPatches: etcd: local: dataDir: /var/lib/etcd + extraArgs: + quota-backend-bytes: "8589934592" kind: ClusterConfiguration networking: {} scheduler: