Fix keip controller's auto-generated labels. Remove default resource requests and limits. (#34)

Author: a-asaad

operator/Makefile

@@ -1,4 +1,4 @@
-VERSION ?= 0.10.0
+VERSION ?= 0.10.1
 GIT_TAG := operator_v$(VERSION)
 KEIP_INTEGRATION_IMAGE ?= ghcr.io/octoconsulting/keip/minimal-app:latest
 

operator/controller/core-controller.yaml

@@ -56,7 +56,7 @@ spec:
     spec:
       containers:
         - name: webhook
-          image: ghcr.io/octoconsulting/keip/route-webhook:0.13.0
+          image: ghcr.io/octoconsulting/keip/route-webhook:0.13.1
           ports:
             - containerPort: 7080
               name: webhook-http

operator/webhook/Makefile

@@ -1,4 +1,4 @@
-VERSION ?= 0.13.0
+VERSION ?= 0.13.1
 HOST_PORT ?= 7080
 GIT_TAG := webhook_v$(VERSION)
 

operator/webhook/core/sync.py

@@ -370,11 +370,6 @@ def _create_pod_template(parent, labels, integration_image) -> Mapping[str, Any]
     resources = parent["spec"].get("resources")
     if resources:
         pod_template["spec"]["containers"][0]["resources"] = resources
-    else:
-        pod_template["spec"]["containers"][0]["resources"] = {
-            "requests": {"cpu": "500m", "memory": "1Gi"},
-            "limits": {"memory": "2Gi"},
-        }
 
     env_from = parent["spec"].get("envFrom")
     if env_from:
@@ -387,10 +382,9 @@ def _new_deployment(parent):
     parent_metadata = parent["metadata"]
 
     autogenerated_labels = {
-        "app.kubernetes.io/managed-by": "keip-integrationroute-controller",
-        "app.kubernetes.io/name": "integrationroute",
-        "app.kubernetes.io/instance": f'integrationroute-{parent_metadata["name"]}',
-        "app.kubernetes.io/version": "latest",
+        "app.kubernetes.io/component": "integration-route",
+        "app.kubernetes.io/managed-by": "keip",
+        "app.kubernetes.io/name": parent_metadata["name"],
     }
 
     labels = autogenerated_labels | parent["spec"].get("labels", {})
@@ -406,7 +400,7 @@ def _new_deployment(parent):
         "spec": {
             "selector": {
                 "matchLabels": {
-                    "app.kubernetes.io/instance": labels["app.kubernetes.io/instance"]
+                    "app.kubernetes.io/name": labels["app.kubernetes.io/name"]
                 }
             },
             "replicas": parent["spec"]["replicas"],
@@ -445,9 +439,7 @@ def _new_actuator_service(parent):
                     "targetPort": management_port,
                 }
             ],
-            "selector": {
-                "app.kubernetes.io/instance": f'integrationroute-{parent_metadata["name"]}'
-            },
+            "selector": {"app.kubernetes.io/name": parent_metadata["name"]},
         },
     }
 

operator/webhook/core/test/json/full-response.json

@@ -6,10 +6,9 @@
       "metadata": {
         "name": "testroute",
         "labels": {
-          "app.kubernetes.io/managed-by": "keip-integrationroute-controller",
-          "app.kubernetes.io/name": "integrationroute",
-          "app.kubernetes.io/instance": "integrationroute-testroute",
-          "app.kubernetes.io/version": "latest",
+          "app.kubernetes.io/managed-by": "keip",
+          "app.kubernetes.io/name": "testroute",
+          "app.kubernetes.io/component": "integration-route",
           "firstKey": "firstValue"
         },
         "annotations": {
@@ -19,17 +18,16 @@
       "spec": {
         "selector": {
           "matchLabels": {
-            "app.kubernetes.io/instance": "integrationroute-testroute"
+            "app.kubernetes.io/name": "testroute"
           }
         },
         "replicas": 2,
         "template": {
           "metadata": {
             "labels": {
-              "app.kubernetes.io/managed-by": "keip-integrationroute-controller",
-              "app.kubernetes.io/name": "integrationroute",
-              "app.kubernetes.io/instance": "integrationroute-testroute",
-              "app.kubernetes.io/version": "latest",
+              "app.kubernetes.io/managed-by": "keip",
+              "app.kubernetes.io/name": "testroute",
+              "app.kubernetes.io/component": "integration-route",
               "firstKey": "firstValue"
             },
             "annotations": {
@@ -236,7 +234,7 @@
           }
         ],
         "selector": {
-          "app.kubernetes.io/instance": "integrationroute-testroute"
+          "app.kubernetes.io/name": "testroute"
         }
       }
     }

operator/webhook/core/test/test_sync.py

@@ -466,11 +466,7 @@ def test_pod_missing_resources(full_route):
         full_route["parent"], labels=None, integration_image=None
     )
 
-    resources = pod["spec"]["containers"][0].get("resources")
-    assert resources["requests"]["cpu"] == "500m"
-    assert resources["requests"]["memory"] == "1Gi"
-    assert resources["limits"]["memory"] == "2Gi"
-    assert "cpu" not in resources["limits"]
+    assert "resources" not in pod["spec"]["containers"][0]
 
 
 def test_pod_resources_limits_only(full_route):

operator/webhook/test/json/full-route-response.json

@@ -6,27 +6,25 @@
       "metadata": {
         "name": "testroute",
         "labels": {
-          "app.kubernetes.io/managed-by": "keip-integrationroute-controller",
-          "app.kubernetes.io/name": "integrationroute",
-          "app.kubernetes.io/instance": "integrationroute-testroute",
-          "app.kubernetes.io/version": "latest"
+          "app.kubernetes.io/managed-by": "keip",
+          "app.kubernetes.io/name": "testroute",
+          "app.kubernetes.io/component": "integration-route"
         },
         "annotations": {}
       },
       "spec": {
         "selector": {
           "matchLabels": {
-            "app.kubernetes.io/instance": "integrationroute-testroute"
+            "app.kubernetes.io/name": "testroute"
           }
         },
         "replicas": 1,
         "template": {
           "metadata": {
             "labels": {
-              "app.kubernetes.io/managed-by": "keip-integrationroute-controller",
-              "app.kubernetes.io/name": "integrationroute",
-              "app.kubernetes.io/instance": "integrationroute-testroute",
-              "app.kubernetes.io/version": "latest"
+              "app.kubernetes.io/managed-by": "keip",
+              "app.kubernetes.io/name": "testroute",
+              "app.kubernetes.io/component": "integration-route"
             }
           },
           "spec": {
@@ -96,16 +94,7 @@
                     "name": "SERVICE_NAME",
                     "value": "testroute"
                   }
-                ],
-                "resources": {
-                  "requests": {
-                    "cpu": "500m",
-                    "memory": "1Gi"
-                  },
-                  "limits": {
-                    "memory": "2Gi"
-                  }
-                }
+                ]
               }
             ],
             "volumes": [
@@ -158,7 +147,7 @@
           }
         ],
         "selector": {
-          "app.kubernetes.io/instance": "integrationroute-testroute"
+          "app.kubernetes.io/name": "testroute"
         }
       }
     }