Skip to content

Commit 98e41b7

Browse files
authored
Merge pull request kubernetes#76118 from qingsenLi/k8s190404-delete-const
delete some unused consts in kubeadm/app/constants/constants.go
2 parents 4da579b + ccac84c commit 98e41b7

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

cmd/kubeadm/app/constants/constants.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ const (
175175
DiscoveryRetryInterval = 5 * time.Second
176176
// PatchNodeTimeout specifies how long kubeadm should wait for applying the label and taint on the control-plane before timing out
177177
PatchNodeTimeout = 2 * time.Minute
178-
// UpdateNodeTimeout specifies how long kubeadm should wait for updating node with the initial remote configuration of kubelet before timing out
179-
UpdateNodeTimeout = 2 * time.Minute
180178
// TLSBootstrapTimeout specifies how long kubeadm should wait for the kubelet to perform the TLS Bootstrap
181179
TLSBootstrapTimeout = 2 * time.Minute
182180

@@ -314,19 +312,10 @@ const (
314312
// KubeDNSDnsMasqNannyImageName specifies the name of the image for the dnsmasq container in the kube-dns add-on
315313
KubeDNSDnsMasqNannyImageName = "k8s-dns-dnsmasq-nanny"
316314

317-
// CRICtlPackage defines the go package that installs crictl
318-
CRICtlPackage = "github.com/kubernetes-incubator/cri-tools/cmd/crictl"
319-
320-
// KubeAuditPolicyVolumeName is the name of the volume that will contain the audit policy
321-
KubeAuditPolicyVolumeName = "audit"
322315
// AuditPolicyDir is the directory that will contain the audit policy
323316
AuditPolicyDir = "audit"
324317
// AuditPolicyFile is the name of the audit policy file itself
325318
AuditPolicyFile = "audit.yaml"
326-
// AuditPolicyLogFile is the name of the file audit logs get written to
327-
AuditPolicyLogFile = "audit.log"
328-
// KubeAuditPolicyLogVolumeName is the name of the volume that will contain the audit logs
329-
KubeAuditPolicyLogVolumeName = "audit-log"
330319
// StaticPodAuditPolicyLogDir is the name of the directory in the static pod that will have the audit logs
331320
StaticPodAuditPolicyLogDir = "/var/log/kubernetes/audit"
332321

0 commit comments

Comments
 (0)