Merge pull request #47 from rustycl0ck/kpt

Integrate `kpt` with Kustomize resources
mercari · Oct 29, 2021 · f547b22 · f547b22
2 parents 0b4381e + 98c65e3
commit f547b22
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 349 deletions.
diff --git a/README.md b/README.md
@@ -76,23 +76,36 @@ $ kubectl apply -f config/samples/spanner_v1alpha1_spannerautoscaler.yaml
 
 ### KPT
 
-Spanner Autoscaler can be installed using [KPT](https://github.com/GoogleContainerTools/kpt).
+Spanner Autoscaler can be installed using [KPT](https://kpt.dev/installation/).
 The installation has 2 steps:
 
-1. Fetch package
-2. Create Custom Resource
+1. Deploy the operator through `kpt`
+2. Create a Custom Resource for managing a spanner instance
 
-#### 1. Fetch package
+#### 1. Deploy the operator
 
-```
-$ mkdir tmp
-$ kpt pkg get https://github.com/mercari/spanner-autoscaler tmp/
-```
+```console
+$ kpt pkg get https://github.com/mercari/spanner-autoscaler/[email protected] spanner-autoscaler
+$ kpt live init spanner-autoscaler/kpt
+$ kpt live install-resource-group
 
-#### 2. Create Custom Resource
+## Append '--dry-run' to the below line to just 
+## check the resources which will be created
+$ kustomize build spanner-autoscaler/kpt | kpt live apply -
 
+## To uninstall, use the following
+$ kustomize build spanner-autoscaler/kpt | kpt live destroy -
 ```
-$ kubectl apply -R -f tmp/kpt
+> :information_source: **TIP:** Instead of `kpt`, you can also use `kubectl` directly to apply the resources with 
+>  ```console
+> $ kustomize build spanner-autoscaler/default | kubectl apply -f -
+> ```
+> These resources can then be adopted by `kpt` by using the `--inventory-policy=adopt` flag while using `kpt live apply` command. [More info](https://kpt.dev/reference/cli/live/apply/?id=flags).
+
+#### 2. Create a Custom Resource
+
+```console
+$ kubectl apply -f spanner-autoscaler/samples/spanner_v1alpha1_spannerautoscaler.yaml
 ```
 
 ### (Optional) Setting GKE Workload Identity

diff --git a/config/kpt/Kptfile b/config/kpt/Kptfile
@@ -0,0 +1,6 @@
+apiVersion: kpt.dev/v1
+kind: Kptfile
+metadata:
+ name: spanner-autoscaler
+info:
+ description: Autoscaler for Google Cloud Spanner
diff --git a/config/kpt/kustomization.yaml b/config/kpt/kustomization.yaml
@@ -0,0 +1,4 @@
+resources:
+- ../default
+- Kptfile
+
diff --git a/kpt/Kptfile b/kpt/Kptfile
diff --git a/kpt/crd/spannerautoscalers.spanner.mercari.com.yaml b/kpt/crd/spannerautoscalers.spanner.mercari.com.yaml
diff --git a/kpt/deployment/deployment.yaml b/kpt/deployment/deployment.yaml
diff --git a/kpt/namespace.yaml b/kpt/namespace.yaml
diff --git a/kpt/role/cluster_role.yaml b/kpt/role/cluster_role.yaml
diff --git a/kpt/role/cluster_role_binding.yaml b/kpt/role/cluster_role_binding.yaml
diff --git a/kpt/role/role.yaml b/kpt/role/role.yaml