Skip to content

Commit a37befe

Browse files
committed
Delete dead code
1 parent ab2b511 commit a37befe

File tree

3 files changed

+4
-41
lines changed

3 files changed

+4
-41
lines changed

pkg/apis/kops/validation/validation.go

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,36 +1213,6 @@ func validateNetworkingFlannel(c *kops.Cluster, v *kops.FlannelNetworkingSpec, f
12131213
return allErrs
12141214
}
12151215

1216-
func validateNetworkingCanal(c *kops.Cluster, v *kops.CanalNetworkingSpec, fldPath *field.Path) field.ErrorList {
1217-
allErrs := field.ErrorList{}
1218-
1219-
if c.Spec.IsIPv6Only() {
1220-
allErrs = append(allErrs, field.Forbidden(fldPath, "Canal does not support IPv6"))
1221-
}
1222-
1223-
if v.DefaultEndpointToHostAction != "" {
1224-
valid := []string{"ACCEPT", "DROP", "RETURN"}
1225-
allErrs = append(allErrs, IsValidValue(fldPath.Child("defaultEndpointToHostAction"), &v.DefaultEndpointToHostAction, valid)...)
1226-
}
1227-
1228-
if v.ChainInsertMode != "" {
1229-
valid := []string{"insert", "append"}
1230-
allErrs = append(allErrs, IsValidValue(fldPath.Child("chainInsertMode"), &v.ChainInsertMode, valid)...)
1231-
}
1232-
1233-
if v.LogSeveritySys != "" {
1234-
valid := []string{"INFO", "DEBUG", "WARNING", "ERROR", "CRITICAL", "NONE"}
1235-
allErrs = append(allErrs, IsValidValue(fldPath.Child("logSeveritySys"), &v.LogSeveritySys, valid)...)
1236-
}
1237-
1238-
if v.IptablesBackend != "" {
1239-
valid := []string{"Auto", "Legacy", "NFT"}
1240-
allErrs = append(allErrs, IsValidValue(fldPath.Child("iptablesBackend"), &v.IptablesBackend, valid)...)
1241-
}
1242-
1243-
return allErrs
1244-
}
1245-
12461216
func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpec, fldPath *field.Path) field.ErrorList {
12471217
c := &cluster.Spec
12481218
allErrs := field.ErrorList{}

pkg/nodemodel/wellknownassets/cni.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ import (
3434
// https://github.com/kubernetes/kubernetes/issues/30338
3535

3636
const (
37-
defaultCNIAssetAmd64K8s_22 = "https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz"
38-
defaultCNIAssetArm64K8s_22 = "https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz"
39-
40-
defaultCNIAssetAmd64K8s_27 = "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz"
41-
defaultCNIAssetArm64K8s_27 = "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz"
42-
4337
defaultCNIAssetAmd64K8s_29 = "https://github.com/containernetworking/plugins/releases/download/v1.3.0/cni-plugins-linux-amd64-v1.3.0.tgz"
4438
defaultCNIAssetArm64K8s_29 = "https://github.com/containernetworking/plugins/releases/download/v1.3.0/cni-plugins-linux-arm64-v1.3.0.tgz"
4539

protokube/pkg/protokube/do_volume.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ import (
3434
)
3535

3636
const (
37-
dropletRegionMetadataURL = "http://169.254.169.254/metadata/v1/region"
38-
dropletNameMetadataURL = "http://169.254.169.254/metadata/v1/hostname"
39-
dropletIDMetadataURL = "http://169.254.169.254/metadata/v1/id"
40-
dropletIDMetadataTags = "http://169.254.169.254/metadata/v1/tags"
41-
dropletInternalIPMetadataURL = "http://169.254.169.254/metadata/v1/interfaces/private/0/ipv4/address"
37+
dropletRegionMetadataURL = "http://169.254.169.254/metadata/v1/region"
38+
dropletNameMetadataURL = "http://169.254.169.254/metadata/v1/hostname"
39+
dropletIDMetadataURL = "http://169.254.169.254/metadata/v1/id"
40+
dropletIDMetadataTags = "http://169.254.169.254/metadata/v1/tags"
4241
)
4342

4443
// TokenSource implements oauth2.TokenSource

0 commit comments

Comments
 (0)