Removing resourcePrefix usage

devops/aws/chart/templates/serviceparameters.yaml

+{{- template "common.serviceparameters" (list . "os-crs-catalog.serviceparameters") -}}
+{{- define "os-crs-catalog.serviceparameters" -}}
+## Define overrides for the service parameters here
+{{- end -}}
\ No newline at end of file

devops/aws/chart/values.yaml

 # Service Config
-image: __CONTAINER__
-imagePullPolicy: Always
-service:
-  type: ClusterIP
-  port: 8080
-  apiPath: /api/crs/catalog/
-  readinessProbeHttpPath: /api/crs/catalog/actuator/health
-  livenessProbeHttpPath: /api/crs/catalog/actuator/health
-
-environmentVariables:
-  - name: APPLICATION_PORT
-    value: "{{ .Values.service.port }}"
-  - name: AWS_REGION
-    value: "{{ .Values.global.region }}"
-  - name: ENVIRONMENT
-    value: "{{ .Values.global.resourcePrefix }}"
-  - name: JAVA_OPTS
-    value: "-Xms538M -Xmx900M"
-  - name: LOG_LEVEL
-    value: "{{ default `INFO` .Values.global.logLevel }}"
-  - name: SSM_ENABLED
-    value: "True"
-  - name: SSL_ENABLED
-    value: "false"
-  - name: CACHE_CLUSTER_ENDPOINT
-    value: "{{ .Values.global.cacheClusterEndpoint }}"
-  - name: CACHE_CLUSTER_PORT
-    value: "{{ .Values.global.cacheClusterPort }}"
-  - name: CACHE_CLUSTER_KEY
-    value: "{{ .Values.global.cacheClusterKey }}"
-  - name: ENTITLEMENTS_BASE_URL
-    value: "http://os-entitlements:8080"                   
-  - name: CRS_CATALOG_FILENAME                    
-    value: "/data/crs_catalog_v2.json"
-  - name: SEARCH_API
-    value: "http://os-search:8080/api/search/v2"
-  - name: TMP_VOLUME_PATH
-    value: "/tmp"
-
-
-# Resource Config
-replicaCount: 1
-resources:
-  limits:
-    memory: 900M
-  requests:
-    cpu: 250m
-    memory: 650M
-autoscaling:
-  enabled: true
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-# Security Config
-serviceAccountRole: arn:aws:iam::{{ .Values.global.accountID }}:role/osdu-{{ .Values.global.resourcePrefix }}-{{ .Values.global.region }}-{{ include "common.name" . }}
-cors:
-  maxAge: "60m"
-  allowCredentials: true
-  allowMethods: 
-    - POST
-    - GET
-  allowHeaders:
-    - Authorization
-    - Data-Partition-Id
-    - Correlation-Id
-    - Content-Type
-securityContext: 
-  runAsUser: 10001
-  runAsNonRoot: true
-  readOnlyRootFilesystem: true
-  allowPrivilegeEscalation: false
-  capabilities:
-    drop:
-    - ALL
-podSecurityContext: 
-  fsGroup: 1337
-  seccompProfile:
-    type: RuntimeDefault
-
-allowedPrincipals:
-  - 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
-  - cluster.local/ns/osdu-ingest/sa/os-data-workflow
-  - cluster.local/ns/osdu-ingest/sa/os-ingestion-workflow
-  - cluster.local/ns/osdu-seismic-ddms/sa/os-seismic-store
-  - cluster.local/ns/osdu-well-delivery/sa/os-welldelivery
-  - cluster.local/ns/osdu-wellbore-ddms/sa/os-wellbore-ddms
+image: __CONTAINER__
\ No newline at end of file

provider/crs-catalog-aws/src/main/resources/application.properties

@@ -26,16 +26,6 @@ logging.slf4jlogger.enabled=true
 osdu.entitlement.url=${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
 osdu.crs.catalog.filename=${CRS_CATALOG_FILENAME:/data/crs_catalog_v2.json}
 
-
-aws.resource.prefix=${ENVIRONMENT}
-
-## AWS DynamoDB configuration
-## These are not used right now by crs service, but core-lib tenantfactory crashes if they're not set
-aws.dynamodb.key=id
-aws.dynamodb.table.prefix=${ENVIRONMENT}-
-aws.dynamodb.region=${AWS_REGION}
-aws.dynamodb.endpoint=dynamodb.${AWS_REGION}.amazonaws.com
-
 ## AWS ElastiCache configuration
 aws.elasticache.cluster.endpoint=${CACHE_CLUSTER_ENDPOINT}
 aws.elasticache.cluster.port=${CACHE_CLUSTER_PORT}