Merge pull request #172 from port-labs/live-events-rollout-init-match-integ-versions

live events rollout init match integ versions

Author: stavbernazport

charts/port-ocean/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: port-ocean
 description: A Helm chart for Port Ocean integrations
 type: application
-version: 0.6.4
+version: 0.7.0
 appVersion: "0.1.0"
 home: https://getport.io/
 sources:

charts/port-ocean/README.md

@@ -102,6 +102,7 @@ The following table lists the configuration parameters of the `port-ocean` chart
 | `liveEvents.worker.enabled`                      | Enable stand-alone live events worker                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `false`                     |
 | `liveEvents.worker.replicaCount`                 | Number of stand-alone live events worker replicas                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                         |
 | `liveEvents.worker.resources`                    | Container resource requests and limits for stand-alone live events worker                                                                                                                                                                                                                                                                                                                                                                                                                          | `{}`                        |
+| `liveEvents.deployment.rolloutStrategy`          | Standalone live events worker deployment rollout strategy.                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `RollingUpdate`                      |
 | `liveEvents.service.enabled`                     | Specifies whether the service is enabled or not.                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `true`                      |
 | `liveEvents.service.type`                        | Service type for the Port application.                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `ClusterIP`                 |
 | `liveEvents.service.port`                        | Port number for the service.                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `8000`                      |

charts/port-ocean/templates/cron-job/cron-jobs-init-container-sa.yml

@@ -20,6 +20,9 @@ rules:
   - apiGroups: [ "" ]
     resources: [ "pods" ]
     verbs: [ "get", "list", "watch" ]
+  - apiGroups: [ "apps" ]
+    resources: [ "deployments" ]
+    verbs: [ "get", "list", "patch" ]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

charts/port-ocean/templates/cron-job/cron.yaml

@@ -80,8 +80,8 @@ spec:
 
                   echo "kubectl get jobs -l ${LABEL_SELECTOR} -o=json | jq -r \".items[] | select(.status.active > 0) | select(.metadata.name != \"$CURRENT_JOB_NAME\") | .metadata.name\""
                   JOBS=$(kubectl get jobs -l ${LABEL_SELECTOR} -o=json --token=$TOKEN | jq -r ".items[] | select(.status.active > 0) | select(.metadata.name != \"$CURRENT_JOB_NAME\") | .metadata.name")
-                  echo "Found jobs: $JOBS"
                   if [ -n "$JOBS" ]; then
+                    echo "Found jobs: $JOBS"
                     for JOB in $JOBS; do
                       echo "Setting deadline for job: $JOB"
                       kubectl patch job $JOB -n ${NAMESPACE} -p "{\"spec\":{\"activeDeadlineSeconds\":$DEADLINE}, \"metadata\":{\"labels\":{\"canceled\": \"$CURRENT_JOB_NAME\"}}}" --token=$TOKEN
@@ -94,6 +94,20 @@ spec:
                   else
                     echo "No running resync jobs found. Starting new job: $CURRENT_JOB_NAME"
                   fi
+
+                  # Rollout live events deployment if exists to match integration image versions
+                  DEPLOYMENT_NAME={{ include "port-ocean.liveEvents.deploymentName" . }}
+
+                  echo "Running: kubectl get deployment ${DEPLOYMENT_NAME} -o=json | jq -r \".metadata.name\""
+                  DEPLOYMENT=$(kubectl get deployment ${DEPLOYMENT_NAME} --token=$TOKEN -o=json | jq -r ".metadata.name")
+                  if [ -n $DEPLOYMENT ]; then
+                    echo "Found deployment: $DEPLOYMENT"
+                    echo "Rolling out $DEPLOYMENT"
+                    kubectl rollout restart deployment $DEPLOYMENT -n ${NAMESPACE} --token=$TOKEN
+                  else
+                    echo "Deployment $DEPLOYMENT_NAME does not exist. Skipping rollout restart."
+                  fi
+
                   echo "Exiting init container"
           containers:
           - name: {{ include "port-ocean.containerName" . }}

charts/port-ocean/templates/deployment-live-events.yaml

@@ -6,8 +6,10 @@ metadata:
   labels:
     {{- include "port-ocean.liveEvents.labels" . | nindent 4 }}
 spec:
+  {{- with .Values.liveEvents.deployment.rolloutStrategy }}
   strategy:
-    type: {{ .Values.workload.deployment.rolloutStrategy | default "Recreate" }}
+    {{- toYaml . | trim | nindent 4 }}
+  {{- end }}
   replicas: {{ .Values.liveEvents.worker.replicaCount | default 1 }}
   selector:
     matchLabels:

charts/port-ocean/values.yaml

@@ -146,6 +146,11 @@ liveEvents:
       limits:
         memory: "1024Mi"
         cpu: "500m"
+  deployment:
+    rolloutStrategy:
+      type: RollingUpdate
+      maxSurge: 25%
+      maxUnavailable: 25%
   service:
     enabled: true
     type: ClusterIP