Skip to content
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

Add Con-Bench helm chart to the Vald charts repository #2377

Closed
wants to merge 4 commits into from
Closed

Add Con-Bench helm chart to the Vald charts repository #2377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11df547
improve Backport Pull Request Title & Description Quality (#2373)
kpango Feb 16, 2024
6fa69cd
:green_heart: :recycle: Add Con-Bench helm chart to the Vald charts
vankichi Feb 19, 2024
e7999c9
:recycle: Fix version
vankichi Feb 19, 2024
061218d
:recycle: :green_heart: Fix
vankichi Feb 19, 2024
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
3 changes: 3 additions & 0 deletions .github/workflows/_release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ jobs:
sed -i -r "s/^(\s*)tag\s*:\s*v[0-9]+\.[0-9]+\.[0-9]+\s*$/\1tag: ${RELEASE_TAG}/" charts/vald/values.yaml
sed -i -e "s/^version: .*$/version: ${RELEASE_TAG}/" charts/vald-helm-operator/Chart.yaml
sed -i -r "s/^(\s*)tag\s*:\s*v[0-9]+\.[0-9]+\.[0-9]+\s*$/\1tag: ${RELEASE_TAG}/" charts/vald-helm-operator/values.yaml
sed -i -e "s/^version: .*$/version: ${RELEASE_TAG}/" charts/vald-benchmark-operator/Chart.yaml
sed -i -r "s/^(\s*)tag\s*:\s*v[0-9]+\.[0-9]+\.[0-9]+\s*$/\1tag: ${RELEASE_TAG}/" charts/vald-benchmark-operator/values.yaml

make helm/schema/all
make helm/schema/crd/all
Expand All @@ -83,6 +85,7 @@ jobs:
make helm/docs/vald
make helm/docs/vald-helm-operator
make helm/docs/vald-readreplica
make helm/docs/vald-benchmark-operator

BODY=""
if [ ! -z "${PR_NUM}" ]; then
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/backport.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,17 @@ jobs:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
git_user_signingkey: true
git_commit_gpgsign: true
- name: Set context
id: set_context
- name: Get PR title and body
id: pr_info
run: |
LABEL_NAMES=`cat ${GITHUB_EVENT_PATH} | jq -r --arg PREFIX $TARGET_LABEL_NAME_PREFIX '[.pull_request.labels[]? | select(.name | startswith($PREFIX)) | .name] | join(" ")'`
echo "LABEL_NAMES=${LABEL_NAMES}" >> $GITHUB_OUTPUT # e.g.) actions/backport/v1.7 actions/backport/v1.8
echo "${LABEL_NAMES}"
- name: Create PR
if: ${{ steps.set_context.outputs.LABEL_NAMES != '' }}
if: ${{ github.event.pull_request.labels.*.name == '${TARGET_LABEL_NAME_PREFIX}*' }}
env:
LABEL_NAMES: ${{ steps.set_context.outputs.LABEL_NAMES }}
PR_TITLE: ${{ steps.pr_info.outputs.PR_TITEL }}
PR_BODY: ${{ steps.pr_info.outputs.PR_BODY }}
GITHUB_USER: ${{ secrets.DISPATCH_USER }}
GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }}
run: |
Expand All @@ -62,7 +63,6 @@ jobs:
PR_NUM=`cat $GITHUB_EVENT_PATH | jq -r ".pull_request.number"`

echo "${PR_NUM} ${PR_TITLE}: ${PR_BODY}"

for LABEL_NAME in ${LABEL_NAMES}; do
BRANCH_NAME=`echo "${LABEL_NAME}" | sed -e "s:^${TARGET_LABEL_NAME_PREFIX}::"` # e.g) release/vx.x, main
BACKPORT_BRANCH_NAME="${BACKPORT_BRANCH_NAME_PREFIX}/${BRANCH_NAME}/${GITHUB_HEAD_REF}" # e.g) backport/release/vx.x/{current branch name}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/helm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
run: |
make helm/package/vald
make helm/package/vald-helm-operator
make helm/package/vald-benchmark-operator
- name: Push to gh-pages
run: |
git checkout .
Expand Down
19 changes: 18 additions & 1 deletion Makefile.d/helm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ helm/package/vald-helm-operator: \
helm/schema/crd/vald-helm-operator
helm package charts/vald-helm-operator

.PHONY: helm/package/vald-benchmark-operator
## packaging Helm chart for vald-helm-operator
helm/package/vald-benchmark-operator: \
helm/schema/crd/vald-benchmark-job \
helm/schema/crd/vald-benchmark-scenario \
helm/schema/crd/vald-benchmark-operator
helm package charts/vald-benchmark-operator
ykadowak marked this conversation as resolved.
Show resolved Hide resolved

.PHONY: helm/repo/add
## add Helm chart repository
helm/repo/add:
Expand Down Expand Up @@ -80,6 +88,15 @@ charts/vald-readreplica/README.md: \
charts/vald-readreplica/values.yaml
helm-docs

.PHONY: helm/docs/vald-benchmark-operator
helm/docs/vald-benchmark-operator: charts/vald-benchmark-operator/README.md

.PHONY: charts/vald-benchmark-operator/README.md
charts/vald-benchmark-operator/README.md: \
charts/vald-benchmark-operator/README.md.gotmpl \
charts/vald-benchmark-operator/values.yaml
helm-docs

.PHONY: helm/schema/all
helm/schema/all: \
helm/schema/vald \
Expand Down Expand Up @@ -142,8 +159,8 @@ $(BINDIR)/yq:
helm/schema/crd/all: \
helm/schema/crd/vald \
helm/schema/crd/vald-helm-operator \
helm/schema/crd/vald-benchmark-job \
helm/schema/crd/vald/mirror-target \
helm/schema/crd/vald-benchmark-job \
helm/schema/crd/vald-benchmark-scenario \
helm/schema/crd/vald-benchmark-operator

Expand Down
2 changes: 1 addition & 1 deletion charts/vald-benchmark-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ appVersion: "1.16.0"

apiVersion: v2
name: vald-benchmark-operator
version: v1.7.5
version: v1.7.11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version needs to be updated by ci like below

vald/.github/workflows/_release-pr.yml

Line 77 in 9b088e3

sed -i -e "s/^version: .*$/version: ${RELEASE_TAG}/" charts/vald-readreplica/Chart.yaml

description: A benchmark operator for benchmarking the Vald cluster.
type: application
keywords:
Expand Down
31 changes: 14 additions & 17 deletions charts/vald-benchmark-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
# vald-benchmark-operator
# Vald Benchmark Operator

![Version: v1.7.5](https://img.shields.io/badge/Version-v1.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
This is a Helm chart to install `vald-benchmark-operator`.

A benchmark operator for benchmarking the Vald cluster.
Current chart version is `v1.7.11`

**Homepage:** <https://vald.vdaas.org>
## Table of Contents

## Maintainers
- [Install](#install)
- [Configuration](#configuration)

| Name | Email | Url |
| -------- | -------------------- | --- |
| kpango | <kpango@vdaas.org> | |
| vankichi | <vankichi@vdaas.org> | |
| kmrmt | <ksk@vdaas.org> | |
## Install

## Source Code
Add Vald Helm repository

- <https://github.com/vdaas/vald>
$ helm repo add vald https://vald.vdaas.org/charts

## Values
Run the following command to install the chart,

$ helm install vald-benchmark-operator vald/vald-benchmark-operator

## Configuration

| Key | Type | Default | Description |
| ----------------------------------------------------------------------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------- |
Expand Down Expand Up @@ -180,7 +181,3 @@ A benchmark operator for benchmarking the Vald cluster.
| time_zone | string | `""` | time_zone |
| tolerations | list | `[]` | tolerations |
| version | string | `"v0.0.0"` | version of benchmark-operator config |

---

Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
29 changes: 29 additions & 0 deletions charts/vald-benchmark-operator/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Vald Benchmark Operator
===

This is a Helm chart to install `vald-benchmark-operator`.


Current chart version is `{{ template "chart.version" . }}`

Table of Contents
---

- [Install](#install)
- [Configuration](#configuration)

Install
---

Add Vald Helm repository

$ helm repo add vald https://vald.vdaas.org/charts

Run the following command to install the chart,

$ helm install vald-benchmark-operator vald/vald-benchmark-operator

Configuration
---

{{ template "chart.valuesTable" . }}
Loading