File tree Expand file tree Collapse file tree 3 files changed +3
-4
lines changed
Expand file tree Collapse file tree 3 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -59,7 +59,6 @@ Cluster:
5959 owner :
6060 $ref : definitions.yaml#/idName
6161 description : A cluster owner. Used in alerts/reports to distinguish between resources for different customers.
62- default : otomi
6362 region :
6463 $ref : definitions.yaml#/awsRegion
6564 description : ' An AWS region. Used by charts such as cluster-autoscaler and aws-certs job. Example: eu-central-1'
Original file line number Diff line number Diff line change @@ -469,7 +469,7 @@ files:
469469 properties :
470470 path :
471471 type : string
472- pattern : ^\/([A-z0-9-_+]+\/).* $
472+ pattern : ^\/[^\0]+ $
473473 x-message : a valid file name
474474 content :
475475 type : string
@@ -1076,7 +1076,7 @@ svcPredeployed:
10761076 title : Existing Kubernetes service
10771077 type : object
10781078url :
1079- pattern : ^( https:\/\/)([\w\-])+\.{1}( [a-zA-Z]{2,63})([\/\w-]*)*\/?\??([^#\n\r]*)?#?([^\n\r ]*)$
1079+ pattern : ^https? :\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\. [a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/= ]*)
10801080 type : string
10811081vaultToken :
10821082 title : Token
Original file line number Diff line number Diff line change @@ -825,7 +825,7 @@ export default class OtomiStack {
825825 if ( svc . ingress && svc . ingress . type !== 'cluster' ) {
826826 const ing = svc . ingress
827827 if ( ing . useDefaultSubdomain ) svcCloned . ownHost = true
828- else svcCloned . domain = `${ ing . subdomain } .${ ing . domain } `
828+ else svcCloned . domain = ing . subdomain ? `${ ing . subdomain } .${ ing . domain } ` : ing . domain
829829 if ( ing . hasCert ) svcCloned . hasCert = true
830830 if ( ing . certName ) svcCloned . certName = ing . certName
831831 if ( ing . certArn ) svcCloned . certArn = ing . certArn
You can’t perform that action at this time.
0 commit comments