From 1c9a0303fd780299c1f019570fc3f919cfa8aeb4 Mon Sep 17 00:00:00 2001
From: shokohsc <shokohsc@gmail.com>
Date: Thu, 12 Aug 2021 19:17:33 +0200
Subject: [PATCH] chore(skaffold): refine shokohsc profile

---
 k8s/base/deployment.yaml                 |  8 ------
 k8s/overlays/shokohsc/deployment.yaml    | 36 ++++++++++++++++++++++++
 k8s/overlays/shokohsc/ingress.yaml       |  3 --
 k8s/overlays/shokohsc/kustomization.yaml |  9 ++++--
 k8s/overlays/shokohsc/namespace.yaml     |  8 ++++++
 k8s/overlays/shokohsc/rbac.yaml          | 26 +++++++++++++++++
 k8s/overlays/shokohsc/service.yaml       | 16 +++++++++++
 7 files changed, 92 insertions(+), 14 deletions(-)
 create mode 100644 k8s/overlays/shokohsc/deployment.yaml
 create mode 100644 k8s/overlays/shokohsc/namespace.yaml
 create mode 100644 k8s/overlays/shokohsc/rbac.yaml
 create mode 100644 k8s/overlays/shokohsc/service.yaml

diff --git a/k8s/base/deployment.yaml b/k8s/base/deployment.yaml
index 1da33e2..3a33cee 100644
--- a/k8s/base/deployment.yaml
+++ b/k8s/base/deployment.yaml
@@ -18,14 +18,6 @@ spec:
       containers:
         - name: flame
           image: shokohsc/flame
-          command:
-            - npm
-          args:
-            - run
-            - skaffold
-          env:
-            - name: NODE_ENV
-              value: development
           ports:
             - name: http
               containerPort: 5005
diff --git a/k8s/overlays/shokohsc/deployment.yaml b/k8s/overlays/shokohsc/deployment.yaml
new file mode 100644
index 0000000..8649fac
--- /dev/null
+++ b/k8s/overlays/shokohsc/deployment.yaml
@@ -0,0 +1,36 @@
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: flame
+spec:
+  selector:
+    matchLabels:
+      app: flame
+  template:
+    metadata:
+      labels:
+        app: flame
+    spec:
+      serviceAccountName: flame-dev
+      securityContext:
+        fsGroup: 1000
+      containers:
+        - name: flame
+          image: shokohsc/flame
+          command:
+            - npm
+          args:
+            - run
+            - skaffold
+          env:
+            - name: NODE_ENV
+              value: development
+          ports:
+            - name: http
+              containerPort: 5005
+              protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
diff --git a/k8s/overlays/shokohsc/ingress.yaml b/k8s/overlays/shokohsc/ingress.yaml
index e79cc38..5d523fa 100644
--- a/k8s/overlays/shokohsc/ingress.yaml
+++ b/k8s/overlays/shokohsc/ingress.yaml
@@ -6,9 +6,6 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
     cert-manager.io/cluster-issuer: ca-cluster-issuer
-    forecastle.stakater.com/expose: "true"
-    forecastle.stakater.com/group: dev
-    forecastle.stakater.com/appName: flame
     flame.pawelmalak/name: flame
     flame.pawelmalak/url: dev.flame.shokohsc.home
     flame.pawelmalak/type: app
diff --git a/k8s/overlays/shokohsc/kustomization.yaml b/k8s/overlays/shokohsc/kustomization.yaml
index 46c3f3b..8eff20c 100644
--- a/k8s/overlays/shokohsc/kustomization.yaml
+++ b/k8s/overlays/shokohsc/kustomization.yaml
@@ -1,6 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-  - ../../base
-patchesStrategicMerge:
+namespace: flame-dev
+resources:
+  - namespace.yaml
+  - deployment.yaml
+  - service.yaml
   - ingress.yaml
+  - rbac.yaml
diff --git a/k8s/overlays/shokohsc/namespace.yaml b/k8s/overlays/shokohsc/namespace.yaml
new file mode 100644
index 0000000..d767629
--- /dev/null
+++ b/k8s/overlays/shokohsc/namespace.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: flame-dev
+  labels:
+    namespace: flame-dev
+    goldilocks.fairwinds.com/enabled: "true"
diff --git a/k8s/overlays/shokohsc/rbac.yaml b/k8s/overlays/shokohsc/rbac.yaml
new file mode 100644
index 0000000..2fdc1e6
--- /dev/null
+++ b/k8s/overlays/shokohsc/rbac.yaml
@@ -0,0 +1,26 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: flame-dev
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: flame-dev
+rules:
+- apiGroups: ["networking.k8s.io"]
+  resources: ["ingresses"]
+  verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: flame-dev
+subjects:
+- kind: ServiceAccount
+  name: flame-dev
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: flame-dev
diff --git a/k8s/overlays/shokohsc/service.yaml b/k8s/overlays/shokohsc/service.yaml
new file mode 100644
index 0000000..d6cf340
--- /dev/null
+++ b/k8s/overlays/shokohsc/service.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: flame
+  labels:
+    app: flame
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: flame