Release 1.5.0

.gitignore

@@ -1,5 +1,5 @@
 # Logs
-logs
+/logs
 *.log
 npm-debug.log*
 yarn-debug.log*

azure/specs/service-spec.json.tpl

@@ -13,6 +13,7 @@
          "fixed_instances",
          "scheduled_stop",
          "additional_ports",
+         "protocol",
          "continuous_delivery"
       ],
       "uiSchema":{
@@ -101,10 +102,6 @@
                                  "type":"Control",
                                  "scope":"#/properties/autoscaling/properties/target_cpu_utilization"
                               },
-                              {
-                                 "type": "Control",
-                                 "scope": "#/properties/autoscaling/properties/target_memory_enabled"
-                              },
                               {
                                  "rule": {
                                    "effect": "SHOW",
@@ -170,6 +167,19 @@
                         }
                      ]
                   },
+                  {
+                    "type": "Category",
+                    "label": "Protocol",
+                    "elements": [
+                      {
+                        "type": "Control",
+                        "scope": "#/properties/protocol",
+                        "options": {
+                          "format": "radio"
+                        }
+                      }
+                    ]
+                  },
                   {
                      "type":"Category",
                      "label":"Continuous deployment",
@@ -333,7 +343,7 @@
                }
             ],
             "title":"RAM Memory",
-            "default":64,
+            "default":128,
             "description":"Amount of RAM memory to allocate to the container (in MB)"
          },
          "visibility":{
@@ -382,17 +392,17 @@
                   "description":"CPU utilization threshold that triggers scaling"
                },
                "target_memory_enabled": {
-                  "type": "boolean",
-                  "title": "Scale by memory",
-                  "default": false
+                 "type": "boolean",
+                 "title": "Scale by memory",
+                 "default": false
                },
                "target_memory_utilization": {
-                  "type": "integer",
-                  "title": "Target memory utilization (%)",
-                  "default": 70,
-                  "maximum": 90,
-                  "minimum": 30,
-                  "description": "Memory utilization threshold that triggers scaling"
+                 "type": "integer",
+                 "title": "Target memory utilization (%)",
+                 "default": 70,
+                 "maximum": 90,
+                 "minimum": 50,
+                 "description": "Memory utilization threshold that triggers scaling"
                }
             }
          },
@@ -539,6 +549,7 @@
                      ],
                      "type":"string",
                      "title":"Port Type",
+                     "default": "GRPC",
                      "description":"The protocol type for this port"
                   }
                }
@@ -576,6 +587,36 @@
                }
             },
             "description":"Configure automatic deployment from Git branches"
+         },
+         "custom_domains": {
+            "type": "object",
+            "required": [
+               "enabled"
+            ],
+            "properties": {
+               "enabled": {
+               "type": "boolean",
+               "default": true
+               }
+            }
+         },
+         "protocol": {
+           "type": "string",
+           "oneOf": [
+             {
+               "const": "http",
+               "title": "HTTP connections",
+               "description": "Enable http web server"
+             },
+             {
+               "const": "web_sockets",
+               "title": "Web sockets",
+               "description": "Enable web sockets connections"
+             }
+           ],
+           "title": "Protocol",
+           "default": "http",
+           "description": "Define the inbound traffic the application will accept"
          }
       }
    }

k8s/apply_templates

@@ -9,7 +9,13 @@ while IFS= read -r TEMPLATE_FILE; do
    echo "kubectl $ACTION $TEMPLATE_FILE"
 
    if [[ "$DRY_RUN" == "false" ]]; then
-     kubectl "$ACTION" -f "$TEMPLATE_FILE"
+     IGNORE_NOT_FOUND=""
+
+     if [[ "$ACTION" == "delete" ]]; then
+       IGNORE_NOT_FOUND="--ignore-not-found=true"
+     fi
+
+     kubectl "$ACTION" -f "$TEMPLATE_FILE" $IGNORE_NOT_FOUND
    fi
 
    BASE_DIR="$(dirname "$TEMPLATE_FILE")"

k8s/deployment/build_context

@@ -36,7 +36,19 @@ fi
 IMAGE_PULL_SECRETS="${IMAGE_PULL_SECRETS:-"{}"}"
 IMAGE_PULL_SECRETS=$(echo "$IMAGE_PULL_SECRETS" | jq .)
 
-TRAFFIC_CONTAINER_IMAGE=${TRAFFIC_CONTAINER_IMAGE:-"public.ecr.aws/nullplatform/k8s-traffic-manager:latest"}
+SCOPE_TRAFFIC_PROTOCOL=$(echo "$CONTEXT" | jq -r .scope.capabilities.protocol)
+
+TRAFFIC_CONTAINER_VERSION="latest"
+
+if [[ "$SCOPE_TRAFFIC_PROTOCOL" == "web_sockets" ]]; then
+  TRAFFIC_CONTAINER_VERSION="websocket2"
+fi
+
+TRAFFIC_CONTAINER_IMAGE=${TRAFFIC_CONTAINER_IMAGE:-"public.ecr.aws/nullplatform/k8s-traffic-manager:$TRAFFIC_CONTAINER_VERSION"}
+
+# Pod Disruption Budget configuration
+PDB_ENABLED=${POD_DISRUPTION_BUDGET_ENABLED:-"false"}
+PDB_MAX_UNAVAILABLE=${POD_DISRUPTION_BUDGET_MAX_UNAVAILABLE:-"25%"}
 
 CONTEXT=$(echo "$CONTEXT" | jq \
           --arg blue_deployment_id "$BLUE_DEPLOYMENT_ID" \
@@ -45,12 +57,16 @@ CONTEXT=$(echo "$CONTEXT" | jq \
           --arg total_replicas "$REPLICAS" \
           --arg traffic_image "$TRAFFIC_CONTAINER_IMAGE" \
           --argjson pull_secrets "$IMAGE_PULL_SECRETS" \
+          --arg pdb_enabled "$PDB_ENABLED" \
+          --arg pdb_max_unavailable "$PDB_MAX_UNAVAILABLE" \
           '. + {blue_deployment_id: $blue_deployment_id,
                 blue_replicas: $blue_replicas,
                 green_replicas: $green_replicas,
                 total_replicas: $total_replicas,
                 pull_secrets: $pull_secrets,
-                traffic_image: $traffic_image
+                traffic_image: $traffic_image,
+                pdb_enabled: $pdb_enabled,
+                pdb_max_unavailable: $pdb_max_unavailable
           }')
 
 DEPLOYMENT_ID=$(echo "$CONTEXT" | jq -r '.deployment.id')

k8s/deployment/build_deployment

@@ -42,6 +42,7 @@ DEPLOYMENT_PATH="$OUTPUT_DIR/deployment-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 SECRET_PATH="$OUTPUT_DIR/secret-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 SCALING_PATH="$OUTPUT_DIR/scaling-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 SERVICE_TEMPLATE_PATH="$OUTPUT_DIR/service-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
+PDB_PATH="$OUTPUT_DIR/pdb-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 CONTEXT_PATH="$OUTPUT_DIR/context-$SCOPE_ID.json"
 
 echo "$CONTEXT" | jq --arg replicas "$REPLICAS" --arg service_account_name "$SERVICE_ACCOUNT_NAME" '. + {replicas: $replicas, service_account_name: $service_account_name}' > "$CONTEXT_PATH"
@@ -94,7 +95,20 @@ gomplate -c .="$CONTEXT_PATH" \
 TEMPLATE_GENERATION_STATUS=$?
 
 if [[ $TEMPLATE_GENERATION_STATUS -ne 0 ]]; then
-    echo "Error building scaling template"
+    echo "Error building service template"
+    exit 1
+fi
+
+echo "Building Template: $PDB_TEMPLATE to $PDB_PATH"
+
+gomplate -c .="$CONTEXT_PATH" \
+  --file "$PDB_TEMPLATE" \
+  --out "$PDB_PATH"
+
+TEMPLATE_GENERATION_STATUS=$?
+
+if [[ $TEMPLATE_GENERATION_STATUS -ne 0 ]]; then
+    echo "Error building PDB template"
     exit 1
 fi
 

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:
@@ -39,7 +48,7 @@ spec:
     metadata:
       labels:
         name: d-{{ .scope.id }}-{{ .deployment.id }}
-        app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }}
+        app.kubernetes.io/part-of: {{ .component }}
         nullplatform: "true"
         account: "{{ .account.slug }}"
         account_id: "{{ .account.id }}"

k8s/deployment/templates/dns-endpoint.yaml.tpl

@@ -0,0 +1,22 @@
+apiVersion: externaldns.k8s.io/v1alpha1
+kind: DNSEndpoint
+metadata:
+  name: k-8-s-{{ .scope.slug }}-{{ .scope.id }}-dns
+  namespace: {{ .k8s_namespace }}
+  labels:
+    nullplatform: "true"
+    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 }}"
+spec:
+  endpoints:
+  - dnsName: {{ .scope.domain }}
+    recordTTL: 60
+    recordType: A
+    targets:
+    - "{{ .gateway_ip }}"

k8s/deployment/templates/istio/service.yaml.tpl

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .k8s_namespace }}
   labels:
     name: d-{{ .scope.id }}-{{ .deployment.id }}
-    app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }}
+    app.kubernetes.io/part-of: {{ .component }}
     app.kubernetes.io/component: application
     app.kubernetes.io/instance: {{ .scope.slug }}
     app.kubernetes.io/name: {{ .scope.slug }}

k8s/deployment/templates/pdb.yaml.tpl

@@ -0,0 +1,53 @@
+{{if eq .pdb_enabled "true"}}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: pdb-d-{{ .scope.id }}-{{ .deployment.id }}
+  namespace: {{ .k8s_namespace }}
+  labels:
+    name: pdb-d-{{ .scope.id }}-{{ .deployment.id }}
+    app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }}
+    app.kubernetes.io/component: application
+    app.kubernetes.io/instance: {{ .scope.slug }}
+    app.kubernetes.io/name: {{ .scope.slug }}
+{{- $global := index .k8s_modifiers "global" }}
+{{- if $global }}
+  {{- $labels := index $global "labels" }}
+  {{- if $labels }}
+{{ data.ToYAML $labels | indent 4 }}
+  {{- end }}
+{{- end }}
+{{- $pdb := index .k8s_modifiers "pdb" }}
+{{- if $pdb }}
+  {{- $labels := index $pdb "labels" }}
+  {{- if $labels }}
+{{ data.ToYAML $labels | indent 4 }}
+  {{- end }}
+{{- end }}
+  annotations:
+    nullplatform.com/managed-by: nullplatform
+    nullplatform.com/account: {{ .account.slug }}
+    nullplatform.com/namespace: {{ .namespace.slug }}
+    nullplatform.com/application: {{ .application.slug }}
+    nullplatform.com/scope: {{ .scope.slug }}
+    nullplatform.com/deployment-id: "{{ .deployment.id }}"
+{{- $global := index .k8s_modifiers "global" }}
+{{- if $global }}
+  {{- $annotations := index $global "annotations" }}
+  {{- if $annotations }}
+{{ data.ToYAML $annotations | indent 4 }}
+  {{- end }}
+{{- end }}
+{{- $pdb := index .k8s_modifiers "pdb" }}
+{{- if $pdb }}
+  {{- $annotations := index $pdb "annotations" }}
+  {{- if $annotations }}
+{{ data.ToYAML $annotations | indent 4 }}
+  {{- end }}
+{{- end }}
+spec:
+  maxUnavailable: {{ .pdb_max_unavailable }}
+  selector:
+    matchLabels:
+      app: d-{{ .scope.id }}-{{ .deployment.id }}
+{{- end }}

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