updates to support the latest kustomize

adammohammed · Jan 28, 2019 · ea67649 · ea67649
1 parent b391fbb
commit ea67649
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/...ig_v1alpha1_lkeclusterproviderconfig.yaml → ...ig_v1alpha1_lkeclusterproviderconfig.yaml b/...ig_v1alpha1_lkeclusterproviderconfig.yaml → ...ig_v1alpha1_lkeclusterproviderconfig.yaml
diff --git a/...ig_v1alpha1_lkemachineproviderconfig.yaml → ...ig_v1alpha1_lkemachineproviderconfig.yaml b/...ig_v1alpha1_lkemachineproviderconfig.yaml → ...ig_v1alpha1_lkemachineproviderconfig.yaml
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: v1beta1
+kind: Kustomization
+
 # Adds namespace to all resources.
 namespace: cluster-api-provider-lke-system
 
@@ -17,12 +20,12 @@ namePrefix: cluster-api-provider-lke-
 # files that kustomize reads, modifies and emits as a
 # YAML string, with resources separated by document
 # markers ("---").
-resources:
-- ../crds/lkeproviderconfig_v1alpha1_lkeclusterproviderconfig.yaml
-- ../crds/lkeproviderconfig_v1alpha1_lkemachineproviderconfig.yaml
-- ../rbac/rbac_role.yaml
-- ../rbac/rbac_role_binding.yaml
-- ../manager/manager.yaml
 
-patches:
+resources:
+- crds/lkeproviderconfig_v1alpha1_lkeclusterproviderconfig.yaml
+- crds/lkeproviderconfig_v1alpha1_lkemachineproviderconfig.yaml
+- rbac/rbac_role.yaml
+- rbac/rbac_role_binding.yaml
+- manager/manager.yaml
+patchesStrategicMerge:
 - manager_image_patch.yaml
diff --git a/config/manager/manager.yaml → config/default/manager/manager.yaml b/config/manager/manager.yaml → config/default/manager/manager.yaml
diff --git a/config/rbac/rbac_role.yaml → config/default/rbac/rbac_role.yaml b/config/rbac/rbac_role.yaml → config/default/rbac/rbac_role.yaml
diff --git a/config/rbac/rbac_role_binding.yaml → config/default/rbac/rbac_role_binding.yaml b/config/rbac/rbac_role_binding.yaml → config/default/rbac/rbac_role_binding.yaml