diff --git a/devops/aws/chart/Chart.yaml b/devops/aws/chart/Chart.yaml index 5fbb0d73c247f5b40dd93de2d44f5f67c744a97e..2afc719c5cbe3a2ee8118ac57d60a09b73b51be9 100644 --- a/devops/aws/chart/Chart.yaml +++ b/devops/aws/chart/Chart.yaml @@ -1,12 +1,12 @@ apiVersion: v2 name: "os-indexer" version: __CHART_VERSION__ -kubeVersion: "v1.21.x-x-x" +kubeVersion: ">= 1.21.x-x-x < 1.24.x-x-x" description: Indexer Helm Chart for Kubernetes type: application appVersion: __VERSION__ dependencies: - name: osdu-aws-lib - version: 0.1.0 + version: 0.2.0 repository: __HELM_REPO__/osdu-aws-lib/ deprecated: false diff --git a/devops/aws/chart/templates/tests/test-connection.yaml b/devops/aws/chart/templates/tests/test-connection.yaml deleted file mode 100644 index f341212ea253eced15fd153dd894287341d8db93..0000000000000000000000000000000000000000 --- a/devops/aws/chart/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "common.fullname" . }}-test-connection" - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/devops/aws/chart/values.schema.json b/devops/aws/chart/values.schema.json index c3bc0eb63c7dbdc49322be085c6a65f1be4938b7..d01920940ba1ae3ac7b6078c7321bf8042d24eca 100644 --- a/devops/aws/chart/values.schema.json +++ b/devops/aws/chart/values.schema.json @@ -6,10 +6,8 @@ "image", "imagePullPolicy", "service", - "podAnnotations", "replicaCount", - "serviceAccountRole", - "securityContext" + "serviceAccountRole" ], "properties": { "image": { @@ -262,10 +260,10 @@ "type": "string", "title": "Allowed principal", "examples": [ - "cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account", + "cluster.local/ns/istio-system/sa/istio-ingressgateway", "cluster.local/ns/osdu-services/sa/compliance-queue" ] } } } -} \ No newline at end of file +} diff --git a/devops/aws/chart/values.yaml b/devops/aws/chart/values.yaml index 0032504fe18eb0f0d62ac0ca24c039205e76a882..1712d51d2117277efc176e126580d962658e5d77 100644 --- a/devops/aws/chart/values.yaml +++ b/devops/aws/chart/values.yaml @@ -64,8 +64,6 @@ environmentVariables: value: "true" - name: PARAMETER_MOUNT_PATH value: "/mnt/params" -podAnnotations: - seccomp.security.alpha.kubernetes.io/pod: "runtime/default" # Resource Config replicaCount: 1 @@ -92,8 +90,12 @@ securityContext: capabilities: drop: - ALL +podSecurityContext: + fsGroup: 1337 + seccompProfile: + type: RuntimeDefault allowedPrincipals: - - cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account + - cluster.local/ns/istio-system/sa/istio-ingressgateway - cluster.local/ns/{{ .Release.Namespace }}/sa/indexer-queue - cluster.local/ns/aws-binary-dms/sa/binary-dms - cluster.local/ns/osdu-airflow/sa/airflow-dag-upload