chore: refactor manifests to use haproxy class and clean up labels

5 files changed, 30 insertions, 17 deletions

diff --git a/grumpy/sally/cert.yaml b/grumpy/sally/cert.yaml
new file mode 100644
index 0000000..e11b77c
--- /dev/null
+++ b/grumpy/sally/cert.yaml
@@ -0,0 +1,13 @@
+apiVersion: cert-manager.io/v1  
+kind: Certificate               
+metadata:                       
+  name: go-ofmax-li            
+  namespace: go-git-server      
+spec:                           
+  secretName: go-ofmax-li-sec  
+  issuerRef:                    
+    name: letsencrypt-prod      
+    kind: ClusterIssuer         
+  commonName: 'go.ofmax.li'    
+  dnsNames:                     
+    - go.ofmax.li              
diff --git a/grumpy/sally/deploy.yaml b/grumpy/sally/deploy.yaml
index 8368603..e3a3bf2 100644
--- a/grumpy/sally/deploy.yaml
+++ b/grumpy/sally/deploy.yaml
@@ -1,22 +1,20 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: sally-deployment
-  labels:
-    app: sally
+  name: sally
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: sally
+      app.kubernetes.io/name: sally
   template:
     metadata:
       labels:
-        app: sally
+        app.kubernetes.io/name: sally
     spec:
       containers:
       - name: sally
-        image: registry.gitlab.com/grumps/grumpy-containers/sally:latest
+        image: public.ecr.aws/s0f9o2k5/sally:v0.2.0
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/grumpy/sally/ingress.yaml b/grumpy/sally/ingress.yaml
index a487f12..492402f 100644
--- a/grumpy/sally/ingress.yaml
+++ b/grumpy/sally/ingress.yaml
@@ -4,20 +4,16 @@ metadata:
   annotations:
     certmanager.k8s.io/cluseterissuer: letsencrypt-prod
     ingress.kubernetes.io/ssl-redirect: "true"
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/frontend-entry-points: http,https
-    traefik.ingress.kubernetes.io/redirect-entry-point: https
-    traefik.ingress.kubernetes.io/redirect-permanent: "true"
-  labels:
-  name: sally-gopher-proxy
+  name: sally
 spec:
+  ingressClassName: haproxy
   rules:
   - host: go.ofmax.li
     http:
       paths:
       - backend:
           service:
-            name: sally-service
+            name: sally
             port:
               number: 8080
         pathType: Prefix
@@ -25,4 +21,4 @@ spec:
   tls:
   - hosts:
     - go.ofmax.li
-    secretName: prod-ofmax-li-sec  
+    secretName: go-ofmax-li-sec 
diff --git a/grumpy/sally/kustomization.yaml b/grumpy/sally/kustomization.yaml
index f300ec0..bf2465f 100644
--- a/grumpy/sally/kustomization.yaml
+++ b/grumpy/sally/kustomization.yaml
@@ -4,3 +4,11 @@ resources:
   - deploy.yaml
   - ingress.yaml
   - service.yaml
+  - cert.yaml
+labels:
+- pairs:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/part-of: grumps-charts
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/name: sally
diff --git a/grumpy/sally/service.yaml b/grumpy/sally/service.yaml
index 2c5430b..94b8297 100644
--- a/grumpy/sally/service.yaml
+++ b/grumpy/sally/service.yaml
@@ -1,10 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: sally-service
+  name: sally
 spec:
-  selector:
-    app: sally
   ports:
     - protocol: TCP
       port: 8080