Skip to content

Commit 0462d5c

Browse files
Update templated files to rev 938d73c (#90)
Automatically created PR based on commit 938d73c7abf0a41508aa12b0bfeb32d5f5d535d1 in stackabletech/operator-templating repo. Original commit message: Remove helm tests for now (#56) They were not using the Docker image from the current run and cause more trouble Co-authored-by: Stacky McStackface <[email protected]> Co-authored-by: Malte Sander <[email protected]>
1 parent 5aec949 commit 0462d5c

27 files changed

+265
-108
lines changed

.github/dependabot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# This file is automatically generated from the templates in stackabletech/operator-templating
33
# DON'T MANUALLY EDIT THIS FILE
44
# =============
5+
---
56
version: 2
67
updates:
78
- package-ecosystem: "github-actions"

.github/workflows/daily_security.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# This file is automatically generated from the templates in stackabletech/operator-templating
33
# DON'T MANUALLY EDIT THIS FILE
44
# =============
5+
---
56
name: Security audit
67

78
on:
89
schedule:
9-
- cron: '0 0 * * *'
10+
- cron: '15 4 * * *'
1011
workflow_dispatch:
1112

1213
jobs:

.github/workflows/publish_main_artifacts.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# This file is automatically generated from the templates in stackabletech/operator-templating
33
# DON'T MANUALLY EDIT THIS FILE
44
# =============
5-
name: Publish nightly artifacts from main
5+
---
6+
name: Publish nightly artifacts from main branch
67

78
on:
89
push:
@@ -11,16 +12,14 @@ on:
1112
schedule:
1213
- cron: '30 4 * * *'
1314
workflow_dispatch:
14-
1515

1616
env:
1717
PRODUCT_NAME: trino
1818
CARGO_TERM_COLOR: always
1919
CARGO_INCREMENTAL: '0'
2020
CARGO_PROFILE_DEV_DEBUG: '0'
21-
RUSTFLAGS: "-D warnings -W rust-2021-compatibility"
22-
REPO_HELM_DEV_URL: https://repo.stackable.tech/repository/helm-dev
23-
CHART_TESTING_CONFIG: deploy/helm/chart-testing.yaml
21+
RUSTFLAGS: "-D warnings"
22+
REPO_HELM_URL: https://repo.stackable.tech/repository/helm-dev
2423

2524
jobs:
2625
helm:
@@ -47,6 +46,7 @@ jobs:
4746

4847
- name: Package Chart
4948
run: mkdir -p target/helm && helm package --destination target/helm deploy/helm/${{ env.PRODUCT_NAME }}-operator
49+
5050
- name: Publish Chart
5151
env:
5252
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
@@ -55,6 +55,5 @@ jobs:
5555
/usr/bin/curl
5656
--fail
5757
-u 'github:${{ secrets.NEXUS_PASSWORD }}'
58-
--upload-file "./$(find target/helm/ -name *.tgz)"
59-
"${{ env.REPO_HELM_DEV_URL }}/"
60-
58+
--upload-file "./$(find target/helm/ -name '*.tgz')"
59+
"${{ env.REPO_HELM_URL }}/"

.github/workflows/publish_pr_artifacts.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# This file is automatically generated from the templates in stackabletech/operator-templating
33
# DON'T MANUALLY EDIT THIS FILE
44
# =============
5-
name: Publish pull-requests artifacts to the dev repository
5+
---
6+
name: Publish pull-request artifacts
67

78
on:
89
pull_request:
@@ -12,9 +13,8 @@ env:
1213
CARGO_TERM_COLOR: always
1314
CARGO_INCREMENTAL: '0'
1415
CARGO_PROFILE_DEV_DEBUG: '0'
15-
RUSTFLAGS: "-D warnings -W rust-2021-compatibility"
16-
REPO_HELM_DEV_URL: https://repo.stackable.tech/repository/helm-dev
17-
CHART_TESTING_CONFIG: deploy/helm/chart-testing.yaml
16+
RUSTFLAGS: "-D warnings"
17+
REPO_HELM_URL: https://repo.stackable.tech/repository/helm-test
1818

1919
jobs:
2020
helm:
@@ -36,7 +36,7 @@ jobs:
3636
python-version: '3.x'
3737

3838
- run: pip install -r ./python/requirements.txt
39-
- run: python ./python/cargo-version.py -m mr${{ github.event.number }}
39+
- run: python ./python/cargo_version.py -m pr${{ github.event.number }}
4040

4141
- name: Build Docker image
4242
env:
@@ -49,6 +49,7 @@ jobs:
4949

5050
- name: Package Chart
5151
run: mkdir -p target/helm && helm package --destination target/helm deploy/helm/${{ env.PRODUCT_NAME }}-operator
52+
5253
- name: Publish Chart
5354
env:
5455
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
@@ -57,6 +58,5 @@ jobs:
5758
/usr/bin/curl
5859
--fail
5960
-u 'github:${{ secrets.NEXUS_PASSWORD }}'
60-
--upload-file "./$(find target/helm/ -name *.tgz)"
61-
"${{ env.REPO_HELM_DEV_URL }}/"
62-
61+
--upload-file "./$(find target/helm/ -name '*.tgz')"
62+
"${{ env.REPO_HELM_URL }}/"

.github/workflows/publish_release_artifacts.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# This file is automatically generated from the templates in stackabletech/operator-templating
33
# DON'T MANUALLY EDIT THIS FILE
44
# =============
5-
name: Publish-Release-Artifacts
5+
---
6+
name: Publish release artifacts
67

78
on:
89
push:
@@ -14,9 +15,8 @@ env:
1415
CARGO_TERM_COLOR: always
1516
CARGO_INCREMENTAL: '0'
1617
CARGO_PROFILE_DEV_DEBUG: '0'
17-
RUSTFLAGS: "-D warnings -W rust-2021-compatibility"
18-
REPO_HELM_STABLE_URL: https://repo.stackable.tech/repository/helm-stable
19-
CT_CONFIG: deploy/helm/ct.yaml
18+
RUSTFLAGS: "-D warnings"
19+
REPO_HELM_URL: https://repo.stackable.tech/repository/helm-stable
2020

2121
jobs:
2222
helm:
@@ -52,5 +52,5 @@ jobs:
5252
/usr/bin/curl
5353
--fail
5454
-u 'github:${{ secrets.NEXUS_PASSWORD }}'
55-
--upload-file "./$(find target/helm/ -name *.tgz)"
56-
"${{ env.REPO_HELM_STABLE_URL }}/"
55+
--upload-file "./$(find target/helm/ -name '*.tgz')"
56+
"${{ env.REPO_HELM_URL }}/"

.github/workflows/rust.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# This file is automatically generated from the templates in stackabletech/operator-templating
33
# DON'T MANUALLY EDIT THIS FILE
44
# =============
5-
name: Rust
5+
---
6+
name: Rust checks
67

78
on:
89
push:
@@ -17,6 +18,8 @@ env:
1718
CARGO_INCREMENTAL: '0'
1819
CARGO_PROFILE_DEV_DEBUG: '0'
1920
RUSTFLAGS: "-D warnings"
21+
RUSTDOCFLAGS: "-D warnings"
22+
RUST_LOG: "info"
2023

2124
jobs:
2225

@@ -79,10 +82,10 @@ jobs:
7982
- uses: actions/[email protected]
8083
- uses: actions-rs/[email protected]
8184
with:
82-
profile: minimal
83-
toolchain: stable
84-
components: clippy
85-
override: true
85+
profile: minimal
86+
toolchain: stable
87+
components: clippy
88+
override: true
8689
- uses: Swatinem/[email protected]
8790
with:
8891
key: clippy

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ target/
77
*.iml
88

99
*.tgz
10-
deploy/helm/trino-operator/configs
11-
deploy/helm/trino-operator/templates/crds.yaml

.pylintrc

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[MESSAGES CONTROL]
2+
3+
# These rules are for missing docstrings which doesn't matter much for most of our simple scripts
4+
disable=C0114,C0115,C0116
5+
6+
[FORMAT]
7+
8+
max-line-length=999
9+
indent-string=' '

.yamllint.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
extends: default
3+
4+
ignore: |
5+
deploy/helm/**/templates
6+
7+
rules:
8+
line-length: disable
9+
truthy:
10+
check-keys: false

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ deploy/helm/trino-operator/crds/crds.yaml:
5151
cat deploy/crd/*.yaml | yq eval '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > ${@}
5252

5353
chart-lint: compile-chart
54-
docker run -it -v $(shell pwd):/build/helm-charts -w /build/helm-charts quay.io/helmpack/chart-testing:v3.4.0 ct lint --config deploy/helm/chart_testing.yaml
54+
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
5555

5656
## Manifest related targets
5757
clean-manifests:

bors.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ status = [
66
'Run cargo deny (bans licenses sources)'
77
]
88
delete_merged_branches = true
9+
use_squash_merge = true
910
pr_status = [ 'license/cla' ]
1011
timeout_sec = 7200
11-
cut_body_after = "<!-- Commit message above. Everything below is not added to the message. Do not change this line! -->"
12+
cut_body_after = "<!-- Commit message above. Everything below is not added to the message. Do not change this line! -->"

deploy/DO_NOT_EDIT.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
These Helm charts and manifests are automatically generated.
2+
Please do not edit anything in this directory manually.
3+
4+
The details are in-motion but check this repository for a few details: https://github.com/stackabletech/operator-templating

deploy/helm/ct.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file is used for chart-testing (https://github.com/helm/chart-testing)
2+
# The name "ct.yaml" is not very self-descriptive but it is the default that chart-testing is looking for
3+
---
4+
remote: origin
5+
target-branch: main
6+
chart-dirs:
7+
- deploy/helm
8+
all: true

deploy/helm/trino-operator/Chart.yaml

+6-24
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
1-
# =============
2-
# This file is automatically generated from the templates in stackabletech/operator-templating
3-
# DON'T MANUALLY EDIT THIS FILE
4-
# =============
1+
---
52
apiVersion: v2
63
name: trino-operator
4+
version: 0.3.0-nightly
5+
appVersion: "0.3.0-nightly"
76
description: The Stackable Operator for Trino
8-
# A chart can be either an 'application' or a 'library' chart.
9-
#
10-
# Application charts are a collection of templates that can be packaged into versioned archives
11-
# to be deployed.
12-
#
13-
# Library charts provide useful utilities or functions for the chart developer. They're included as
14-
# a dependency of application charts to inject those utilities and functions into the rendering
15-
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
16-
type: application
7+
home: https://github.com/stackabletech/trino-operator
178
maintainers:
18-
- name: stackable
19-
url: github.com/stackabletech
20-
# This is the chart version. This version number should be incremented each time you make changes
21-
# to the chart and its templates, including the app version.
22-
# Versions are expected to follow Semantic Versioning (https://semver.org/)
23-
version: 0.3.0-nightly
24-
# This is the version number of the application being deployed. This version number should be
25-
# incremented each time you make changes to the application. Versions are not expected to
26-
# follow Semantic Versioning. They should reflect the version the application is using.
27-
# It is recommended to use it with quotes.
28-
appVersion: 0.3.0-nightly
9+
- name: Stackable
10+
url: https://www.stackable.tech

deploy/helm/trino-operator/README.md

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
[//]: # (=============)
2-
[//]: # (This file is automatically generated from the templates in stackabletech/operator-templating)
3-
[//]: # (DON'T MANUALLY EDIT THIS FILE)
4-
[//]: # (=============)
5-
61
# Helm Chart for Stackable Operator for Trino
72

83
This Helm Chart can be used to install Custom Resource Definitions and the Operator for Trino provided by Stackable.
@@ -14,7 +9,7 @@ This Helm Chart can be used to install Custom Resource Definitions and the Opera
149
- Install [Helm](https://helm.sh/docs/intro/install/)
1510

1611

17-
## Install the Stackble Operator for Trino
12+
## Install the Stackable Operator for Trino
1813

1914
```bash
2015
# From the root of the operator repository
@@ -24,15 +19,11 @@ helm install trino-operator deploy/helm/trino-operator
2419
```
2520

2621

22+
## Usage of the CRDs
2723

24+
The usage of this operator and its CRDs is described in the [documentation](https://docs.stackable.tech/trino/index.html)
2825

29-
## Create a Trino Cluster
30-
31-
as described [here](https://docs.stackable.tech/trino/index.html)
32-
33-
34-
35-
The operator has example requests included in the [`/examples`](https://github.com/stackabletech/trino/operator/tree/main/examples) directory that can be used to spin up a cluster.
26+
The operator has example requests included in the [`/examples`](https://github.com/stackabletech/trino/operator/tree/main/examples) directory.
3627

3728

3829
## Links

deploy/helm/trino-operator/templates/configmap.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# =============
2-
# This file is automatically generated from the templates in stackabletech/operator-templating
3-
# DON'T MANUALLY EDIT THIS FILE
4-
# =============
1+
---
52
apiVersion: v1
63
data:
74
{{ (.Files.Glob "configs/*").AsConfig | indent 2 }}

deploy/helm/trino-operator/templates/deployment.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# =============
2-
# This file is automatically generated from the templates in stackabletech/operator-templating
3-
# DON'T MANUALLY EDIT THIS FILE
4-
# =============
1+
---
52
apiVersion: apps/v1
63
kind: Deployment
74
metadata:

deploy/helm/trino-operator/templates/roles.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: rbac.authorization.k8s.io/v1
23
kind: ClusterRole
34
metadata:
@@ -51,7 +52,7 @@ rules:
5152
- apiGroups:
5253
- rbac.authorization.k8s.io
5354
resources:
54-
- rolebinding
55+
- rolebindings
5556
verbs:
5657
- create
5758
- delete

deploy/helm/trino-operator/templates/serviceaccount.yaml

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# =============
2-
# This file is automatically generated from the templates in stackabletech/operator-templating
3-
# DON'T MANUALLY EDIT THIS FILE
4-
# =============
1+
---
52
{{ if .Values.serviceAccount.create -}}
63
apiVersion: v1
74
kind: ServiceAccount
@@ -29,4 +26,4 @@ roleRef:
2926
kind: ClusterRole
3027
name: {{ .Release.Name }}-clusterrole
3128
apiGroup: rbac.authorization.k8s.io
32-
{{- end }}
29+
{{- end }}

deploy/helm/trino-operator/values.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
# =============
2-
# This file is automatically generated from the templates in stackabletech/operator-templating
3-
# DON'T MANUALLY EDIT THIS FILE
4-
# =============
5-
61
# Default values for trino-operator.
7-
# This is a YAML-formatted file.
8-
# Declare variables to be passed into your templates.
2+
---
93
image:
104
repository: docker.stackable.tech/stackable/trino-operator
115
pullPolicy: IfNotPresent

deploy/manifests/Kustomization

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# =============
2-
# This file is automatically generated from the templates in stackabletech/operator-templating
3-
# DON'T MANUALLY EDIT THIS FILE
4-
# =============
1+
---
52
apiVersion: kustomize.config.k8s.io/v1beta1
63
kind: Kustomization
74
resources:

deploy/manifests/configmap.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
---
2-
# =============
3-
# This file is automatically generated from the templates in stackabletech/operator-templating
4-
# DON'T MANUALLY EDIT THIS FILE
5-
# =============
62
apiVersion: v1
73
data:
84
properties.yaml: "version: 0.1.0\nspec:\n units:\n - unit: &unitDirectory\n name: \"directory\"\n regex: \"^/|(/[\\\\w-]+)+$\"\n examples:\n - \"/tmp/xyz\"\n - unit: &unitPort\n name: \"port\"\n 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])$\"\n - unit: &unitMemory\n name: \"memory\"\n regex: \"(^\\\\p{N}+)(?:\\\\s*)((?:b|k|m|g|t|p|kb|mb|gb|tb|pb|B|K|M|G|T|P|KB|MB|GB|TB|PB)\\\\b$)\"\n examples:\n - \"1024b\"\n - \"1024kb\"\n - \"500m\"\n - \"1g\"\n - unit: &unitUri\n name: \"uri\"\n regex: \"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\\\?([^#]*))?(#(.*))?\"\n examples:\n - \"ldap://[2001:db8::7]/c=GB?objectClass?one\"\n comment: \"Specified in https://tools.ietf.org/html/rfc3986#appendix-B\"\n\n###################################################################################################\n# node.properties\n###################################################################################################\nproperties:\n - property: &nodeEnvironment\n propertyNames:\n - name: \"node.environment\"\n kind:\n type: \"file\"\n file: \"node.properties\"\n datatype:\n type: \"string\"\n roles:\n - name: \"coordinator\"\n required: true\n - name: \"worker\"\n required: true\n asOfVersion: \"0.0.0\"\n\n###################################################################################################\n# config.properties\n###################################################################################################\n - property: &coordinator\n propertyNames:\n - name: \"coordinator\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"bool\"\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"false\"\n roles:\n - name: \"coordinator\"\n required: true\n - name: \"worker\"\n required: true\n asOfVersion: \"0.0.0\"\n\n - property: &nodeSchedulerIncludeCoordinator\n propertyNames:\n - name: \"node-scheduler.include-coordinator\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"bool\"\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"false\"\n roles:\n - name: \"coordinator\"\n required: true\n asOfVersion: \"0.0.0\"\n\n - property: &httpServerHttpPort\n propertyNames:\n - name: \"http-server.http.port\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"integer\"\n min: \"1024\"\n max: \"65535\"\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"8080\"\n roles:\n - name: \"coordinator\"\n required: true\n - name: \"worker\"\n required: true\n asOfVersion: \"0.0.0\"\n\n - property: &httpServerHttpsPort\n propertyNames:\n - name: \"http-server.https.port\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"integer\"\n min: \"1024\"\n max: \"65535\"\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"8443\"\n roles:\n - name: \"coordinator\"\n required: true\n asOfVersion: \"0.0.0\"\n\n - property: &queryMaxMemory\n propertyNames:\n - name: \"query.max-memory\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"string\"\n unit: *unitMemory\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"50GB\"\n roles:\n - name: \"coordinator\"\n required: true\n - name: \"worker\"\n required: true\n asOfVersion: \"0.0.0\"\n\n - property: &queryMaxMemoryPerNode\n propertyNames:\n - name: \"query.max-memory-per-node\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"string\"\n unit: *unitMemory\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"1GB\"\n roles:\n - name: \"coordinator\"\n required: true\n - name: \"worker\"\n required: true\n asOfVersion: \"0.0.0\"\n\n - property: &queryMaxTotalMemoryPerNode\n propertyNames:\n - name: \"query.max-total-memory-per-node\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"string\"\n unit: *unitMemory\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"2GB\"\n roles:\n - name: \"coordinator\"\n required: true\n - name: \"worker\"\n required: true\n asOfVersion: \"0.0.0\"\n\n - property: &httpServerAuthenticationType\n propertyNames:\n - name: \"http-server.authentication.type\"\n kind:\n type: \"file\"\n file: \"config.properties\"\n datatype:\n type: \"string\"\n roles:\n - name: \"coordinator\"\n required: false\n asOfVersion: \"0.0.0\"\n\n###################################################################################################\n# password-authenticator.properties\n###################################################################################################\n\n - property: &passwordAuthenticatorName\n propertyNames:\n - name: \"password-authenticator.name\"\n kind:\n type: \"file\"\n file: \"password-authenticator.properties\"\n datatype:\n type: \"string\"\n allowedValues:\n - \"file\"\n roles:\n - name: \"coordinator\"\n required: false\n asOfVersion: \"0.0.0\"\n\n - property: &passwordAuthenticatorName\n propertyNames:\n - name: \"file.password-file\"\n kind:\n type: \"file\"\n file: \"password-authenticator.properties\"\n datatype:\n type: \"string\"\n roles:\n - name: \"coordinator\"\n required: false\n asOfVersion: \"0.0.0\"\n\n\n###################################################################################################\n# jvm.config\n###################################################################################################\n\n###################################################################################################\n# log.properties\n###################################################################################################\n\n - property: &ioTrino\n propertyNames:\n - name: \"io.trino\"\n kind:\n type: \"file\"\n file: \"log.properties\"\n datatype:\n type: \"string\"\n defaultValues:\n - fromVersion: \"0.0.0\"\n value: \"INFO\"\n allowedValues:\n - \"INFO\"\n - \"DEBUG\"\n - \"WARN\"\n - \"ERROR\" \n roles:\n - name: \"coordinator\"\n required: true\n - name: \"worker\"\n required: true\n asOfVersion: \"0.0.0\"\n"

0 commit comments

Comments
 (0)