Skip to content

Commit 3d7847e

Browse files
authored
Merge pull request kubernetes#91364 from rosti/kubeadm-consts-cleanup
kubeadm: Remove unused constants
2 parents f01d848 + def0db6 commit 3d7847e

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

cmd/kubeadm/app/constants/constants.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,6 @@ const (
245245
// This file should exist under KubeletRunDirectory
246246
KubeletConfigurationFileName = "config.yaml"
247247

248-
// DynamicKubeletConfigurationDirectoryName specifies the directory which stores the dynamic configuration checkpoints for the kubelet
249-
// This directory should exist under KubeletRunDirectory
250-
DynamicKubeletConfigurationDirectoryName = "dynamic-config"
251-
252248
// KubeletEnvFileName is a file "kubeadm init" writes at runtime. Using that interface, kubeadm can customize certain
253249
// kubelet flags conditionally based on the environment at runtime. Also, parameters given to the configuration file
254250
// might be passed through this file. "kubeadm init" writes one variable, with the name ${KubeletEnvFileVariableName}.
@@ -325,18 +321,6 @@ const (
325321
// KubeDNSDnsMasqNannyImageName specifies the name of the image for the dnsmasq container in the kube-dns add-on
326322
KubeDNSDnsMasqNannyImageName = "k8s-dns-dnsmasq-nanny"
327323

328-
// AuditPolicyDir is the directory that will contain the audit policy
329-
AuditPolicyDir = "audit"
330-
// AuditPolicyFile is the name of the audit policy file itself
331-
AuditPolicyFile = "audit.yaml"
332-
// StaticPodAuditPolicyLogDir is the name of the directory in the static pod that will have the audit logs
333-
StaticPodAuditPolicyLogDir = "/var/log/kubernetes/audit"
334-
335-
// LeaseEndpointReconcilerType will select a storage based reconciler
336-
// Copied from pkg/master/reconcilers to avoid pulling extra dependencies
337-
// TODO: Import this constant from a consts only package, that does not pull any further dependencies.
338-
LeaseEndpointReconcilerType = "lease"
339-
340324
// KubeDNSVersion is the version of kube-dns to be deployed if it is used
341325
KubeDNSVersion = "1.14.13"
342326

@@ -625,11 +609,6 @@ func GetAPIServerVirtualIP(svcSubnetList string, isDualStack bool) (net.IP, erro
625609
return internalAPIServerVirtualIP, nil
626610
}
627611

628-
// GetStaticPodAuditPolicyFile returns the path to the audit policy file within a static pod
629-
func GetStaticPodAuditPolicyFile() string {
630-
return filepath.Join(KubernetesDir, AuditPolicyDir, AuditPolicyFile)
631-
}
632-
633612
// GetDNSVersion is a handy function that returns the DNS version by DNS type
634613
func GetDNSVersion(dnsType kubeadmapi.DNSAddOnType) string {
635614
switch dnsType {

0 commit comments

Comments
 (0)