5 files changed, 8 insertions, 29 deletions
diff --git a/manifests/base/cm.yaml b/manifests/base/cm.yaml
index baaaab2..1eb0696 100644
--- a/manifests/base/cm.yaml
+++ b/manifests/base/cm.yaml
@@ -22,4 +22,4 @@ data:
     m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act 
 kind: ConfigMap
 metadata:
-  name: go-git-server
+  name: go-git-server-policy
diff --git a/manifests/base/deploy.yaml b/manifests/base/deploy.yaml
index f7ad0bf..bf18317 100644
--- a/manifests/base/deploy.yaml
+++ b/manifests/base/deploy.yaml
@@ -1,19 +1,16 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "3"
   labels:
-    app: go-git-server
+    app.kubernetes.io/name: go-git-server
   name: go-git-server
-  namespace: default
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:
-      app: go-git-server
+      app.kubernetes.io/name: go-git-server
   strategy:
     rollingUpdate:
       maxSurge: 25%
@@ -23,7 +20,7 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        app: go-git-server
+        app.kubernetes.io/name: go-git-server
     spec:
       containers:
       - image: go-git-registry:5000/go-git-server:latest
@@ -46,7 +43,7 @@ spec:
       volumes:
       - configMap:
           defaultMode: 420
-          name: go-git-policy
+          name: go-git-server-policy
         name: go-git-policy
       - name: go-git-storage
         persistentVolumeClaim:
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 952446b..0c32fb4 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -2,13 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 metadata:
   name: go-git-server
-
 commonLabels:
-  app: go-git-server
-
+  app.kubernetes.io/part-of: go-git-server
+  app.kubernetes.io/managed-by: kustomize
 resources:
 - cm.yaml
 - svc.yaml
-- pvc.yaml
 - deploy.yaml
 
diff --git a/manifests/base/pvc.yaml b/manifests/base/pvc.yaml
deleted file mode 100644
index 1a47dc5..0000000
--- a/manifests/base/pvc.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: go-git-storage
-  annotations:
-    volumeType: local
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: local-path
-  resources:
-    requests:
-      storage: 512Mi
-
diff --git a/manifests/base/svc.yaml b/manifests/base/svc.yaml
index 7305255..27cd2c8 100644
--- a/manifests/base/svc.yaml
+++ b/manifests/base/svc.yaml
@@ -1,12 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    app: go-git-server
   name: go-git-server
 spec:
   ports:
   - name: http
     port: 8080
   selector:
-    app: go-git-server
+    app.kubernetes.io/name: go-git-server