From 355c80d97cd2bce1fcc189153f29adef5568f4d8 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Sat, 29 Aug 2020 06:38:35 -0700 Subject: [PATCH 1/2] add k3s flags Signed-off-by: Brian Downs --- pkg/cli/cmds/server.go | 68 +++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index fe1122e490..ad870603d6 100644 --- a/pkg/cli/cmds/server.go +++ b/pkg/cli/cmds/server.go @@ -33,6 +33,7 @@ var ( "service-cidr": copy, "cluster-init": copy, "cluster-reset": copy, + "cluster-reset-restore-path": copy, "cluster-dns": copy, "cluster-domain": copy, "flannel-backend": drop, @@ -55,37 +56,42 @@ var ( Hide: true, Default: cmds.DisableItems, }, - "disable-selinux": drop, - "disable-scheduler": drop, - "disable-cloud-controller": drop, - "disable-network-policy": drop, - "disable-kube-proxy": drop, - "node-name": copy, - "with-node-id": drop, - "node-label": copy, - "node-taint": copy, - "docker": copy, - "container-runtime-endpoint": copy, - "pause-image": drop, - "private-registry": copy, - "node-ip": copy, - "node-external-ip": drop, - "resolv-conf": copy, - "flannel-iface": drop, - "flannel-conf": drop, - "kubelet-arg": copy, - "kube-proxy-arg": copy, - "rootless": drop, - "agent-token": copy, - "agent-token-file": copy, - "server": copy, - "secrets-encryption": copy, - "no-flannel": drop, - "no-deploy": drop, - "cluster-secret": drop, - "protect-kernel-defaults": copy, - "snapshotter": copy, - "selinux": copy, + "disable-selinux": drop, + "disable-scheduler": drop, + "disable-cloud-controller": drop, + "disable-network-policy": drop, + "disable-kube-proxy": drop, + "disable-snapshots": copy, + "etcd-disable-snapshots": copy, + "etcd-snapshot-schedule-cron": copy, + "etcd-snapshot-retention": copy, + "etcd-snapshot-dir": copy, + "node-name": copy, + "with-node-id": drop, + "node-label": copy, + "node-taint": copy, + "docker": copy, + "container-runtime-endpoint": copy, + "pause-image": drop, + "private-registry": copy, + "node-ip": copy, + "node-external-ip": drop, + "resolv-conf": copy, + "flannel-iface": drop, + "flannel-conf": drop, + "kubelet-arg": copy, + "kube-proxy-arg": copy, + "rootless": drop, + "agent-token": copy, + "agent-token-file": copy, + "server": copy, + "secrets-encryption": copy, + "no-flannel": drop, + "no-deploy": drop, + "cluster-secret": drop, + "protect-kernel-defaults": copy, + "snapshotter": copy, + "selinux": copy, }) ) From c3c6fdbf47532ecd0eb8e59db7790fa757d7de3d Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Sat, 29 Aug 2020 06:55:29 -0700 Subject: [PATCH 2/2] adjust flag Signed-off-by: Brian Downs --- pkg/cli/cmds/server.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index ad870603d6..0c6408c1a9 100644 --- a/pkg/cli/cmds/server.go +++ b/pkg/cli/cmds/server.go @@ -61,7 +61,6 @@ var ( "disable-cloud-controller": drop, "disable-network-policy": drop, "disable-kube-proxy": drop, - "disable-snapshots": copy, "etcd-disable-snapshots": copy, "etcd-snapshot-schedule-cron": copy, "etcd-snapshot-retention": copy,