Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
chore: more lint! (#2756)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackfrancis
jackfrancis authored Feb 20, 2020
1 parent cbc2ca4 commit e547404
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions pkg/api/addons_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ func TestSetAddonsConfig(t *testing.T) {
"max-history": strconv.Itoa(0),
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "ACI Connector addon enabled",
Expand Down Expand Up @@ -348,7 +348,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled",
Expand Down Expand Up @@ -442,7 +442,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled - update",
Expand Down Expand Up @@ -540,7 +540,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled on cluster with multiple pools",
Expand Down Expand Up @@ -656,7 +656,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled on cluster with multiple pools - update",
Expand Down Expand Up @@ -776,7 +776,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled with configuration",
Expand Down Expand Up @@ -951,7 +951,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled with configuration - update",
Expand Down Expand Up @@ -1126,7 +1126,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled with mixed configuration plus defaults",
Expand Down Expand Up @@ -1251,7 +1251,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cluster-autoscaler addon enabled with mixed configuration plus defaults - update",
Expand Down Expand Up @@ -1376,7 +1376,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "smb-flexvolume addon enabled",
Expand Down Expand Up @@ -1419,7 +1419,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "rescheduler addon enabled",
Expand Down Expand Up @@ -1462,7 +1462,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "nvidia addon enabled",
Expand Down Expand Up @@ -1504,7 +1504,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "container-monitoring addon enabled",
Expand Down Expand Up @@ -1554,7 +1554,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "Azure Network Policy addon enabled",
Expand Down Expand Up @@ -1592,7 +1592,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "Azure Network Policy addon enabled - 1.16 upgrade",
Expand Down Expand Up @@ -1646,7 +1646,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.16.0", common.KubernetesImageBaseTypeGCR),
}, "1.16.0"),
},
{
name: "dns-autoscaler addon enabled",
Expand Down Expand Up @@ -1687,7 +1687,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "calico addon enabled",
Expand Down Expand Up @@ -1737,7 +1737,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR)),
}, "1.15.4")),
},
{
name: "calico addon back-compat",
Expand Down Expand Up @@ -1815,7 +1815,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR)),
}, "1.15.4")),
},
{
name: "aad-pod-identity enabled",
Expand Down Expand Up @@ -1866,7 +1866,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "azure-policy addon enabled",
Expand Down Expand Up @@ -1921,7 +1921,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "cilium networkPolicy",
Expand Down Expand Up @@ -1967,7 +1967,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR)),
}, "1.15.4")),
},
{
name: "Azure Stack addons",
Expand Down Expand Up @@ -2258,7 +2258,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "azure cloud-node-manager enabled for k8s == 1.16 and useCloudControllerManager is true",
Expand Down Expand Up @@ -2410,7 +2410,7 @@ func TestSetAddonsConfig(t *testing.T) {
Name: common.CloudNodeManagerAddonName,
Enabled: to.BoolPtr(true),
},
}, "1.16.1", common.KubernetesImageBaseTypeGCR),
}, "1.16.1"),
},
{
name: "azure cloud-node-manager enabled for k8s == 1.17.0 and useCloudControllerManager is true",
Expand Down Expand Up @@ -2562,7 +2562,7 @@ func TestSetAddonsConfig(t *testing.T) {
Name: common.CloudNodeManagerAddonName,
Enabled: to.BoolPtr(true),
},
}, "1.17.0", common.KubernetesImageBaseTypeGCR),
}, "1.17.0"),
},
{
name: "azure cloud-node-manager enabled for k8s >= 1.17.0 - upgrade",
Expand Down Expand Up @@ -2728,7 +2728,7 @@ func TestSetAddonsConfig(t *testing.T) {
Name: common.CloudNodeManagerAddonName,
Enabled: to.BoolPtr(true),
},
}, "1.17.0", common.KubernetesImageBaseTypeGCR),
}, "1.17.0"),
},
{
name: "azure cloud-node-manager enabled for k8s == 1.16.1 upgrade",
Expand Down Expand Up @@ -2894,7 +2894,7 @@ func TestSetAddonsConfig(t *testing.T) {
Name: common.CloudNodeManagerAddonName,
Enabled: to.BoolPtr(true),
},
}, "1.16.1", common.KubernetesImageBaseTypeGCR),
}, "1.16.1"),
},
{
name: "upgrade w/ no kube-dns or coredns specified", // back-compat support for clusters configured prior to user-configurable coredns and kube-dns addons
Expand Down Expand Up @@ -2968,7 +2968,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.13.11", common.KubernetesImageBaseTypeGCR)),
}, "1.13.11")),
},
{
name: "upgrade w/ manual coredns enabled",
Expand Down Expand Up @@ -3047,7 +3047,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR)),
}, "1.15.4")),
},
{
name: "coredns enabled",
Expand Down Expand Up @@ -3207,7 +3207,7 @@ func TestSetAddonsConfig(t *testing.T) {
},
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "pod-security-policy upgrade to 1.15",
Expand Down Expand Up @@ -3346,7 +3346,7 @@ func TestSetAddonsConfig(t *testing.T) {
"adminGroupID": "7d04bcd3-3c48-49ab-a064-c0b7d69896da",
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
{
name: "antrea addon enabled",
Expand Down Expand Up @@ -3376,7 +3376,7 @@ func TestSetAddonsConfig(t *testing.T) {
"serviceCidr": DefaultKubernetesServiceCIDR,
},
},
}, "1.15.4", common.KubernetesImageBaseTypeGCR),
}, "1.15.4"),
},
}

Expand Down Expand Up @@ -3826,8 +3826,8 @@ func TestGetClusterAutoscalerNodesConfig(t *testing.T) {
}
}

func concatenateDefaultAddons(addons []KubernetesAddon, version, kubernetesImageBaseType string) []KubernetesAddon {
defaults := getDefaultAddons(version, "", kubernetesImageBaseType)
func concatenateDefaultAddons(addons []KubernetesAddon, version string) []KubernetesAddon {
defaults := getDefaultAddons(version, "", common.KubernetesImageBaseTypeGCR)
defaults = append(defaults, addons...)
return defaults
}
Expand Down

0 comments on commit e547404

Please sign in to comment.