chore(iab): fix k8s labels + selectors

ietf-tools · Aug 27, 2024 · f03dd8b · f03dd8b
1 parent 7b61a07
commit f03dd8b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/k8s/iabweb/cron.yaml b/k8s/iabweb/cron.yaml
@@ -41,4 +41,4 @@ spec:
           volumes:
             - name: iabwww-cfg
               configMap:
-                name: files-cfgmap
+                name: iabwww-files-cfgmap
diff --git a/k8s/iabweb/memcached.yaml b/k8s/iabweb/memcached.yaml
@@ -7,11 +7,15 @@ spec:
   revisionHistoryLimit: 2
   selector:
     matchLabels:
-      app: iabwww-memcached
+      app.kubernetes.io/instance: iabwww-memcached
   template:
     metadata:
       labels:
-        app: iabwww-memcached
+        app.kubernetes.io/name: memcached
+        app.kubernetes.io/instance: iabwww-memcached
+        app.kubernetes.io/version: "0.14.3"
+        app.kubernetes.io/component: memcached
+        app.kubernetes.io/part-of: iabwww
     spec:
       securityContext:
         runAsNonRoot: true
@@ -51,12 +55,13 @@ spec:
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
+      # ensures pod gets scheduled on the same node as wagtail:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
                 - iabwww-wagtail
@@ -81,4 +86,4 @@ spec:
       protocol: TCP
       name: metrics
   selector:
-    app: iabwww-memcached
+    app.kubernetes.io/instance: iabwww-memcached
diff --git a/k8s/iabweb/wagtail.yaml b/k8s/iabweb/wagtail.yaml
@@ -7,11 +7,15 @@ spec:
   revisionHistoryLimit: 2
   selector:
     matchLabels:
-      app: iabwww-wagtail
+      app.kubernetes.io/instance: iabwww-wagtail
   template:
     metadata:
       labels:
-        app: iabwww-wagtail
+        app.kubernetes.io/name: wagtail
+        app.kubernetes.io/instance: iabwww-wagtail
+        app.kubernetes.io/version: "$APP_IMAGE_TAG"
+        app.kubernetes.io/component: website
+        app.kubernetes.io/part-of: iabwww
     spec:
       securityContext:
         fsGroup: 1000
@@ -74,20 +78,22 @@ spec:
             sizeLimit: "1Gi"
         - name: iabwww-cfg
           configMap:
-            name: files-cfgmap
+            name: iabwww-files-cfgmap
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
+      # ensures we don't schedule this pod on the same node as ietfwww:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - ietfwww-wagtail
+                - ietfwww
             topologyKey: "kubernetes.io/hostname"
+            namespaceSelector: {}
   volumeClaimTemplates:
   - metadata:
       name: iabwww-media
@@ -111,4 +117,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app: iabwww-wagtail
+    app.kubernetes.io/instance: iabwww-wagtail