From 0956f0920288f7c29ae3ed4fdaf71679d430fa8e Mon Sep 17 00:00:00 2001
From: rohank07 <rohank_17@hotmail.ca>
Date: Fri, 21 Jan 2022 09:04:13 -0500
Subject: [PATCH 1/2] feat(component): Add apps component notebook-controller

---
 .../notebook-controller/base/deployment.yaml  | 30 +++++++++++++++++++
 .../base/kustomization.yaml                   |  7 +++++
 kustomize/stacks/aaw/kustomization.yaml       |  2 ++
 kustomize/stacks/local/kustomization.yaml     |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 kustomize/apps/notebook-controller/base/deployment.yaml
 create mode 100644 kustomize/apps/notebook-controller/base/kustomization.yaml

diff --git a/kustomize/apps/notebook-controller/base/deployment.yaml b/kustomize/apps/notebook-controller/base/deployment.yaml
new file mode 100644
index 0000000..f09baac
--- /dev/null
+++ b/kustomize/apps/notebook-controller/base/deployment.yaml
@@ -0,0 +1,30 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: deployment
+spec:
+  template:
+    metadata:
+      annotations:
+        sidecar.istio.io/inject: "false"
+    spec:
+      containers:
+      - name: manager
+        image: gcr.io/kubeflow-images-public/notebook-controller:v1.1.0-gd3377cbd
+        command:
+          - /manager
+        env:
+          - name: ENABLE_CULLING
+            value: "true"
+          - name: IDLE_TIME
+            value: "1440"
+          - name: CULLING_CHECK_PERIOD
+            value: "1"
+        imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: 8080
+          initialDelaySeconds: 30
+          periodSeconds: 30
+      serviceAccountName: service-account
diff --git a/kustomize/apps/notebook-controller/base/kustomization.yaml b/kustomize/apps/notebook-controller/base/kustomization.yaml
new file mode 100644
index 0000000..44f6b9a
--- /dev/null
+++ b/kustomize/apps/notebook-controller/base/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- github.com/kubeflow/manifests/apps/jupyter/notebook-controller/upstream/overlays/kubeflow?ref=v1.3.1
+
+patchesStrategicMerge:
+- deployment.yaml
diff --git a/kustomize/stacks/aaw/kustomization.yaml b/kustomize/stacks/aaw/kustomization.yaml
index 27de09d..f58c4ba 100644
--- a/kustomize/stacks/aaw/kustomization.yaml
+++ b/kustomize/stacks/aaw/kustomization.yaml
@@ -39,3 +39,5 @@ resources:
 - ../../apps/jupyter-web-app/base
 - ../../apps/kfserving/base
 - ../../apps/profiles/base
+- ../../apps/notebook-controller/base
+
diff --git a/kustomize/stacks/local/kustomization.yaml b/kustomize/stacks/local/kustomization.yaml
index 14ae541..a1f5628 100644
--- a/kustomize/stacks/local/kustomization.yaml
+++ b/kustomize/stacks/local/kustomization.yaml
@@ -22,3 +22,4 @@ resources:
 - ../../apps/jupyter-web-app/base
 - ../../apps/kfserving/base
 - ../../apps/profiles/base
+- ../../apps/notebook-controller/base

From f19e21ae9afad26a44d3ae15420cf40350ee9a18 Mon Sep 17 00:00:00 2001
From: William Hearn <sylus1984@gmail.com>
Date: Fri, 21 Jan 2022 09:23:48 -0500
Subject: [PATCH 2/2] feat(component): Add apps component notebook-controller

---
 kustomize/apps/notebook-controller/base/kustomization.yaml | 1 +
 kustomize/stacks/aaw/kustomization.yaml                    | 3 +--
 kustomize/stacks/local/kustomization.yaml                  | 2 +-
 kustomize/stacks/upstream/kustomization.yaml               | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kustomize/apps/notebook-controller/base/kustomization.yaml b/kustomize/apps/notebook-controller/base/kustomization.yaml
index 44f6b9a..d1ac176 100644
--- a/kustomize/apps/notebook-controller/base/kustomization.yaml
+++ b/kustomize/apps/notebook-controller/base/kustomization.yaml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
 resources:
 - github.com/kubeflow/manifests/apps/jupyter/notebook-controller/upstream/overlays/kubeflow?ref=v1.3.1
 
diff --git a/kustomize/stacks/aaw/kustomization.yaml b/kustomize/stacks/aaw/kustomization.yaml
index f58c4ba..ec1223c 100644
--- a/kustomize/stacks/aaw/kustomization.yaml
+++ b/kustomize/stacks/aaw/kustomization.yaml
@@ -38,6 +38,5 @@ resources:
 - ../../apps/pipeline/base
 - ../../apps/jupyter-web-app/base
 - ../../apps/kfserving/base
-- ../../apps/profiles/base
 - ../../apps/notebook-controller/base
-
+- ../../apps/profiles/base
diff --git a/kustomize/stacks/local/kustomization.yaml b/kustomize/stacks/local/kustomization.yaml
index a1f5628..797daca 100644
--- a/kustomize/stacks/local/kustomization.yaml
+++ b/kustomize/stacks/local/kustomization.yaml
@@ -21,5 +21,5 @@ resources:
 - ../../apps/pipeline/base
 - ../../apps/jupyter-web-app/base
 - ../../apps/kfserving/base
-- ../../apps/profiles/base
 - ../../apps/notebook-controller/base
+- ../../apps/profiles/base
diff --git a/kustomize/stacks/upstream/kustomization.yaml b/kustomize/stacks/upstream/kustomization.yaml
index b49aa47..31f7e1d 100644
--- a/kustomize/stacks/upstream/kustomization.yaml
+++ b/kustomize/stacks/upstream/kustomization.yaml
@@ -21,4 +21,5 @@ resources:
 - ../../apps/pipeline/base
 - ../../apps/jupyter-web-app/base
 - ../../apps/kfserving/base
+- ../../apps/notebook-controller/base
 - ../../apps/profiles/base