Skip to content

[Merged by Bors] - Update templated files to rev 718281e #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stackable-bot wants to merge 2 commits into from
Closed

[Merged by Bors] - Update templated files to rev 718281e #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2f4724
Generated commit to update templated files based on rev 718281e in st…
stackable-bot Feb 1, 2022
28b388a
Github Actions: Generated k8s manifest files
stackable-bot Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
- [ ] Documentation added (or not applicable)
- [ ] Changelog updated (or not applicable)
- [ ] Cargo.toml only contains references to git tags (not specific commits or branches)
- [ ] Helm chart can be installed and deployed operator works (or not applicable)

Once the review is done, comment `bors r+` (or `bors merge`) to merge. [Further information](https://bors.tech/documentation/getting-started/#reviewing-pull-requests)
11 changes: 3 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,16 @@ compile-chart: version crds config
chart-clean:
rm -rf deploy/helm/druid-operator/configs
rm -rf deploy/helm/druid-operator/crds
rm -rf deploy/helm/druid-operator/templates/crds.yaml

version:
yq eval -i '.version = ${VERSION} | .appVersion = ${VERSION}' deploy/helm/druid-operator/Chart.yaml

config: deploy/helm/druid-operator/configs

deploy/helm/druid-operator/configs:
config:
cp -r deploy/config-spec deploy/helm/druid-operator/configs

crds: deploy/helm/druid-operator/crds/crds.yaml

deploy/helm/druid-operator/crds/crds.yaml:
crds:
mkdir -p deploy/helm/druid-operator/crds
cat deploy/crd/*.yaml | yq eval '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > ${@}
cat deploy/crd/*.yaml | yq eval '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > deploy/helm/druid-operator/crds/crds.yaml

chart-lint: compile-chart
docker run -it -v $(shell pwd):/build/helm-charts -w /build/helm-charts quay.io/helmpack/chart-testing:v3.5.0 ct lint --config deploy/helm/ct.yaml
Expand Down
173 changes: 173 additions & 0 deletions deploy/helm/druid-operator/configs/config-spec/properties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
version: 0.1.0
spec:
units:
- unit: &unitDirectory
name: "directory"
regex: "^/|(/[\\w-]+)+$"
examples:
- "/tmp/xyz"

###################################################################################################
# runtime.properties
###################################################################################################

properties:

- property: &metadataStorageType
propertyNames:
- name: "druid.metadata.storage.type"
kind:
type: "file"
file: "runtime.properties"
datatype:
type: "string"
roles:
- name: "broker"
required: true
- name: "coordinator"
required: true
- name: "historical"
required: true
- name: "middleManager"
required: true
- name: "router"
required: true
asOfVersion: "0.0.0"

- property: &metadataStorageConnectURI
propertyNames:
- name: "druid.metadata.storage.connector.connectURI"
kind:
type: "file"
file: "runtime.properties"
datatype:
type: "string"
roles:
- name: "broker"
required: true
- name: "coordinator"
required: true
- name: "historical"
required: true
- name: "middleManager"
required: true
- name: "router"
required: true
asOfVersion: "0.0.0"

- property: &metadataStorageHost
propertyNames:
- name: "druid.metadata.storage.connector.host"
kind:
type: "file"
file: "runtime.properties"
datatype:
type: "string"
roles:
- name: "broker"
required: true
- name: "coordinator"
required: true
- name: "historical"
required: true
- name: "middleManager"
required: true
- name: "router"
required: true
asOfVersion: "0.0.0"

- property: &metadataStoragePort
propertyNames:
- name: "druid.metadata.storage.connector.port"
kind:
type: "file"
file: "runtime.properties"
datatype:
type: "integer"
min: "1024"
max: "65535"
roles:
- name: "broker"
required: true
- name: "coordinator"
required: true
- name: "historical"
required: true
- name: "middleManager"
required: true
- name: "router"
required: true
asOfVersion: "0.0.0"

- property: &metadataStorageUser
propertyNames:
- name: "druid.metadata.storage.connector.user"
kind:
type: "file"
file: "runtime.properties"
datatype:
type: "string"
roles:
- name: "broker"
required: false
- name: "coordinator"
required: false
- name: "historical"
required: false
- name: "middleManager"
required: false
- name: "router"
required: false
asOfVersion: "0.0.0"

- property: &metadataStoragePassword
propertyNames:
- name: "druid.metadata.storage.connector.password"
kind:
type: "file"
file: "runtime.properties"
datatype:
type: "string"
roles:
- name: "broker"
required: false
- name: "coordinator"
required: false
- name: "historical"
required: false
- name: "middleManager"
required: false
- name: "router"
required: false
asOfVersion: "0.0.0"

###################################################################################################
# jvm.config
###################################################################################################

###################################################################################################
# log.properties
###################################################################################################

- property: &ioTrino
propertyNames:
- name: "io.trino"
kind:
type: "file"
file: "log.properties"
datatype:
type: "string"
defaultValues:
- fromVersion: "0.0.0"
value: "INFO"
allowedValues:
- "INFO"
- "DEBUG"
- "WARN"
- "ERROR"
roles:
- name: "coordinator"
required: true
- name: "worker"
required: true
asOfVersion: "0.0.0"
1 change: 1 addition & 0 deletions deploy/helm/druid-operator/templates/roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ rules:
resources:
- pods
- configmaps
- secrets
- services
- endpoints
- serviceaccounts
Expand Down
1 change: 1 addition & 0 deletions deploy/manifests/roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ rules:
resources:
- pods
- configmaps
- secrets
- services
- endpoints
- serviceaccounts
Expand Down