Skip to content
Snippets Groups Projects
Commit 6789f9be authored by Chad Leong's avatar Chad Leong :speech_balloon:
Browse files

Merge branch 'cherry-pick-50474b31' into 'release/0.19'

Cherry-pick 'adding support for EKS 1.23' into release/0.19

See merge request !243
parents 27fe1e90 f9901277
No related branches found
No related tags found
2 merge requests!301trusted-delta-changes-from-m16,!243Cherry-pick 'adding support for EKS 1.23' into release/0.19
Pipeline #166160 failed
apiVersion: v2
name: "os-crs-catalog"
version: __CHART_VERSION__
kubeVersion: "v1.21.x-x-x"
kubeVersion: ">= 1.21.x-x-x < 1.24.x-x-x"
description: Crs-catalog 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
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
......@@ -6,10 +6,8 @@
"image",
"imagePullPolicy",
"service",
"podAnnotations",
"replicaCount",
"serviceAccountRole",
"securityContext"
"serviceAccountRole"
],
"properties": {
"image": {
......@@ -262,7 +260,7 @@
"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"
]
}
......
......@@ -35,8 +35,7 @@ environmentVariables:
value: "/data/crs_catalog_v2.json"
- name: SEARCH_API
value: "http://os-search:8080/api/search/v2"
podAnnotations:
seccomp.security.alpha.kubernetes.io/pod: "runtime/default"
# Resource Config
replicaCount: 1
......@@ -74,9 +73,13 @@ 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/os-storage
- cluster.local/ns/aws-binary-dms/sa/binary-dms
- cluster.local/ns/osdu-airflow/sa/airflow-dag-upload
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment