From aa7059e69dde1ac12dcb94f401dde0f7d1816219 Mon Sep 17 00:00:00 2001
From: Marc Burnie <mburnie@amazon.com>
Date: Mon, 25 Jul 2022 15:13:12 -0500
Subject: [PATCH] fixing schema
---
devops/aws/chart/templates/NOTES.txt | 4 +-
devops/aws/chart/values.schema.json | 86 +---------------------------
devops/aws/chart/values.yaml | 2 +-
3 files changed, 7 insertions(+), 85 deletions(-)
diff --git a/devops/aws/chart/templates/NOTES.txt b/devops/aws/chart/templates/NOTES.txt
index a4f7aa9b7..37eda12c7 100644
--- a/devops/aws/chart/templates/NOTES.txt
+++ b/devops/aws/chart/templates/NOTES.txt
@@ -1,2 +1,4 @@
{{ .Chart.Name }} deployed to {{ .Values.global.namespace }} namespace
-Application URL available at path {{ .Values.service.apiPath }}
\ No newline at end of file
+{{- if (.Values.service).apiPath }}
+Application URL available at path {{ .Values.service.apiPath }}
+{{- end }}
\ No newline at end of file
diff --git a/devops/aws/chart/values.schema.json b/devops/aws/chart/values.schema.json
index d51a1ceda..c3bc0eb63 100644
--- a/devops/aws/chart/values.schema.json
+++ b/devops/aws/chart/values.schema.json
@@ -3,66 +3,15 @@
"type": "object",
"default": {},
"required": [
- "accountID",
- "region",
- "resourcePrefix",
- "namespace",
- "gatewayName",
"image",
"imagePullPolicy",
"service",
- "logLevel",
"podAnnotations",
"replicaCount",
"serviceAccountRole",
- "securityContext",
- "allowedPrincipals"
+ "securityContext"
],
"properties": {
- "accountID": {
- "type": "string",
- "title": "The accountID of the OSDU on AWS deployment"
- },
- "region": {
- "type": "string",
- "default": "us-east-1",
- "title": "The region of the OSDU on AWS deployment",
- "examples": [
- "eu-north-1",
- "ap-south-1",
- "eu-west-3",
- "eu-west-2",
- "eu-west-1",
- "ap-northeast-3",
- "ap-northeast-2",
- "me-south-1",
- "ap-northeast-1",
- "sa-east-1",
- "ca-central-1",
- "ap-east-1",
- "ap-southeast-1",
- "ap-southeast-2",
- "eu-central-1",
- "us-east-1",
- "us-east-2",
- "us-west-1",
- "us-west-2"
- ]
- },
- "resourcePrefix": {
- "type": "string",
- "title": "The resourcePrefix of the OSDU on AWS deployment"
- },
- "namespace": {
- "type": "string",
- "default": "osdu-services",
- "title": "The namespace of the core services"
- },
- "gatewayName": {
- "type": "string",
- "default": "osdu-gateway",
- "title": "The name of the OSDU Core services gateway"
- },
"image": {
"type": "string",
"title": "The service container image URL"
@@ -208,11 +157,6 @@
}]
}
},
- "logLevel": {
- "type": "string",
- "default": "INFO",
- "pattern": "^(TRACE|DEBUG|INFO|WARN|ERROR|FATAL|OFF)$"
- },
"podAnnotations": {
"type": "object",
"default": {}
@@ -246,8 +190,7 @@
"maxAge",
"allowCredentials",
"allowMethods",
- "allowHeaders",
- "allowOrigins"
+ "allowHeaders"
],
"properties": {
"maxAge": {
@@ -289,26 +232,6 @@
"Content-Type"
]
]
- },
- "allowOrigins": {
- "type": "array",
- "default": [],
- "title": "A list of the allowed origins",
- "items": {
- "type": "object",
- "default": {},
- "title": "Istio string match pattern",
- "pattern": "^(prefix|exact|regex)$",
- "examples": [{
- "prefix": "*"
- }]
- },
- "examples": [
- [
- {"prefix": "*"},
- {"prefix": "www.example.com/"}
- ]
- ]
}
},
"examples": [{
@@ -325,10 +248,7 @@
"Data-Partition-Id",
"Correlation-Id",
"Content-Type"
- ],
- "allowOrigins": [{
- "prefix": "*"
- }]
+ ]
}]
},
"securityContext": {
diff --git a/devops/aws/chart/values.yaml b/devops/aws/chart/values.yaml
index fac83d685..412409cd2 100644
--- a/devops/aws/chart/values.yaml
+++ b/devops/aws/chart/values.yaml
@@ -18,7 +18,7 @@ environmentVariables:
- name: JAVA_OPTS
value: "-Xms538M -Xmx900M"
- name: LOG_LEVEL
- value: "{{ .Values.global.logLevel }}"
+ value: "{{ default `INFO` .Values.global.logLevel }}"
- name: SSM_ENABLED
value: "True"
- name: SSL_ENABLED
--
GitLab