Merge pull request #51 from port-labs/PORT-5613-ocean-chart

Added pod SCC and container SCC, rollout strategy and resource to ocean
port-labs · Dec 21, 2023 · 0392a30 · 0392a30
2 parents ec8c444 + b77b21e
commit 0392a30
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 8 deletions.
diff --git a/charts/port-agent/templates/deployment.yaml b/charts/port-agent/templates/deployment.yaml
@@ -52,7 +52,9 @@ spec:
                 name: {{ include "port-agent.secretName" . }}
           {{- end }}
           resources:
+          {{- if .Values.resources }}
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
           volumeMounts:
             {{- if .Values.controlThePayloadConfig }}
             - mountPath: /app/control_the_payload_config.json

diff --git a/charts/port-agent/values.yaml b/charts/port-agent/values.yaml
@@ -41,8 +41,6 @@ containerSecurityContext: {}
   # runAsUser: 1001
   # allowPrivilegeEscalation: false
 
-
-
 rolloutStrategy: "Recreate"
 
 resources:

diff --git a/charts/port-ocean/Chart.yaml b/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.1.11
+version: 0.1.12
 appVersion: "0.1.0"
 home: https://getport.io/
 sources:

diff --git a/charts/port-ocean/templates/deployment.yaml b/charts/port-ocean/templates/deployment.yaml
@@ -3,6 +3,12 @@ kind: Deployment
 metadata:
   name: {{ include "port-ocean.deploymentName" . }}
 spec:
+  strategy:
+    type: {{ .Values.rolloutStrategy | default "Recreate" }}
+  securityContext: 
+  {{- if .Values.podSecurityContext }}
+    {{- toYaml .Values.podSecurityContext | nindent 4 }}
+  {{- end }}
   replicas: 1
   selector:
     matchLabels:
@@ -20,15 +26,22 @@ spec:
         {{- end }}
         image: ghcr.io/port-labs/port-ocean-{{ .Values.integration.type }}:{{ .Values.integration.version | default "latest" }}
         {{- if .Values.service.enabled }}
+        securityContext:
+        {{- if .Values.containerSecurityContext }}
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
+        {{- end }}
         ports:
         - containerPort: {{.Values.service.port}}
           protocol: TCP
         {{- end }}
-        {{- if .Values.selfSignedCertificate.enabled }}
         env:
+        {{- if .Values.selfSignedCertificate.enabled }}
           - name: SSL_CERT_FILE
             value: /etc/ssl/certs/ca-certificates.crt
         {{- end }}
+        {{- with .Values.extraEnv }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         envFrom:
           - configMapRef:
               name: {{ include "port-ocean.configMapName" . }}
@@ -64,8 +77,8 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.resources }}
       resources:
-        {{- toYaml . | nindent 8 }}
+      {{- if .Values.resources }}
+        {{- toYaml .Values.resources | nindent 8 }}
       {{- end }}
 
diff --git a/charts/port-ocean/values.yaml b/charts/port-ocean/values.yaml
@@ -8,11 +8,33 @@ port:
 
 podAnnotations: {}
 
+extraEnv:
+# Example
+#   - name: HTTPS_PROXY
+#     value: http://myproxy.com
+
 podSecurityContext: {}
+# Example 
+  # runAsGroup: 1001
+  # runAsUser: 1001
+  # fsGroup: 1001
+  # fsGroupChangePolicy: "OnRootMismatch"
+containerSecurityContext: {}
+# Example 
+  # runAsGroup: 1001
+  # runAsUser: 1001
+  # allowPrivilegeEscalation: false
+
+rolloutStrategy: "Recreate"
 
-securityContext: {}
+resources: 
+  requests:
+    memory: "512Mi"
+    cpu: "200m"
+  limits:
+    memory: "1024Mi"
+    cpu: "500m"
 
-resources: {}
 
 nodeSelector: {}