Skip to content

Commit d5b1b1c

Browse files
stackable-botstackable-bot
committed
Update templated files to rev 881efd7 (#114)
Automatically created PR based on commit 881efd7896e9f0bf671f6b0c4eb3fbbee9c52275 in stackabletech/operator-templating repo. Original commit message: Fix my mistakes (#54) - I had a few outdated references to chart_testing.yaml in there - I accidentally dropped the "description field" from the Chart which causes lint to fail Co-authored-by: Stacky McStackface <[email protected]>
1 parent b776439 commit d5b1b1c

26 files changed

+314
-105
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/helm_tests.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Lint and Test Helm Charts
2+
3+
on:
4+
push:
5+
branches: ["main"]
6+
pull_request:
7+
8+
env:
9+
CT_CONFIG: deploy/helm/ct.yaml
10+
11+
jobs:
12+
lint-test:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/[email protected]
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Set up Helm
21+
uses: azure/setup-helm@v1
22+
with:
23+
version: v3.7.2
24+
25+
- uses: actions/setup-python@v2
26+
with:
27+
python-version: 3.7
28+
29+
- name: Compile chart
30+
run: make compile-chart
31+
32+
- name: Set up chart-testing
33+
uses: helm/[email protected]
34+
35+
- name: Run chart-testing (lint)
36+
run: ct lint --config "${CT_CONFIG}"
37+
38+
- name: Run chart-testing (list-changed)
39+
id: list-changed
40+
run: |
41+
changed=$(ct list-changed --config "${CT_CONFIG}")
42+
if [[ -n "$changed" ]]; then
43+
echo "::set-output name=changed::true"
44+
fi
45+
46+
- name: Create kind cluster
47+
uses: helm/[email protected]
48+
if: steps.list-changed.outputs.changed == 'true'
49+
50+
- name: Run chart-testing (install)
51+
run: ct install --config "${CT_CONFIG}"
52+
if: steps.list-changed.outputs.changed == 'true'

‎.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: druid
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/druid-operator/configs
11-
deploy/helm/druid-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/druid-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/druid-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: druid-operator
4+
version: 0.3.0-nightly
5+
appVersion: "0.3.0-nightly"
76
description: The Stackable Operator for Apache Druid
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/druid-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/druid-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 Apache Druid
72

83
This Helm Chart can be used to install Custom Resource Definitions and the Operator for Apache Druid 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 Apache Druid
12+
## Install the Stackable Operator for Apache Druid
1813

1914
```bash
2015
# From the root of the operator repository
@@ -24,15 +19,11 @@ helm install druid-operator deploy/helm/druid-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/druid/index.html)
2825

29-
## Create a Apache Druid Cluster
30-
31-
as described [here](https://docs.stackable.tech/druid/index.html)
32-
33-
34-
35-
The operator has example requests included in the [`/examples`](https://github.com/stackabletech/druid/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/druid/operator/tree/main/examples) directory.
3627

3728

3829
## Links

‎deploy/helm/druid-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/druid-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/druid-operator/templates/roles.yaml

+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:

0 commit comments

Comments
 (0)