Merge pull request #752 from rphillips/fixes/calico_typo

assets: fix typo for Calico

Author: dghubble

pkg/asset/asset.go

@@ -42,9 +42,9 @@ const (
 	AssetPathCalico                      = "manifests/calico.yaml"
 	AssetPathCalicoPolicyOnly            = "manifests/calico-policy-only.yaml"
 	AssetPathCalicoCfg                   = "manifests/calico-config.yaml"
-	AssetPathCalcioSA                    = "manifests/calico-service-account.yaml"
-	AssetPathCalcioRole                  = "manifests/calico-role.yaml"
-	AssetPathCalcioRoleBinding           = "manifests/calico-role-binding.yaml"
+	AssetPathCalicoSA                    = "manifests/calico-service-account.yaml"
+	AssetPathCalicoRole                  = "manifests/calico-role.yaml"
+	AssetPathCalicoRoleBinding           = "manifests/calico-role-binding.yaml"
 	AssetPathCalicoBGPConfigsCRD         = "manifests/calico-bgp-configs-crd.yaml"
 	AssetPathCalicoFelixConfigsCRD       = "manifests/calico-felix-configs-crd.yaml"
 	AssetPathCalicoNetworkPoliciesCRD    = "manifests/calico-network-policies-crd.yaml"

pkg/asset/k8s.go

@@ -77,9 +77,9 @@ func newDynamicAssets(conf Config) Assets {
 	case NetworkCalico:
 		assets = append(assets,
 			MustCreateAssetFromTemplate(AssetPathCalicoCfg, internal.CalicoCfgTemplate, conf),
-			MustCreateAssetFromTemplate(AssetPathCalcioRole, internal.CalicoRoleTemplate, conf),
-			MustCreateAssetFromTemplate(AssetPathCalcioRoleBinding, internal.CalicoRoleBindingTemplate, conf),
-			MustCreateAssetFromTemplate(AssetPathCalcioSA, internal.CalicoServiceAccountTemplate, conf),
+			MustCreateAssetFromTemplate(AssetPathCalicoRole, internal.CalicoRoleTemplate, conf),
+			MustCreateAssetFromTemplate(AssetPathCalicoRoleBinding, internal.CalicoRoleBindingTemplate, conf),
+			MustCreateAssetFromTemplate(AssetPathCalicoSA, internal.CalicoServiceAccountTemplate, conf),
 			MustCreateAssetFromTemplate(AssetPathCalico, internal.CalicoNodeTemplate, conf),
 			MustCreateAssetFromTemplate(AssetPathCalicoBGPConfigsCRD, internal.CalicoBGPConfigsCRD, conf),
 			MustCreateAssetFromTemplate(AssetPathCalicoFelixConfigsCRD, internal.CalicoFelixConfigsCRD, conf),
@@ -88,9 +88,9 @@ func newDynamicAssets(conf Config) Assets {
 	case NetworkCanal:
 		assets = append(assets,
 			MustCreateAssetFromTemplate(AssetPathCalicoCfg, internal.CalicoCfgTemplate, conf),
-			MustCreateAssetFromTemplate(AssetPathCalcioRole, internal.CalicoRoleTemplate, conf),
-			MustCreateAssetFromTemplate(AssetPathCalcioRoleBinding, internal.CalicoRoleBindingTemplate, conf),
-			MustCreateAssetFromTemplate(AssetPathCalcioSA, internal.CalicoServiceAccountTemplate, conf),
+			MustCreateAssetFromTemplate(AssetPathCalicoRole, internal.CalicoRoleTemplate, conf),
+			MustCreateAssetFromTemplate(AssetPathCalicoRoleBinding, internal.CalicoRoleBindingTemplate, conf),
+			MustCreateAssetFromTemplate(AssetPathCalicoSA, internal.CalicoServiceAccountTemplate, conf),
 			MustCreateAssetFromTemplate(AssetPathCalicoPolicyOnly, internal.CalicoPolicyOnlyTemplate, conf),
 			MustCreateAssetFromTemplate(AssetPathCalicoBGPConfigsCRD, internal.CalicoBGPConfigsCRD, conf),
 			MustCreateAssetFromTemplate(AssetPathCalicoFelixConfigsCRD, internal.CalicoFelixConfigsCRD, conf),