Commit 7d0a638c 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 !448
parents 8c3e0c6d 527c0636

NOTICE

+21 −23
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ Apache-2.0 
========================================================================

The following software have components provided under the terms of this license:



- AHC/Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)

- AMQP 1.0 JMS Spring Boot AutoConfiguration (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-autoconfigure)

- AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter)

- ASM based accessors helper used by json-smart (from https://urielch.github.io/)
@@ -319,10 +318,11 @@ The following software have components provided under the terms of this license: 
- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)

- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)

- AssertJ Core (from ${project.organization.url}#${project.artifactId})

- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)

- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils)

- AutoValue Annotations (from https://github.com/google/auto/tree/master/value, https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations)

- BSON (from http://bsonspec.org, https://bsonspec.org)

- BSON Record Codec (from https://www.mongodb.com/)

- BSON Record Codec (from <https://www.mongodb.com/>, https://www.mongodb.com/)

- Bean Validation API (from http://beanvalidation.org)

- Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave)

- Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http)
@@ -344,7 +344,7 @@ The following software have components provided under the terms of this license: 
- GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)

- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)

- Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)

- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core, https://github.com/googleapis/java-core)

- Google Cloud Core (from https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core, https://github.com/googleapis/java-core)

- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http, https://github.com/googleapis/java-core)

- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc, https://github.com/googleapis/java-core)

- Google Cloud Datastore (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore, https://github.com/googleapis/java-datastore)
@@ -396,7 +396,7 @@ The following software have components provided under the terms of this license: 
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)

- Java Native Access Platform (from https://github.com/java-native-access/jna)

- Java UUID Generator (from http://wiki.fasterxml.com/JugHome)

- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- Javassist (from http://www.javassist.org/)

- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)

- Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/)
@@ -408,8 +408,8 @@ The following software have components provided under the terms of this license: 
- KeePassJava2 :: Simple (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-simple)

- Kotlin Stdlib (from https://kotlinlang.org/, https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib)

- Kotlin Stdlib Common (from https://kotlinlang.org/)

- Kotlin Stdlib Jdk7 (from https://kotlinlang.org/)

- Kotlin Stdlib Jdk8 (from https://kotlinlang.org/)

- Kotlin Stdlib Jdk7 (from <https://kotlinlang.org/>, https://kotlinlang.org/)

- Kotlin Stdlib Jdk8 (from <https://kotlinlang.org/>, https://kotlinlang.org/)

- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)

- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)

- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -503,7 +503,7 @@ The following software have components provided under the terms of this license: 
- Spring Web (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-web)

- Spring Web MVC (from https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-webmvc)

- Spring WebFlux (from https://github.com/spring-projects/spring-framework)

- Swagger UI (from http://webjars.org)

- Swagger UI (from <http://webjars.org>, http://webjars.org)

- TypeTools (from http://github.com/jhalterman/typetools/)

- Vavr (from http://vavr.io, https://www.vavr.io)

- Vavr Match (from http://vavr.io)
@@ -553,12 +553,11 @@ The following software have components provided under the terms of this license: 
- proto-google-iam-v1 (from https://github.com/googleapis/gapic-generator-java, https://github.com/googleapis/googleapis, https://github.com/googleapis/java-iam/proto-google-iam-v1)

- requests (from http://python-requests.org, https://requests.readthedocs.io)

- resilience4j (from https://github.com/resilience4j/resilience4j, https://resilience4j.readme.io, ttps://resilience4j.readme.io)

- spring-security-crypto (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)

- spring-security-oauth2-core (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)

- spring-security-oauth2-jose (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)

- springdoc-openapi-common (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-common)

- springdoc-openapi-ui (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-ui)

- springdoc-openapi-webmvc-core (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-webmvc-core)

- springdoc-openapi-common (from <https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-common>, https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-common)

- springdoc-openapi-ui (from https://github.com/springdoc/springdoc-openapi, https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-ui)

- springdoc-openapi-webmvc-core (from <https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-webmvc-core>, https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-webmvc-core)

- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-annotations, https://repo1.maven.org/maven2/io/swagger/swagger-annotations)

- swagger-core (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-core, https://repo1.maven.org/maven2/io/swagger/swagger-core)

- swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs)
@@ -574,9 +573,9 @@ BSD-2-Clause 
The following software have components provided under the terms of this license:



- API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java, https://repo1.maven.org/maven2/com/google/api/api-common)

- GAX (Google Api eXtensions) for Java (Core) (from https://repo1.maven.org/maven2/com/google/api/gax)

- GAX (Google Api eXtensions) for Java (HTTP JSON) (from https://repo1.maven.org/maven2/com/google/api/gax-httpjson)

- GAX (Google Api eXtensions) for Java (gRPC) (from https://repo1.maven.org/maven2/com/google/api/gax-grpc)

- GAX (Google Api eXtensions) for Java (Core) (from https://github.com/googleapis, https://github.com/googleapis/gax-java, https://repo1.maven.org/maven2/com/google/api/gax)

- GAX (Google Api eXtensions) for Java (HTTP JSON) (from <https://repo1.maven.org/maven2/com/google/api/gax-httpjson>, https://repo1.maven.org/maven2/com/google/api/gax-httpjson)

- GAX (Google Api eXtensions) for Java (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc)

- Hamcrest (from http://hamcrest.org/JavaHamcrest/)

- Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)

- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
@@ -592,9 +591,9 @@ The following software have components provided under the terms of this license: 
- ASM Core (from http://asm.ow2.io/, http://asm.ow2.org/)

- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)

- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)

- GAX (Google Api eXtensions) for Java (Core) (from https://repo1.maven.org/maven2/com/google/api/gax)

- GAX (Google Api eXtensions) for Java (HTTP JSON) (from https://repo1.maven.org/maven2/com/google/api/gax-httpjson)

- GAX (Google Api eXtensions) for Java (gRPC) (from https://repo1.maven.org/maven2/com/google/api/gax-grpc)

- GAX (Google Api eXtensions) for Java (Core) (from https://github.com/googleapis, https://github.com/googleapis/gax-java, https://repo1.maven.org/maven2/com/google/api/gax)

- GAX (Google Api eXtensions) for Java (HTTP JSON) (from <https://repo1.maven.org/maven2/com/google/api/gax-httpjson>, https://repo1.maven.org/maven2/com/google/api/gax-httpjson)

- GAX (Google Api eXtensions) for Java (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc)

- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)

- Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials)

- Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http)
@@ -676,7 +675,7 @@ The following software have components provided under the terms of this license: 
- JSR 374 (JSON Processing) API (from https://javaee.github.io/jsonp)

- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)

- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)

- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)



========================================================================
@@ -687,7 +686,7 @@ The following software have components provided under the terms of this license: 
- JSR 353 (JSON Processing) Default Provider (from http://jsonp.java.net)

- JSR 374 (JSON Processing) API (from https://javaee.github.io/jsonp)

- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)

- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)

- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -751,7 +750,7 @@ The following software have components provided under the terms of this license: 
- JSR 374 (JSON Processing) API (from https://javaee.github.io/jsonp)

- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)

- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)

- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)

- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -776,7 +775,7 @@ The following software have components provided under the terms of this license: 
- Jakarta Bean Validation API (from https://beanvalidation.org)

- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)

- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)

- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)

- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)

- tomcat-embed-core (from http://tomcat.apache.org/)
@@ -796,7 +795,6 @@ The following software have components provided under the terms of this license: 


- Java Native Access Platform (from https://github.com/java-native-access/jna)

- Spring Security - Core (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-core, https://spring.io/projects/spring-security, https://spring.io/spring-security)

- spring-security-crypto (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)



========================================================================

ImageMagick
@@ -916,7 +914,7 @@ The following software have components provided under the terms of this license: 
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)

- qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions)

- requests (from http://python-requests.org, https://requests.readthedocs.io)

- webjars-locator-core (from http://webjars.org)

- webjars-locator-core (from <http://webjars.org>, http://webjars.org)



========================================================================

MPL-1.1

devops/aws/chart/Chart.yaml

+2 −2
Original line number Diff line number Diff line 
apiVersion: v2

name: "os-schema"

version: __CHART_VERSION__

kubeVersion: "v1.21.x-x-x"

kubeVersion: ">= 1.21.x-x-x < 1.24.x-x-x"

description: Schema 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

devops/aws/chart/templates/tests/test-connection.yaml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
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

devops/aws/chart/values.schema.json

+2 −4
Original line number Diff line number Diff line
@@ -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"

                ]

            }

devops/aws/chart/values.yaml

+5 −3
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ environmentVariables: 
    value: "http://os-entitlements:8080"

  - name: PARTITION_BASE_URL

    value: http://os-partition:8080

podAnnotations: 

  seccomp.security.alpha.kubernetes.io/pod: "runtime/default"



# Resource Config

replicaCount: 1
@@ -66,9 +64,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-dataset

  - cluster.local/ns/{{ .Release.Namespace }}/sa/os-indexer

  - cluster.local/ns/os-timeseries-dms/sa/os-timeseries-dms