From e6f2e2407fcaee71082462eecc6a01a49041ed0d Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Tue, 1 Sep 2020 14:53:42 +0000 Subject: [PATCH] Rename calico folder to use major version part * Use just the major part for the calico version for folder naming. * For any minor uprades, it will be just reference updates within manifests. * When moving to major version, then we will add a new folder with that version naming (v4) Change-Id: I1ee30af26c3030531ef719a3cb649fb999d0244c --- manifests/composite/infra/kustomization.yaml | 2 +- manifests/function/cni/calico/{v3.15 => v3}/calico-config.yaml | 0 .../crd/bgpconfigurations.crd.projectcalico.org.yaml | 0 .../{v3.15 => v3}/crd/bgppeers.crd.projectcalico.org.yaml | 0 .../crd/blockaffinities.crd.projectcalico.org.yaml | 0 .../crd/clusterinformations.crd.projectcalico.org.yaml | 0 .../crd/felixconfigurations.crd.projectcalico.org.yaml | 0 .../crd/globalnetworkpolicies.crd.projectcalico.org.yaml | 0 .../crd/globalnetworksets.crd.projectcalico.org.yaml | 0 .../{v3.15 => v3}/crd/hostendpoints.crd.projectcalico.org.yaml | 0 .../{v3.15 => v3}/crd/ipamblocks.crd.projectcalico.org.yaml | 0 .../{v3.15 => v3}/crd/ipamconfigs.crd.projectcalico.org.yaml | 0 .../{v3.15 => v3}/crd/ipamhandles.crd.projectcalico.org.yaml | 0 .../calico/{v3.15 => v3}/crd/ippools.crd.projectcalico.org.yaml | 0 .../kubecontrollersconfigurations.crd.projectcalico.org.yaml | 0 .../function/cni/calico/{v3.15 => v3}/crd/kustomization.yaml | 0 .../crd/networkpolicies.crd.projectcalico.org.yaml | 0 .../{v3.15 => v3}/crd/networksets.crd.projectcalico.org.yaml | 0 .../function/cni/calico/{v3.15 => v3}/kube-controller.yaml | 0 manifests/function/cni/calico/{v3.15 => v3}/kustomization.yaml | 0 manifests/function/cni/calico/{v3.15 => v3}/node.yaml | 0 .../cni/calico/{v3.15 => v3}/rbac/kube-controllers-role.yaml | 0 .../calico/{v3.15 => v3}/rbac/kube-controllers-role.yaml.v15 | 0 .../{v3.15 => v3}/rbac/kube-controllers-service-account.yaml | 0 .../function/cni/calico/{v3.15 => v3}/rbac/kustomization.yaml | 0 .../cni/calico/{v3.15 => v3}/rbac/node-rolebinding.yaml | 0 .../cni/calico/{v3.15 => v3}/rbac/node-service-account.yaml | 0 27 files changed, 1 insertion(+), 1 deletion(-) rename manifests/function/cni/calico/{v3.15 => v3}/calico-config.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/bgpconfigurations.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/bgppeers.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/blockaffinities.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/clusterinformations.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/felixconfigurations.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/globalnetworkpolicies.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/globalnetworksets.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/hostendpoints.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/ipamblocks.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/ipamconfigs.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/ipamhandles.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/ippools.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/kubecontrollersconfigurations.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/kustomization.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/networkpolicies.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/crd/networksets.crd.projectcalico.org.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/kube-controller.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/kustomization.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/node.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/rbac/kube-controllers-role.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/rbac/kube-controllers-role.yaml.v15 (100%) rename manifests/function/cni/calico/{v3.15 => v3}/rbac/kube-controllers-service-account.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/rbac/kustomization.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/rbac/node-rolebinding.yaml (100%) rename manifests/function/cni/calico/{v3.15 => v3}/rbac/node-service-account.yaml (100%) diff --git a/manifests/composite/infra/kustomization.yaml b/manifests/composite/infra/kustomization.yaml index 225cf7ec9..e1bc09ea3 100644 --- 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 diff --git a/manifests/function/cni/calico/v3.15/calico-config.yaml b/manifests/function/cni/calico/v3/calico-config.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/calico-config.yaml rename to manifests/function/cni/calico/v3/calico-config.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/bgpconfigurations.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/bgpconfigurations.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/bgpconfigurations.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/bgpconfigurations.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/bgppeers.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/bgppeers.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/bgppeers.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/bgppeers.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/blockaffinities.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/blockaffinities.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/blockaffinities.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/blockaffinities.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/clusterinformations.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/clusterinformations.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/clusterinformations.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/clusterinformations.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/felixconfigurations.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/felixconfigurations.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/felixconfigurations.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/felixconfigurations.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/globalnetworkpolicies.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/globalnetworkpolicies.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/globalnetworkpolicies.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/globalnetworkpolicies.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/globalnetworksets.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/globalnetworksets.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/globalnetworksets.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/globalnetworksets.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/hostendpoints.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/hostendpoints.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/hostendpoints.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/hostendpoints.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/ipamblocks.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/ipamblocks.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/ipamblocks.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/ipamblocks.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/ipamconfigs.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/ipamconfigs.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/ipamconfigs.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/ipamconfigs.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/ipamhandles.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/ipamhandles.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/ipamhandles.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/ipamhandles.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/ippools.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/ippools.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/ippools.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/ippools.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/kubecontrollersconfigurations.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/kubecontrollersconfigurations.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/kubecontrollersconfigurations.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/kubecontrollersconfigurations.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/kustomization.yaml b/manifests/function/cni/calico/v3/crd/kustomization.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/kustomization.yaml rename to manifests/function/cni/calico/v3/crd/kustomization.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/networkpolicies.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/networkpolicies.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/networkpolicies.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/networkpolicies.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/crd/networksets.crd.projectcalico.org.yaml b/manifests/function/cni/calico/v3/crd/networksets.crd.projectcalico.org.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/crd/networksets.crd.projectcalico.org.yaml rename to manifests/function/cni/calico/v3/crd/networksets.crd.projectcalico.org.yaml diff --git a/manifests/function/cni/calico/v3.15/kube-controller.yaml b/manifests/function/cni/calico/v3/kube-controller.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/kube-controller.yaml rename to manifests/function/cni/calico/v3/kube-controller.yaml diff --git a/manifests/function/cni/calico/v3.15/kustomization.yaml b/manifests/function/cni/calico/v3/kustomization.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/kustomization.yaml rename to manifests/function/cni/calico/v3/kustomization.yaml diff --git a/manifests/function/cni/calico/v3.15/node.yaml b/manifests/function/cni/calico/v3/node.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/node.yaml rename to manifests/function/cni/calico/v3/node.yaml diff --git a/manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml b/manifests/function/cni/calico/v3/rbac/kube-controllers-role.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml rename to manifests/function/cni/calico/v3/rbac/kube-controllers-role.yaml diff --git a/manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml.v15 b/manifests/function/cni/calico/v3/rbac/kube-controllers-role.yaml.v15 similarity index 100% rename from manifests/function/cni/calico/v3.15/rbac/kube-controllers-role.yaml.v15 rename to manifests/function/cni/calico/v3/rbac/kube-controllers-role.yaml.v15 diff --git a/manifests/function/cni/calico/v3.15/rbac/kube-controllers-service-account.yaml b/manifests/function/cni/calico/v3/rbac/kube-controllers-service-account.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/rbac/kube-controllers-service-account.yaml rename to manifests/function/cni/calico/v3/rbac/kube-controllers-service-account.yaml diff --git a/manifests/function/cni/calico/v3.15/rbac/kustomization.yaml b/manifests/function/cni/calico/v3/rbac/kustomization.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/rbac/kustomization.yaml rename to manifests/function/cni/calico/v3/rbac/kustomization.yaml diff --git a/manifests/function/cni/calico/v3.15/rbac/node-rolebinding.yaml b/manifests/function/cni/calico/v3/rbac/node-rolebinding.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/rbac/node-rolebinding.yaml rename to manifests/function/cni/calico/v3/rbac/node-rolebinding.yaml diff --git a/manifests/function/cni/calico/v3.15/rbac/node-service-account.yaml b/manifests/function/cni/calico/v3/rbac/node-service-account.yaml similarity index 100% rename from manifests/function/cni/calico/v3.15/rbac/node-service-account.yaml rename to manifests/function/cni/calico/v3/rbac/node-service-account.yaml