Skip to content
Snippets Groups Projects
Commit c72ce8be authored by Marc Burnie [AWS]'s avatar Marc Burnie [AWS]
Browse files

Merge branch 'aws-integration' into 'master'

Adding support for EKS 1.23

See merge request !342

(cherry picked from commit af389b85)

0d1e304d upgrade dependencies
d75a3313 Merge branch 'master' into master-dev-merge-bios
2ed13075 Merge branch 'master' into master-dev-merge-bios
a1c4bdfc Merge remote-tracking branch 'origin/master' into master-dev-merge
3f1ce709 Merge remote-tracking branch 'origin/master' into master-dev-merge
53e78452 Fix Spring vulnerabilities
af1ef586 Merge remote-tracking branch 'origin/master' into master-dev-merge
2d1118dc Fix Spring vulnerabilities
f906fbca Update core common lib version and fix vulnerable libs
401f4816 Merge remote-tracking branch 'origin/master' into master-dev-merge
c760a4fa Update versions of vulnerable libs
03800aeb Set pathmatch strategy to ant-path-matcher
ce91a89b Migration from Springfox to springdoc-openapi
5015de1f Merge remote-tracking branch 'origin/master' into master-dev-merge
c2adc600 Merge remote-tracking branch 'origin/master' into master-dev-merge
f1a80d83 Merge remote-tracking branch 'origin/master' into master-dev-merge
a7338ad1 adding support for EKS 1.23
a98c7c76 Update NOTICE
parent 37f20f7b
No related branches found
No related tags found
2 merge requests!416M16 delta changes cherry-pick,!344Cherry-pick 'adding support for EKS 1.23' into release/0.19
Pipeline #166097 passed
apiVersion: v2
name: "os-notification"
version: __CHART_VERSION__
kubeVersion: "v1.21.x-x-x"
kubeVersion: ">= 1.21.x-x-x < 1.24.x-x-x"
description: Notification 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"
]
}
......
......@@ -27,8 +27,6 @@ environmentVariables:
value: "http://os-entitlements:8080"
- name: REGISTER_BASE_URL
value: http://os-register:8080
podAnnotations:
seccomp.security.alpha.kubernetes.io/pod: "runtime/default"
# Resource Config
replicaCount: 1
......@@ -69,9 +67,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/aws-binary-dms/sa/binary-dms
- cluster.local/ns/osdu-airflow/sa/airflow-dag-upload
- cluster.local/ns/osdu-ingest/sa/os-data-workflow
......
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