Merge "Rename calico folder to use major version part"

2020-09-01 16:50:23 +00:00 · 2020-09-01 16:50:23 +00:00 · 65b783f41a
parent 78364d7d44 e6f2e2407f
commit 65b783f41a
27 changed files with 1 additions and 1 deletions
--- a/manifests/composite/infra/kustomization.yaml
+++ b/manifests/composite/infra/kustomization.yaml
@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../function/cni/calico/v3.15
+  - ../../function/cni/calico/v3
--- a/manifests/function/cni/calico/v3.15/calico-config.yaml
+++ b/manifests/function/cni/calico/v3.15/calico-config.yaml
--- a/manifests/function/cni/calico/v3.15/crd/bgpconfigurations.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/bgpconfigurations.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/bgppeers.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/bgppeers.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/blockaffinities.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/blockaffinities.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/clusterinformations.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/clusterinformations.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/felixconfigurations.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/felixconfigurations.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/globalnetworkpolicies.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/globalnetworkpolicies.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/globalnetworksets.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/globalnetworksets.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/hostendpoints.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/hostendpoints.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/ipamblocks.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/ipamblocks.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/ipamconfigs.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/ipamconfigs.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/ipamhandles.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/ipamhandles.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/ippools.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/ippools.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/kubecontrollersconfigurations.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/kubecontrollersconfigurations.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/kustomization.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/kustomization.yaml
--- a/manifests/function/cni/calico/v3.15/crd/networkpolicies.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/networkpolicies.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/crd/networksets.crd.projectcalico.org.yaml
+++ b/manifests/function/cni/calico/v3.15/crd/networksets.crd.projectcalico.org.yaml
--- a/manifests/function/cni/calico/v3.15/kube-controller.yaml
+++ b/manifests/function/cni/calico/v3.15/kube-controller.yaml
--- a/manifests/function/cni/calico/v3.15/kustomization.yaml
+++ b/manifests/function/cni/calico/v3.15/kustomization.yaml
--- a/manifests/function/cni/calico/v3.15/node.yaml
+++ b/manifests/function/cni/calico/v3.15/node.yaml
--- a/manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml
+++ b/manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml
--- a/manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml.v15
+++ b/manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml.v15
--- a/manifests/function/cni/calico/v3.15/rbac/kube-controllers-service-account.yaml
+++ b/manifests/function/cni/calico/v3.15/rbac/kube-controllers-service-account.yaml
--- a/manifests/function/cni/calico/v3.15/rbac/kustomization.yaml
+++ b/manifests/function/cni/calico/v3.15/rbac/kustomization.yaml
--- a/manifests/function/cni/calico/v3.15/rbac/node-rolebinding.yaml
+++ b/manifests/function/cni/calico/v3.15/rbac/node-rolebinding.yaml
--- a/manifests/function/cni/calico/v3.15/rbac/node-service-account.yaml
+++ b/manifests/function/cni/calico/v3.15/rbac/node-service-account.yaml