From 9df1f7b885c7239ef8ba3c09928b70e643bc80d4 Mon Sep 17 00:00:00 2001 From: Richard Johansson Date: Tue, 21 Nov 2023 17:09:32 +0100 Subject: [PATCH] feat: optional installation of crds Signed-off-by: Richard Johansson --- charts/k6-operator/Chart.yaml | 2 +- charts/k6-operator/README.md | 5 ++++- charts/k6-operator/templates/crds/k6.yaml | 4 +++- charts/k6-operator/templates/crds/plz.yaml | 2 ++ charts/k6-operator/templates/crds/testrun.yaml | 2 ++ charts/k6-operator/values.yaml | 3 +++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/charts/k6-operator/Chart.yaml b/charts/k6-operator/Chart.yaml index 5d157107..a4fe7c59 100644 --- a/charts/k6-operator/Chart.yaml +++ b/charts/k6-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.0.11" description: A Helm chart to install the k6-operator name: k6-operator -version: 3.0.0 +version: 3.1.0 kubeVersion: ">=1.16.0-0" home: https://k6.io sources: diff --git a/charts/k6-operator/README.md b/charts/k6-operator/README.md index 59d61600..e847a1f6 100644 --- a/charts/k6-operator/README.md +++ b/charts/k6-operator/README.md @@ -1,6 +1,6 @@ # k6-operator -![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![AppVersion: 0.0.11](https://img.shields.io/badge/AppVersion-0.0.11-informational?style=flat-square) +![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![AppVersion: 0.0.11](https://img.shields.io/badge/AppVersion-0.0.11-informational?style=flat-square) A Helm chart to install the k6-operator @@ -34,12 +34,14 @@ Kubernetes: `>=1.16.0-0` | authProxy.resources | object | `{}` | rbac-proxy resource limitation/request | | customAnnotations | object | `{}` | Custom Annotations to be applied on all resources | | customLabels | object | `{}` | Custom Label to be applied on all resources | +| installCRDs | bool | `true` | Installs CRDs as part of the release | | manager.env | object | `{}` | Environment variables to be applied on the controller | | manager.image.name | string | `"ghcr.io/grafana/k6-operator"` | controller-manager image name | | manager.image.pullPolicy | string | `"Always"` | pull policy for the image possible values Always, Never, IfNotPresent (default: Always) | | manager.image.tag | string | `"controller-v0.0.11"` | controller-manager image tag | | manager.livenessProbe | object | `{}` | Liveness probe in Probe format | | manager.readinessProbe | object | `{}` | Readiness probe in Probe format | +| manager.replicas | int | `1` | number of controller-manager replicas (default: 1) | | manager.resources | object | `{"limits":{"cpu":"100m","memory":"100Mi"},"requests":{"cpu":"100m","memory":"50Mi"}}` | controller-manager Resources definition | | manager.resources.limits.cpu | string | `"100m"` | controller-manager CPU limit (Max) | | manager.resources.limits.memory | string | `"100Mi"` | controller-manager Memory limit (Max) | @@ -49,6 +51,7 @@ Kubernetes: `>=1.16.0-0` | manager.serviceAccount.name | string | `"k6-operator-controller"` | kubernetes service account for the k6 manager | | namespace.create | bool | `true` | create the namespace (default: true) | | nodeSelector | object | `{}` | Node Selector to be applied on all containers | +| podLabels | object | `{}` | Custom Label to be applied on all pods | | prometheus.enabled | bool | `false` | enables the prometheus metrics scraping (default: false) | | tolerations | object | `{}` | Tolerations to be applied on all containers | diff --git a/charts/k6-operator/templates/crds/k6.yaml b/charts/k6-operator/templates/crds/k6.yaml index bdd110cf..767a32eb 100644 --- a/charts/k6-operator/templates/crds/k6.yaml +++ b/charts/k6-operator/templates/crds/k6.yaml @@ -1,3 +1,4 @@ +{{- if .Values.installCRDs -}} apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -4899,4 +4900,5 @@ status: kind: "" plural: "" conditions: [] - storedVersions: [] \ No newline at end of file + storedVersions: [] +{{- end -}} diff --git a/charts/k6-operator/templates/crds/plz.yaml b/charts/k6-operator/templates/crds/plz.yaml index a080afa7..2def6c96 100644 --- a/charts/k6-operator/templates/crds/plz.yaml +++ b/charts/k6-operator/templates/crds/plz.yaml @@ -1,3 +1,4 @@ +{{- if .Values.installCRDs -}} apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -100,3 +101,4 @@ status: plural: "" conditions: [] storedVersions: [] +{{- end -}} diff --git a/charts/k6-operator/templates/crds/testrun.yaml b/charts/k6-operator/templates/crds/testrun.yaml index a729401f..e7b0438e 100644 --- a/charts/k6-operator/templates/crds/testrun.yaml +++ b/charts/k6-operator/templates/crds/testrun.yaml @@ -1,4 +1,5 @@ +{{- if .Values.installCRDs -}} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -4902,3 +4903,4 @@ status: plural: "" conditions: [] storedVersions: [] +{{- end -}} diff --git a/charts/k6-operator/values.yaml b/charts/k6-operator/values.yaml index 9ce3b142..7fca172a 100644 --- a/charts/k6-operator/values.yaml +++ b/charts/k6-operator/values.yaml @@ -16,6 +16,9 @@ affinity: {} # tolerations -- Tolerations to be applied on all containers tolerations: {} +# installCRDs -- Installs CRDs as part of the release +installCRDs: true + namespace: # namespace.create -- create the namespace (default: true) create: true