diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index c83486ba..1a6611f4 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -1,5 +1,5 @@ --- -name: "push" +name: "Release k6-operator" on: workflow_dispatch: diff --git a/Makefile b/Makefile index e1d0ecf9..a1bc94f8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -VERSION ?= 0.0.10 +VERSION ?= 0.0.11 # Default bundle image tag BUNDLE_IMG ?= k6-controller-bundle:$(VERSION) # Options for 'bundle-build' diff --git a/README.md b/README.md index b393fffb..3ea0a0d3 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,22 @@ curl https://raw.githubusercontent.com/grafana/k6-operator/main/bundle.yaml | ku Bundle includes default manifests for k6-operator, including `k6-operator-system` namespace and k6-operator Deployment with latest tagged Docker image. Customizations can be made on top of this manifest as needs be, e.g. with `kustomize`. +#### Deployment with Helm + +Helm releases of k6-operator are published together with other Grafana Helm charts and can be installed with the following commands: + +```bash +helm repo add grafana https://grafana.github.io/helm-charts +helm repo update +helm install k6-operator grafana/k6-operator +``` + +Passing additional configuration can be done with `values.yaml` (example can be found [here](https://github.com/grafana/k6-operator/blob/main/charts/k6-operator/samples/customAnnotationsAndLabels.yaml)): + +```bash +helm install k6-operator grafana/k6-operator -f values.yaml +``` + #### Makefile deployment In order to install the operator with Makefile, the following additional tooling must be installed: diff --git a/docs/releases.md b/docs/releases.md new file mode 100644 index 00000000..8b66c29e --- /dev/null +++ b/docs/releases.md @@ -0,0 +1,12 @@ +## Release workflow + +Current release process is rather heavy on manual interventions: + +1. _manual_ Create a Github release. +2. "Release" workflow is triggered: +- build of new Docker images from `main` +- PR to update bundle +3. _manual_ Review and merge PR with bundle update. +4. _manual_ Update operator's version in `values.yaml` and bump `Chart.yaml`. +5. "Helm release" workflow is triggered, publishing to Helm Grafana repo. +6. _manual_ Update Makefile with latest version, as well as `docs/versioning.md`. diff --git a/docs/versioning.md b/docs/versioning.md index 2d4c7117..cbb1e7cc 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -21,6 +21,10 @@ Since around v0.0.7 k6-operator has been releasing a default runner image togeth | v0.0.10rc2 | [runner-v0.0.10rc2](ghcr.io/grafana/operator:runner-v0.0.10rc2) | v0.45.0 | | v0.0.10rc3 | [runner-v0.0.10rc3](ghcr.io/grafana/k6-operator:runner-v0.0.10rc3) | v0.45.0 | | v0.0.10 | [runner-v0.0.10](ghcr.io/grafana/k6-operator:runner-v0.0.10) | v0.46.0 | +| v0.0.11rc1 | [runner-v0.0.11rc1](ghcr.io/grafana/k6-operator:runner-v0.0.11rc1) | v0.46.0 | +| v0.0.11rc2 | [runner-v0.0.11rc2](ghcr.io/grafana/k6-operator:runner-v0.0.11rc2) | v0.46.0 | +| v0.0.11rc3 | [runner-v0.0.11rc3](ghcr.io/grafana/k6-operator:runner-v0.0.11rc3) | v0.46.0 | +| v0.0.11 | [runner-v0.0.11](ghcr.io/grafana/k6-operator:runner-v0.0.11) | v0.47.0 | ### What was used before?