From d0903b4ec30447a96d610a16080846816d15903b Mon Sep 17 00:00:00 2001
From: Marc Burnie <mburnie@amazon.com>
Date: Wed, 28 Sep 2022 16:57:00 +0000
Subject: [PATCH] Checkov Findings and Gitlab Helm Chart Deploy Variables

---
 .gitlab-ci.yml               |  2 ++
 devops/aws/chart/values.yaml | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b77576c45..9f144efdd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,9 @@
 variables:
   AWS_BUILD_SUBDIR: provider/storage-aws/build-aws
   AWS_TEST_SUBDIR: testing/storage-test-aws
+  AWS_CHART_SUBDIR: devops/aws/chart
   AWS_SERVICE: storage
+  AWS_SERVICE_GATEWAY: osdu-gateway
   AWS_ENVIRONMENT: dev
   AWS_DEPLOY_TARGET: EKS
   AWS_EKS_DEPLOYMENT_NAME: os-storage
diff --git a/devops/aws/chart/values.yaml b/devops/aws/chart/values.yaml
index 9a594ac60..1c59325a1 100644
--- a/devops/aws/chart/values.yaml
+++ b/devops/aws/chart/values.yaml
@@ -1,6 +1,6 @@
 # Service Config
 image: __CONTAINER__
-imagePullPolicy: IfNotPresent
+imagePullPolicy: Always
 service:
   type: ClusterIP
   port: 8080
@@ -58,7 +58,8 @@ environmentVariables:
     value: "true"
   - name: PARAMETER_MOUNT_PATH
     value: "/mnt/params"
-podAnnotations: {}
+podAnnotations: 
+  seccomp.security.alpha.kubernetes.io/pod: "runtime/default"
 
 # Resource Config
 maxConnections: 200
@@ -93,13 +94,15 @@ cors:
     - Data-Partition-Id
     - Correlation-Id
     - Content-Type
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
+securityContext: 
+  runAsUser: 10001
+  runAsNonRoot: true
+  readOnlyRootFilesystem: false
+  allowPrivilegeEscalation: false
+  capabilities:
+    drop:
+    - ALL
+
 allowedPrincipals:
   - cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account
   - cluster.local/ns/{{ .Release.Namespace }}/sa/compliance-queue
-- 
GitLab