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

Backport PR #2388 to release/v1.7 for Add Con-Bench helm chart to the Vald charts #2389

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Backport PR #2388 to release/v1.7 for Add Con-Bench helm chart to the Vald charts #2389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -75,6 +75,8 @@ jobs:
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-readreplica/Chart.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 @@ -84,6 +86,7 @@ jobs:
make k8s/manifest/readreplica/update
make helm/docs/vald
make helm/docs/vald-helm-operator
make helm/docs/vald-benchmark-operator
make helm/docs/vald-readreplica

BODY=""
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
make helm/package/vald-readreplica
- name: Push to gh-pages
run: |
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

.PHONY: helm/package/vald-readreplica
helm/package/vald-readreplica:
helm package charts/vald-readreplica
Expand Down Expand Up @@ -77,6 +85,15 @@ charts/vald-helm-operator/README.md: \
.PHONY: helm/docs/vald-readreplica
helm/docs/vald-readreplica: charts/vald-readreplica/README.md

.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

# force to rebuild
.PHONY: charts/vald-readreplica/README.md
charts/vald-readreplica/README.md: \
Expand Down Expand Up @@ -146,8 +163,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
description: A benchmark operator for benchmarking the Vald cluster.
type: application
keywords:
Expand Down
35 changes: 16 additions & 19 deletions charts/vald-benchmark-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
# 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 |
| ----------------------------------------------------------------------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------- |
| affinity | object | `{}` | affinity |
| annotations | object | `{}` | deployment annotations |
| image.pullPolicy | string | `"Always"` | image pull policy |
| image.repository | string | `"vdaas/vald-benchmark-operator"` | job image repository |
| image.tag | string | `"v1.7.5"` | image tag for job docker image |
| image.tag | string | `"v1.7.11"` | image tag for job docker image |
| job_image.pullPolicy | string | `"Always"` | |
| job_image.repository | string | `"vdaas/vald-benchmark-job"` | |
| job_image.tag | string | `"v1.7.5"` | |
| job_image.tag | string | `"v1.7.11"` | |
| logging.format | string | `"raw"` | logging format. logging format must be `raw` or `json` |
| logging.level | string | `"debug"` | logging level. logging level must be `debug`, `info`, `warn`, `error` or `fatal`. |
| logging.logger | string | `"glg"` | logger name. currently logger must be `glg` or `zap`. |
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" . }}
4 changes: 2 additions & 2 deletions charts/vald-benchmark-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ image:
repository: vdaas/vald-benchmark-operator
# @schema {"name": "image.tag", "type": "string"}
# image.tag -- image tag
tag: v1.7.5
tag: v1.7.11
# @schema {"name": "image.pullPolicy", "type": "string", "enum": ["Always", "Never", "IfNotPresent"]}
# image.pullPolicy -- image pull policy
pullPolicy: Always
Expand All @@ -44,7 +44,7 @@ job_image:
repository: vdaas/vald-benchmark-job
# @schema {"name": "job_image.tag", "type": "string"}
# image.tag -- image tag for job docker image
tag: v1.7.5
tag: v1.7.11
# @schema {"name": "job_image.pullPolicy", "type": "string", "enum": ["Always", "Never", "IfNotPresent"]}
# image.pullPolicy -- image pull policy
pullPolicy: Always
Expand Down
6 changes: 3 additions & 3 deletions k8s/tools/benchmark/operator/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ metadata:
name: vald-benchmark-operator-config
labels:
app.kubernetes.io/name: vald-benchmark-operator
helm.sh/chart: vald-benchmark-operator-v1.7.5
helm.sh/chart: vald-benchmark-operator-v1.7.11
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: v1.7.5
app.kubernetes.io/version: v1.7.11
app.kubernetes.io/component: benchmark-operator
data:
config.yaml: |
Expand Down Expand Up @@ -138,5 +138,5 @@ data:
enabled: false
sampling_rate: 1
job_image:
image: "vdaas/vald-benchmark-job:v1.7.5"
image: "vdaas/vald-benchmark-job:v1.7.11"
pullPolicy: Always
6 changes: 3 additions & 3 deletions k8s/tools/benchmark/operator/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ metadata:
labels:
app: vald-benchmark-operator
app.kubernetes.io/name: vald-benchmark-operator
helm.sh/chart: vald-benchmark-operator-v1.7.5
helm.sh/chart: vald-benchmark-operator-v1.7.11
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: v1.7.5
app.kubernetes.io/version: v1.7.11
app.kubernetes.io/component: benchmark-operator
spec:
replicas: 1
Expand All @@ -42,7 +42,7 @@ spec:
serviceAccountName: vald-benchmark-operator
containers:
- name: vald-benchmark-operator
image: "vdaas/vald-benchmark-operator:v1.7.5"
image: "vdaas/vald-benchmark-operator:v1.7.11"
imagePullPolicy: Always
livenessProbe:
failureThreshold: 2
Expand Down
4 changes: 2 additions & 2 deletions k8s/tools/benchmark/operator/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ metadata:
name: vald-benchmark-operator
labels:
app.kubernetes.io/name: vald-benchmark-operator
helm.sh/chart: vald-benchmark-operator-v1.7.5
helm.sh/chart: vald-benchmark-operator-v1.7.11
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: v1.7.5
app.kubernetes.io/version: v1.7.11
app.kubernetes.io/component: helm-operator
spec:
ports:
Expand Down
Loading