From bcdea39dd2dcd0d034f2a219979a492027850c4d Mon Sep 17 00:00:00 2001 From: Vince Prignano Date: Mon, 25 Feb 2019 14:30:32 -0800 Subject: [PATCH] Move kustomization.yaml in default and use bases Signed-off-by: Vince Prignano --- config/BUILD.bazel | 4 ++-- config/{ => default}/kustomization.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename config/{ => default}/kustomization.yaml (84%) diff --git a/config/BUILD.bazel b/config/BUILD.bazel index c12105547763..2b62279db3ae 100644 --- a/config/BUILD.bazel +++ b/config/BUILD.bazel @@ -13,10 +13,10 @@ genrule( name = "cluster-api-yaml", srcs = [ ":kustomize-yaml", - ":kustomization.yaml", + ":default/kustomization.yaml", ], outs = ["cluster_api.yaml"], - cmd = "$(location @io_k8s_sigs_kustomize//:kustomize) build $$(dirname $(location :kustomization.yaml)) > $@", + cmd = "$(location @io_k8s_sigs_kustomize//:kustomize) build $$(dirname $(location :default/kustomization.yaml)) > $@", tools = ["@io_k8s_sigs_kustomize//:kustomize"], visibility = ["//visibility:public"], ) diff --git a/config/kustomization.yaml b/config/default/kustomization.yaml similarity index 84% rename from config/kustomization.yaml rename to config/default/kustomization.yaml index 6c39a5f49b9b..edf8c7b3a39f 100644 --- a/config/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -9,9 +9,9 @@ namespace: cluster-api-system namePrefix: cluster-api- bases: -- crds/ -- rbac/ -- manager/ +- ../crds/ +- ../rbac/ +- ../manager/ patches: -- default/manager_image_patch.yaml +- manager_image_patch.yaml