fix: update labels

11 files changed, 13 insertions, 94 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/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
diff --git a/manifests/cgit/cgit-deploy.yaml b/manifests/cgit/cgit-deploy.yaml
index cfbdeb8..59a8a72 100644
--- a/manifests/cgit/cgit-deploy.yaml
+++ b/manifests/cgit/cgit-deploy.yaml
@@ -6,12 +6,10 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/instance: cgit
       app.kubernetes.io/name: cgit
   template:
     metadata:
       labels:
-        app.kubernetes.io/instance: cgit
         app.kubernetes.io/name: cgit
     spec:
       containers:
diff --git a/manifests/cgit/cgit-svc.yaml b/manifests/cgit/cgit-svc.yaml
index 9165c59..9d3bdd1 100644
--- a/manifests/cgit/cgit-svc.yaml
+++ b/manifests/cgit/cgit-svc.yaml
@@ -5,10 +5,9 @@ metadata:
 spec:
   ports:
   - name: http
-    port: 8080
+    port: 8081
     protocol: TCP
     targetPort: http
   selector:
-    app.kubernetes.io/instance: cgit
     app.kubernetes.io/name: cgit
   type: ClusterIP
diff --git a/manifests/cgit/kustomization.yaml b/manifests/cgit/kustomization.yaml
index 9a8a4af..145b0e8 100644
--- a/manifests/cgit/kustomization.yaml
+++ b/manifests/cgit/kustomization.yaml
@@ -1,9 +1,6 @@
 # Labels to add to all resources and selectors.
 commonLabels:
-  app.kubernetes.io/instance: cgit
   app.kubernetes.io/name: cgit
-  app.kubernetes.io/version: "1.0"
-  helm.sh/chart: cgit-0.1.0
 
 # Images modify the tags for images without
 # creating patches.
@@ -11,10 +8,6 @@ images:
 - name: registry.gitlab.com/grumps/grumpy-containers/cgit
   newTag: latest
 
-# Value of this field is prepended to the
-# names of all resources
-namePrefix: cgit
-
 # List of resource files that kustomize reads, modifies
 # and emits as a YAML string
 resources:
diff --git a/manifests/deploy.yaml b/manifests/deploy.yaml
deleted file mode 100644
index f80592d..0000000
--- a/manifests/deploy.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "7"
-  labels:
-    app: go-git-server
-  name: go-git-server
-  namespace: default
-spec:
-  progressDeadlineSeconds: 600
-  replicas: 1
-  revisionHistoryLimit: 10
-  selector:
-    matchLabels:
-      app: go-git-server
-  strategy:
-    rollingUpdate:
-      maxSurge: 25%
-      maxUnavailable: 25%
-    type: RollingUpdate
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        app: go-git-server
-    spec:
-      containers:
-      - image: public.ecr.aws/s0f9o2k5/go-git-server:latest
-        imagePullPolicy: Always
-        name: go-git-server
-        terminationMessagePath: /dev/termination-log
-        terminationMessagePolicy: File
-        volumeMounts:
-        - mountPath: /tokens
-          name: go-git-server-tokens
-          readOnly: true
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      schedulerName: default-scheduler
-      terminationGracePeriodSeconds: 30
-      volumes:
-      - name: go-git-server-tokens
-        secret:
-          defaultMode: 420
-          secretName: go-git-server
diff --git a/manifests/local/kustomization.yaml b/manifests/local/kustomization.yaml
index ffd5223..a937a48 100644
--- a/manifests/local/kustomization.yaml
+++ b/manifests/local/kustomization.yaml
@@ -3,12 +3,14 @@ kind: Kustomization
 metadata:
   name: go-git-server-local
 
-commonLabels:
-  app: go-git-server
+commonLabels:                               
+  app.kubernetes.io/part-of: go-git-server  
+  app.kubernetes.io/managed-by: kustomize   
 
 resources:
 - ../base
 - ../cgit
+- pvc.yaml
 
 images:
 - name: public.ecr.aws/s0f9o2k5/go-git-server
diff --git a/manifests/base/pvc.yaml b/manifests/local/pvc.yaml
index 1a47dc5..1a47dc5 100644
--- a/manifests/base/pvc.yaml
+++ b/manifests/local/pvc.yaml
diff --git a/manifests/svc.yaml b/manifests/svc.yaml
deleted file mode 100644
index 0f1e1a2..0000000
--- a/manifests/svc.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: go-git-server
-  name: go-git-server
-  namespace: default
-spec:
-  clusterIP: 10.43.87.231
-  clusterIPs:
-  - 10.43.87.231
-  internalTrafficPolicy: Cluster
-  ipFamilies:
-  - IPv4
-  ipFamilyPolicy: SingleStack
-  ports:
-  - name: 8080-8080
-    port: 8080
-  selector:
-    app: go-git-server