[feature] Add missing labels to k8s objects + Allow to delete extra gPRC ports

k8s/deployment/delete_cluster_objects

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+DEPLOYMENT_TO_CLEAN="$DEPLOYMENT_ID"
+
+if [ "$DEPLOYMENT" = "blue" ]; then
+    DEPLOYMENT_TO_CLEAN=$(echo "$CONTEXT" | jq .scope.current_active_deployment -r)
+fi
+
+kubectl delete deployment,service,hpa,ingress,pdb,secret,configmap \
+  -l deployment_id="$DEPLOYMENT_TO_CLEAN" -n "$K8S_NAMESPACE" --cascade=foreground --wait=true

k8s/deployment/templates/deployment.yaml.tpl

@@ -30,6 +30,15 @@ metadata:
   labels:
     name: d-{{ .scope.id }}-{{ .deployment.id }}
     app.kubernetes.io/part-of: {{ .namespace.slug }}
+    account: {{ .account.slug }}
+    account_id: "{{ .account.id }}"
+    namespace: {{ .namespace.slug }}
+    namespace_id: "{{ .namespace.id }}"
+    application: {{ .application.slug }}
+    application_id: "{{ .application.id }}"
+    scope: {{ .scope.slug }}
+    scope_id: "{{ .scope.id }}"
+    deployment_id: "{{ .deployment.id }}"
 spec:
   replicas: {{ .replicas }}
   selector:

k8s/deployment/templates/scaling.yaml.tpl

@@ -4,6 +4,18 @@ kind: HorizontalPodAutoscaler
 metadata:
   name: hpa-d-{{ .scope.id }}-{{ .deployment.id }}
   namespace: {{ .k8s_namespace }}
+  labels:
+    name: d-{{ .scope.id }}-{{ .deployment.id }}
+    app.kubernetes.io/part-of: {{ .namespace.slug }}
+    account: {{ .account.slug }}
+    account_id: "{{ .account.id }}"
+    namespace: {{ .namespace.slug }}
+    namespace_id: "{{ .namespace.id }}"
+    application: {{ .application.slug }}
+    application_id: "{{ .application.id }}"
+    scope: {{ .scope.slug }}
+    scope_id: "{{ .scope.id }}"
+    deployment_id: "{{ .deployment.id }}"
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

k8s/deployment/templates/service.yaml.tpl

@@ -9,6 +9,15 @@ metadata:
     app.kubernetes.io/component: application
     app.kubernetes.io/instance: {{ .scope.slug }}
     app.kubernetes.io/name: {{ .scope.slug }}
+    account: {{ .account.slug }}
+    account_id: "{{ .account.id }}"
+    namespace: {{ .namespace.slug }}
+    namespace_id: "{{ .namespace.id }}"
+    application: {{ .application.slug }}
+    application_id: "{{ .application.id }}"
+    scope: {{ .scope.slug }}
+    scope_id: "{{ .scope.id }}"
+    deployment_id: "{{ .deployment.id }}"
 {{- $global := index .k8s_modifiers "global" }}
 {{- if $global }}
   {{- $labels := index $global "labels" }}
@@ -83,6 +92,15 @@ metadata:
     app.kubernetes.io/component: application
     app.kubernetes.io/instance: {{ $.scope.slug }}
     app.kubernetes.io/name: {{ $.scope.slug }}
+    account: {{ $.account.slug }}
+    account_id: "{{ $.account.id }}"
+    namespace: {{ $.namespace.slug }}
+    namespace_id: "{{ $.namespace.id }}"
+    application: {{ $.application.slug }}
+    application_id: "{{ $.application.id }}"
+    scope: {{ $.scope.slug }}
+    scope_id: "{{ $.scope.id }}"
+    deployment_id: "{{ $.deployment.id }}"
 {{- $global := index .k8s_modifiers "global" }}
 {{- if $global }}
   {{- $labels := index $global "labels" }}
@@ -155,6 +173,15 @@ metadata:
     app.kubernetes.io/component: application
     app.kubernetes.io/instance: {{ $.scope.slug }}
     app.kubernetes.io/name: {{ $.scope.slug }}
+    account: {{ $.account.slug }}
+    account_id: "{{ $.account.id }}"
+    namespace: {{ $.namespace.slug }}
+    namespace_id: "{{ $.namespace.id }}"
+    application: {{ $.application.slug }}
+    application_id: "{{ $.application.id }}"
+    scope: {{ $.scope.slug }}
+    scope_id: "{{ $.scope.id }}"
+    deployment_id: "{{ $.deployment.id }}"
   annotations:
     service.beta.openshift.io/serving-cert-secret-name: d-{{ $.scope.id }}-grpc-{{ .port }}
     alb.ingress.kubernetes.io/healthcheck-interval-seconds: '10'

k8s/deployment/workflows/delete.yaml

@@ -50,4 +50,10 @@ steps:
     file: "$SERVICE_PATH/apply_templates"
     configuration:
       ACTION: delete
-      DRY_RUN: false
+      DRY_RUN: false
+    post:
+      name: delete_cluster_objects
+      type: script
+      file: "$SERVICE_PATH/deployment/delete_cluster_objects"
+      configuration:
+        DEPLOYMENT: green

k8s/deployment/workflows/finalize.yaml

@@ -66,3 +66,9 @@ steps:
     configuration:
       ACTION: delete
       DRY_RUN: false
+    post:
+      name: delete_cluster_objects
+      type: script
+      file: "$SERVICE_PATH/deployment/delete_cluster_objects"
+      configuration:
+        DEPLOYMENT: blue

k8s/deployment/workflows/rollback.yaml

@@ -66,3 +66,9 @@ steps:
     configuration:
       ACTION: delete
       DRY_RUN: false
+    post:
+      name: delete_cluster_objects
+      type: script
+      file: "$SERVICE_PATH/deployment/delete_cluster_objects"
+      configuration:
+        DEPLOYMENT: green