Skip to content

Commit 2f572d2

Browse files
maltesandermaltesander
committed
chore: remove metadata storage properties
1 parent 0e75305 commit 2f572d2

2 files changed

Lines changed: 16 additions & 274 deletions

File tree

‎deploy/config-spec/properties.yaml‎

Lines changed: 8 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ spec:
88
- "/tmp/xyz"
99
- unit: &unitPort
1010
name: "port"
11-
regex: "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$"
11+
regex: "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]\
12+
|6553[0-5])$"
1213
- unit: &unitPrometheusNamespace
1314
name: "prometheusNamespace"
1415
regex: "^[a-zA-Z_:][a-zA-Z0-9_:]*$"
1516
- unit: &unitDuration
1617
name: "duration"
17-
regex: "^P(?!$)(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(T(?=\\d)(\\d+H)?(\\d+M)?(\\d+S)?)?$"
18+
regex: "^P(?!$)(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(T(?=\\d)(\\d+H)?(\\d+M)?(\\d+S)\
19+
?)?$"
1820
examples:
1921
- "PT300S"
2022

@@ -214,7 +216,6 @@ properties:
214216
comment: "TTL for host names that cannot be resolved."
215217
description: "TTL for host names that cannot be resolved."
216218

217-
218219
- property: &plaintextPort
219220
propertyNames:
220221
- name: "druid.plaintextPort"
@@ -418,139 +419,6 @@ properties:
418419
required: true
419420
asOfVersion: "0.0.0"
420421

421-
- property: &metadataStorageType
422-
propertyNames:
423-
- name: "druid.metadata.storage.type"
424-
kind:
425-
type: "file"
426-
file: "runtime.properties"
427-
datatype:
428-
type: "string"
429-
allowedValues:
430-
- "mysql"
431-
- "postgresql"
432-
- "derby"
433-
roles:
434-
- name: "broker"
435-
required: true
436-
- name: "coordinator"
437-
required: true
438-
- name: "historical"
439-
required: true
440-
- name: "middlemanager"
441-
required: true
442-
- name: "router"
443-
required: true
444-
asOfVersion: "0.0.0"
445-
446-
- property: &metadataStorageConnectURI
447-
propertyNames:
448-
- name: "druid.metadata.storage.connector.connectURI"
449-
kind:
450-
type: "file"
451-
file: "runtime.properties"
452-
datatype:
453-
type: "string"
454-
roles:
455-
- name: "broker"
456-
required: true
457-
- name: "coordinator"
458-
required: true
459-
- name: "historical"
460-
required: true
461-
- name: "middlemanager"
462-
required: true
463-
- name: "router"
464-
required: true
465-
asOfVersion: "0.0.0"
466-
467-
- property: &metadataStorageHost
468-
propertyNames:
469-
- name: "druid.metadata.storage.connector.host"
470-
kind:
471-
type: "file"
472-
file: "runtime.properties"
473-
datatype:
474-
type: "string"
475-
roles:
476-
- name: "broker"
477-
required: true
478-
- name: "coordinator"
479-
required: true
480-
- name: "historical"
481-
required: true
482-
- name: "middlemanager"
483-
required: true
484-
- name: "router"
485-
required: true
486-
asOfVersion: "0.0.0"
487-
488-
- property: &metadataStoragePort
489-
propertyNames:
490-
- name: "druid.metadata.storage.connector.port"
491-
kind:
492-
type: "file"
493-
file: "runtime.properties"
494-
datatype:
495-
type: "integer"
496-
min: "1024"
497-
max: "65535"
498-
unit: *unitPort
499-
roles:
500-
- name: "broker"
501-
required: true
502-
- name: "coordinator"
503-
required: true
504-
- name: "historical"
505-
required: true
506-
- name: "middlemanager"
507-
required: true
508-
- name: "router"
509-
required: true
510-
asOfVersion: "0.0.0"
511-
512-
- property: &metadataStorageUser
513-
propertyNames:
514-
- name: "druid.metadata.storage.connector.user"
515-
kind:
516-
type: "file"
517-
file: "runtime.properties"
518-
datatype:
519-
type: "string"
520-
roles:
521-
- name: "broker"
522-
required: false
523-
- name: "coordinator"
524-
required: false
525-
- name: "historical"
526-
required: false
527-
- name: "middlemanager"
528-
required: false
529-
- name: "router"
530-
required: false
531-
asOfVersion: "0.0.0"
532-
533-
- property: &metadataStoragePassword
534-
propertyNames:
535-
- name: "druid.metadata.storage.connector.password"
536-
kind:
537-
type: "file"
538-
file: "runtime.properties"
539-
datatype:
540-
type: "string"
541-
roles:
542-
- name: "broker"
543-
required: false
544-
- name: "coordinator"
545-
required: false
546-
- name: "historical"
547-
required: false
548-
- name: "middlemanager"
549-
required: false
550-
- name: "router"
551-
required: false
552-
asOfVersion: "0.0.0"
553-
554422
- property: &indexerLogsDirectory
555423
propertyNames:
556424
- name: "druid.indexer.logs.directory"
@@ -661,7 +529,10 @@ properties:
661529
type: "string"
662530
defaultValues:
663531
- fromVersion: "0.0.0"
664-
value: "-server -Xms256m -Xmx256m -XX:MaxDirectMemorySize=300m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -XX:+ExitOnOutOfMemoryError -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
532+
value: "-server -Xms256m -Xmx256m -XX:MaxDirectMemorySize=300m
533+
-Duser.timezone=UTC -Dfile.encoding=UTF-8
534+
-XX:+ExitOnOutOfMemoryError
535+
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
665536
roles:
666537
- name: "broker"
667538
required: false

‎deploy/helm/druid-operator/configs/properties.yaml‎

Lines changed: 8 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ spec:
88
- "/tmp/xyz"
99
- unit: &unitPort
1010
name: "port"
11-
regex: "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$"
11+
regex: "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]\
12+
|6553[0-5])$"
1213
- unit: &unitPrometheusNamespace
1314
name: "prometheusNamespace"
1415
regex: "^[a-zA-Z_:][a-zA-Z0-9_:]*$"
1516
- unit: &unitDuration
1617
name: "duration"
17-
regex: "^P(?!$)(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(T(?=\\d)(\\d+H)?(\\d+M)?(\\d+S)?)?$"
18+
regex: "^P(?!$)(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(T(?=\\d)(\\d+H)?(\\d+M)?(\\d+S)\
19+
?)?$"
1820
examples:
1921
- "PT300S"
2022

@@ -214,7 +216,6 @@ properties:
214216
comment: "TTL for host names that cannot be resolved."
215217
description: "TTL for host names that cannot be resolved."
216218

217-
218219
- property: &plaintextPort
219220
propertyNames:
220221
- name: "druid.plaintextPort"
@@ -418,139 +419,6 @@ properties:
418419
required: true
419420
asOfVersion: "0.0.0"
420421

421-
- property: &metadataStorageType
422-
propertyNames:
423-
- name: "druid.metadata.storage.type"
424-
kind:
425-
type: "file"
426-
file: "runtime.properties"
427-
datatype:
428-
type: "string"
429-
allowedValues:
430-
- "mysql"
431-
- "postgresql"
432-
- "derby"
433-
roles:
434-
- name: "broker"
435-
required: true
436-
- name: "coordinator"
437-
required: true
438-
- name: "historical"
439-
required: true
440-
- name: "middlemanager"
441-
required: true
442-
- name: "router"
443-
required: true
444-
asOfVersion: "0.0.0"
445-
446-
- property: &metadataStorageConnectURI
447-
propertyNames:
448-
- name: "druid.metadata.storage.connector.connectURI"
449-
kind:
450-
type: "file"
451-
file: "runtime.properties"
452-
datatype:
453-
type: "string"
454-
roles:
455-
- name: "broker"
456-
required: true
457-
- name: "coordinator"
458-
required: true
459-
- name: "historical"
460-
required: true
461-
- name: "middlemanager"
462-
required: true
463-
- name: "router"
464-
required: true
465-
asOfVersion: "0.0.0"
466-
467-
- property: &metadataStorageHost
468-
propertyNames:
469-
- name: "druid.metadata.storage.connector.host"
470-
kind:
471-
type: "file"
472-
file: "runtime.properties"
473-
datatype:
474-
type: "string"
475-
roles:
476-
- name: "broker"
477-
required: true
478-
- name: "coordinator"
479-
required: true
480-
- name: "historical"
481-
required: true
482-
- name: "middlemanager"
483-
required: true
484-
- name: "router"
485-
required: true
486-
asOfVersion: "0.0.0"
487-
488-
- property: &metadataStoragePort
489-
propertyNames:
490-
- name: "druid.metadata.storage.connector.port"
491-
kind:
492-
type: "file"
493-
file: "runtime.properties"
494-
datatype:
495-
type: "integer"
496-
min: "1024"
497-
max: "65535"
498-
unit: *unitPort
499-
roles:
500-
- name: "broker"
501-
required: true
502-
- name: "coordinator"
503-
required: true
504-
- name: "historical"
505-
required: true
506-
- name: "middlemanager"
507-
required: true
508-
- name: "router"
509-
required: true
510-
asOfVersion: "0.0.0"
511-
512-
- property: &metadataStorageUser
513-
propertyNames:
514-
- name: "druid.metadata.storage.connector.user"
515-
kind:
516-
type: "file"
517-
file: "runtime.properties"
518-
datatype:
519-
type: "string"
520-
roles:
521-
- name: "broker"
522-
required: false
523-
- name: "coordinator"
524-
required: false
525-
- name: "historical"
526-
required: false
527-
- name: "middlemanager"
528-
required: false
529-
- name: "router"
530-
required: false
531-
asOfVersion: "0.0.0"
532-
533-
- property: &metadataStoragePassword
534-
propertyNames:
535-
- name: "druid.metadata.storage.connector.password"
536-
kind:
537-
type: "file"
538-
file: "runtime.properties"
539-
datatype:
540-
type: "string"
541-
roles:
542-
- name: "broker"
543-
required: false
544-
- name: "coordinator"
545-
required: false
546-
- name: "historical"
547-
required: false
548-
- name: "middlemanager"
549-
required: false
550-
- name: "router"
551-
required: false
552-
asOfVersion: "0.0.0"
553-
554422
- property: &indexerLogsDirectory
555423
propertyNames:
556424
- name: "druid.indexer.logs.directory"
@@ -661,7 +529,10 @@ properties:
661529
type: "string"
662530
defaultValues:
663531
- fromVersion: "0.0.0"
664-
value: "-server -Xms256m -Xmx256m -XX:MaxDirectMemorySize=300m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -XX:+ExitOnOutOfMemoryError -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
532+
value: "-server -Xms256m -Xmx256m -XX:MaxDirectMemorySize=300m
533+
-Duser.timezone=UTC -Dfile.encoding=UTF-8
534+
-XX:+ExitOnOutOfMemoryError
535+
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
665536
roles:
666537
- name: "broker"
667538
required: false

0 commit comments

Comments
 (0)