Prechádzať zdrojové kódy

[bitnami/grafana-k6-operator] :zap: :arrow_up: Update dependency references (#34736)

* [bitnami/grafana-k6-operator] Release 0.1.9 updating components versions

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CRDs automatically

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* [bitnami/grafana-k6-operator-0] Update chart according to the latest kubebuilder changes

Signed-off-by: David Gomez <david.gomez@broadcom.com>

* [bitnami/grafana-k6-operator-0] Bump minor version

Signed-off-by: David Gomez <david.gomez@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* [bitnami/grafana-k6-operator] Update tests

Signed-off-by: David Gomez <david.gomez@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* [bitnami/grafana-k6-operator] Bump a new major version

Signed-off-by: David Gomez <david.gomez@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

---------

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
Signed-off-by: David Gomez <david.gomez@broadcom.com>
Co-authored-by: David Gomez <david.gomez@broadcom.com>
Bitnami Bot 2 mesiacov pred
rodič
commit
ccb52bd3fa

+ 5 - 7
.vib/grafana-k6-operator/goss/goss.yaml

@@ -10,10 +10,8 @@ command:
     exit-status: 0
     stdout:
       - /testrun-sample.*finished/
-  # We cannot use goss built-in "http" directive because we need the SA token present in the
-  # container filesystem, so we need to use curl
-  check-metrics:
-    exec: 'curl -k --header "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" https://grafana-k6-operator-metrics:{{ .Vars.metrics.service.ports.metrics }}/metrics'
-    exit-status: 0
-    stdout:
-      - /workqueue_work_duration_second/
+http:
+  http://grafana-k6-operator-metrics:{{ .Vars.metrics.service.ports.metrics }}/metrics:
+    status: 200
+    body:
+      - workqueue_work_duration_second

+ 0 - 2
.vib/grafana-k6-operator/runtime-parameters.yaml

@@ -219,8 +219,6 @@ extraDeploy:
 # external. Therefore we do not test SAs, containerSecurityContext and containerPorts
 metrics:
   enabled: true
-  authProxy:
-    enabled: true
   service:
     ports:
       metrics: 2311

+ 6 - 2
bitnami/grafana-k6-operator/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
-## 0.1.8 (2025-06-25)
+## 1.0.0 (2025-07-02)
 
-* [bitnami/grafana-k6-operator] :zap: :arrow_up: Update dependency references ([#34630](https://github.com/bitnami/charts/pull/34630))
+* [bitnami/grafana-k6-operator] :zap: :arrow_up: Update dependency references ([#34736](https://github.com/bitnami/charts/pull/34736))
+
+## <small>0.1.8 (2025-06-25)</small>
+
+* [bitnami/grafana-k6-operator] :zap: :arrow_up: Update dependency references (#34630) ([9d9aa9e](https://github.com/bitnami/charts/commit/9d9aa9e57af6a94a778c4165687daef000d6ff81)), closes [#34630](https://github.com/bitnami/charts/issues/34630)
 
 ## <small>0.1.7 (2025-06-13)</small>
 

+ 3 - 3
bitnami/grafana-k6-operator/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.31.1
-digest: sha256:38d6de6fd62a10417ff51df8b2c5e0cf294de80fe393c4e9f3247ca6433718fa
-generated: "2025-05-20T10:11:48.648379566+02:00"
+  version: 2.31.3
+digest: sha256:f9c314553215490ea1b94c70082cb152d6ff5916ce185b4e00f5287f81545b4c
+generated: "2025-07-01T15:00:27.810248+02:00"

+ 3 - 5
bitnami/grafana-k6-operator/Chart.yaml

@@ -7,15 +7,13 @@ annotations:
     - name: grafana-k6
       image: docker.io/bitnami/grafana-k6:1.1.0-debian-12-r0
     - name: grafana-k6-operator
-      image: docker.io/bitnami/grafana-k6-operator:0.0.21-debian-12-r3
-    - name: kube-rbac-proxy
-      image: docker.io/bitnami/kube-rbac-proxy:0.19.1-debian-12-r4
+      image: docker.io/bitnami/grafana-k6-operator:0.0.22-debian-12-r0
     - name: os-shell
       image: docker.io/bitnami/os-shell:12-debian-12-r47
   licenses: Apache-2.0
   tanzuCategory: service
 apiVersion: v2
-appVersion: 0.0.21
+appVersion: 0.0.22
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
@@ -37,4 +35,4 @@ maintainers:
 name: grafana-k6-operator
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/grafana-k6-operator
-version: 0.1.8
+version: 1.0.0

+ 25 - 69
bitnami/grafana-k6-operator/README.md

@@ -319,75 +319,25 @@ As an alternative, use one of the preset configurations for pod affinity, pod an
 
 ### Prometheus metrics parameters
 
-| Name                                                                  | Description                                                                                                                                                                                                                                    | Value                             |
-| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------- |
-| `metrics.enabled`                                                     | Enable the export of Prometheus metrics                                                                                                                                                                                                        | `false`                           |
-| `metrics.authProxy.enabled`                                           |                                                                                                                                                                                                                                                | `false`                           |
-| `metrics.authProxy.image.registry`                                    | kube-auth-proxy image registry                                                                                                                                                                                                                 | `REGISTRY_NAME`                   |
-| `metrics.authProxy.image.repository`                                  | kube-auth-proxy image repository                                                                                                                                                                                                               | `REPOSITORY_NAME/kube-auth-proxy` |
-| `metrics.authProxy.image.digest`                                      | kube-auth-proxy image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag                                                                                                                                | `""`                              |
-| `metrics.authProxy.image.pullPolicy`                                  | kube-auth-proxy image pull policy                                                                                                                                                                                                              | `IfNotPresent`                    |
-| `metrics.authProxy.image.pullSecrets`                                 | Specify docker-registry secret names as an array                                                                                                                                                                                               | `[]`                              |
-| `metrics.authProxy.command`                                           | Override default container command (useful when using custom images)                                                                                                                                                                           | `[]`                              |
-| `metrics.authProxy.args`                                              | Override default container args (useful when using custom images)                                                                                                                                                                              | `[]`                              |
-| `metrics.authProxy.extraArgs`                                         | Add extra arguments to the default container args section                                                                                                                                                                                      | `[]`                              |
-| `metrics.authProxy.containerSecurityContext.enabled`                  | Enable Prometheus kube-auth-proxy containers' Security Context                                                                                                                                                                                 | `true`                            |
-| `metrics.authProxy.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                                                                                                                                                               | `{}`                              |
-| `metrics.authProxy.containerSecurityContext.runAsUser`                | Set Prometheus kube-auth-proxy containers' Security Context runAsUser                                                                                                                                                                          | `1001`                            |
-| `metrics.authProxy.containerSecurityContext.runAsGroup`               | Group ID for the Prometheus kube-auth-proxy container                                                                                                                                                                                          | `1001`                            |
-| `metrics.authProxy.containerSecurityContext.runAsNonRoot`             | Set Prometheus kube-auth-proxy containers' Security Context runAsNonRoot                                                                                                                                                                       | `true`                            |
-| `metrics.authProxy.containerSecurityContext.privileged`               | Set Prometheus kube-auth-proxy container's Security Context privileged                                                                                                                                                                         | `false`                           |
-| `metrics.authProxy.containerSecurityContext.allowPrivilegeEscalation` | Set Prometheus kube-auth-proxy containers' Security Context allowPrivilegeEscalation                                                                                                                                                           | `false`                           |
-| `metrics.authProxy.containerSecurityContext.readOnlyRootFilesystem`   | Set Prometheus kube-auth-proxy containers' Security Context readOnlyRootFilesystem                                                                                                                                                             | `true`                            |
-| `metrics.authProxy.containerSecurityContext.capabilities.drop`        | Set Prometheus kube-auth-proxy containers' Security Context capabilities to be dropped                                                                                                                                                         | `["ALL"]`                         |
-| `metrics.authProxy.containerSecurityContext.seccompProfile.type`      | Set Prometheus kube-auth-proxy container's Security Context seccomp profile                                                                                                                                                                    | `RuntimeDefault`                  |
-| `metrics.authProxy.containerPorts.https`                              | kube-auth-proxy container port                                                                                                                                                                                                                 | `8443`                            |
-| `metrics.authProxy.containerPorts.health`                             | kube-auth-proxy health port                                                                                                                                                                                                                    | `8081`                            |
-| `metrics.authProxy.extraContainerPorts`                               | Optionally specify extra list of additional container ports                                                                                                                                                                                    | `[]`                              |
-| `metrics.authProxy.extraVolumeMounts`                                 | Optionally specify extra list of additional volumeMounts for kube-auth-proxy                                                                                                                                                                   | `[]`                              |
-| `metrics.authProxy.customLivenessProbe`                               | Custom livenessProbe that overrides the default one                                                                                                                                                                                            | `{}`                              |
-| `metrics.authProxy.customReadinessProbe`                              | Custom readinessProbe that overrides the default one                                                                                                                                                                                           | `{}`                              |
-| `metrics.authProxy.customStartupProbe`                                | Custom startupProbe that overrides the default one                                                                                                                                                                                             | `{}`                              |
-| `metrics.authProxy.lifecycleHooks`                                    | for the kube-auth-proxy containers' to automate configuration before or after startup                                                                                                                                                          | `{}`                              |
-| `metrics.authProxy.extraEnvVars`                                      | Array with extra environment variables to add to kube-auth-proxy containers                                                                                                                                                                    | `[]`                              |
-| `metrics.authProxy.extraEnvVarsCM`                                    | Name of existing ConfigMap containing extra env vars for ClickHouse Operator Metrics exporter containers                                                                                                                                       | `""`                              |
-| `metrics.authProxy.extraEnvVarsSecret`                                | Name of existing Secret containing extra env vars for ClickHouse Operator Metrics exporter containers                                                                                                                                          | `""`                              |
-| `metrics.authProxy.resourcesPreset`                                   | Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if metrics.authProxy.resources is set (metrics.authProxy.resources is recommended for production). | `micro`                           |
-| `metrics.authProxy.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads)                                                                                                                              | `{}`                              |
-| `metrics.authProxy.livenessProbe.enabled`                             | Enable livenessProbe                                                                                                                                                                                                                           | `true`                            |
-| `metrics.authProxy.livenessProbe.initialDelaySeconds`                 | Initial delay seconds for livenessProbe                                                                                                                                                                                                        | `5`                               |
-| `metrics.authProxy.livenessProbe.periodSeconds`                       | Period seconds for livenessProbe                                                                                                                                                                                                               | `10`                              |
-| `metrics.authProxy.livenessProbe.timeoutSeconds`                      | Timeout seconds for livenessProbe                                                                                                                                                                                                              | `30`                              |
-| `metrics.authProxy.livenessProbe.failureThreshold`                    | Failure threshold for livenessProbe                                                                                                                                                                                                            | `3`                               |
-| `metrics.authProxy.livenessProbe.successThreshold`                    | Success threshold for livenessProbe                                                                                                                                                                                                            | `1`                               |
-| `metrics.authProxy.readinessProbe.enabled`                            | Enable readinessProbe                                                                                                                                                                                                                          | `true`                            |
-| `metrics.authProxy.readinessProbe.initialDelaySeconds`                | Initial delay seconds for readinessProbe                                                                                                                                                                                                       | `5`                               |
-| `metrics.authProxy.readinessProbe.periodSeconds`                      | Period seconds for readinessProbe                                                                                                                                                                                                              | `10`                              |
-| `metrics.authProxy.readinessProbe.timeoutSeconds`                     | Timeout seconds for readinessProbe                                                                                                                                                                                                             | `30`                              |
-| `metrics.authProxy.readinessProbe.failureThreshold`                   | Failure threshold for readinessProbe                                                                                                                                                                                                           | `3`                               |
-| `metrics.authProxy.readinessProbe.successThreshold`                   | Success threshold for readinessProbe                                                                                                                                                                                                           | `1`                               |
-| `metrics.authProxy.startupProbe.enabled`                              | Enable startupProbe                                                                                                                                                                                                                            | `false`                           |
-| `metrics.authProxy.startupProbe.initialDelaySeconds`                  | Initial delay seconds for startupProbe                                                                                                                                                                                                         | `5`                               |
-| `metrics.authProxy.startupProbe.periodSeconds`                        | Period seconds for startupProbe                                                                                                                                                                                                                | `10`                              |
-| `metrics.authProxy.startupProbe.timeoutSeconds`                       | Timeout seconds for startupProbe                                                                                                                                                                                                               | `30`                              |
-| `metrics.authProxy.startupProbe.failureThreshold`                     | Failure threshold for startupProbe                                                                                                                                                                                                             | `3`                               |
-| `metrics.authProxy.startupProbe.successThreshold`                     | Success threshold for startupProbe                                                                                                                                                                                                             | `1`                               |
-| `metrics.service.ports.metrics`                                       | kube-auth-proxy service port                                                                                                                                                                                                                   | `443`                             |
-| `metrics.service.clusterIP`                                           | Static clusterIP or None for headless services                                                                                                                                                                                                 | `""`                              |
-| `metrics.service.sessionAffinity`                                     | Control where client requests go, to the same pod or round-robin                                                                                                                                                                               | `None`                            |
-| `metrics.service.labels`                                              | labels for the metrics service                                                                                                                                                                                                                 | `{}`                              |
-| `metrics.service.annotations`                                         | Annotations for the metrics service                                                                                                                                                                                                            | `{}`                              |
-| `metrics.serviceMonitor.enabled`                                      | if `true`, creates a Prometheus Operator ServiceMonitor (also requires `metrics.enabled` to be `true`)                                                                                                                                         | `false`                           |
-| `metrics.serviceMonitor.namespace`                                    | Namespace in which Prometheus is running                                                                                                                                                                                                       | `""`                              |
-| `metrics.serviceMonitor.annotations`                                  | Additional custom annotations for the ServiceMonitor                                                                                                                                                                                           | `{}`                              |
-| `metrics.serviceMonitor.labels`                                       | Extra labels for the ServiceMonitor                                                                                                                                                                                                            | `{}`                              |
-| `metrics.serviceMonitor.jobLabel`                                     | The name of the label on the target service to use as the job name in Prometheus                                                                                                                                                               | `""`                              |
-| `metrics.serviceMonitor.honorLabels`                                  | honorLabels chooses the metric's labels on collisions with target labels                                                                                                                                                                       | `false`                           |
-| `metrics.serviceMonitor.interval`                                     | Interval at which metrics should be scraped.                                                                                                                                                                                                   | `""`                              |
-| `metrics.serviceMonitor.scrapeTimeout`                                | Timeout after which the scrape is ended                                                                                                                                                                                                        | `""`                              |
-| `metrics.serviceMonitor.metricRelabelings`                            | Specify additional relabeling of metrics                                                                                                                                                                                                       | `[]`                              |
-| `metrics.serviceMonitor.relabelings`                                  | Specify general relabeling                                                                                                                                                                                                                     | `[]`                              |
-| `metrics.serviceMonitor.selector`                                     | Prometheus instance selector labels                                                                                                                                                                                                            | `{}`                              |
+| Name                                       | Description                                                                                            | Value   |
+| ------------------------------------------ | ------------------------------------------------------------------------------------------------------ | ------- |
+| `metrics.enabled`                          | Enable the export of Prometheus metrics                                                                | `false` |
+| `metrics.service.ports.metrics`            | kube-auth-proxy service port                                                                           | `443`   |
+| `metrics.service.clusterIP`                | Static clusterIP or None for headless services                                                         | `""`    |
+| `metrics.service.sessionAffinity`          | Control where client requests go, to the same pod or round-robin                                       | `None`  |
+| `metrics.service.labels`                   | labels for the metrics service                                                                         | `{}`    |
+| `metrics.service.annotations`              | Annotations for the metrics service                                                                    | `{}`    |
+| `metrics.serviceMonitor.enabled`           | if `true`, creates a Prometheus Operator ServiceMonitor (also requires `metrics.enabled` to be `true`) | `false` |
+| `metrics.serviceMonitor.namespace`         | Namespace in which Prometheus is running                                                               | `""`    |
+| `metrics.serviceMonitor.annotations`       | Additional custom annotations for the ServiceMonitor                                                   | `{}`    |
+| `metrics.serviceMonitor.labels`            | Extra labels for the ServiceMonitor                                                                    | `{}`    |
+| `metrics.serviceMonitor.jobLabel`          | The name of the label on the target service to use as the job name in Prometheus                       | `""`    |
+| `metrics.serviceMonitor.honorLabels`       | honorLabels chooses the metric's labels on collisions with target labels                               | `false` |
+| `metrics.serviceMonitor.interval`          | Interval at which metrics should be scraped.                                                           | `""`    |
+| `metrics.serviceMonitor.scrapeTimeout`     | Timeout after which the scrape is ended                                                                | `""`    |
+| `metrics.serviceMonitor.metricRelabelings` | Specify additional relabeling of metrics                                                               | `[]`    |
+| `metrics.serviceMonitor.relabelings`       | Specify general relabeling                                                                             | `[]`    |
+| `metrics.serviceMonitor.selector`          | Prometheus instance selector labels                                                                    | `{}`    |
 
 The above parameters map to the env variables defined in [bitnami/grafana-k6-operator](https://github.com/bitnami/containers/tree/main/bitnami/grafana-k6-operator). For more information please refer to the [bitnami/grafana-k6-operator](https://github.com/bitnami/containers/tree/main/bitnami/grafana-k6-operator) image documentation.
 
@@ -416,6 +366,12 @@ helm install my-release -f values.yaml REGISTRY_NAME/REPOSITORY_NAME/grafana-k6-
 
 Find more information about how to deal with common errors related to Bitnami's Helm charts in [this troubleshooting guide](https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues).
 
+## Upgrading
+
+### To 1.0.0
+
+This major release introduces some breaking changes, including the removal of the `kube-rbac-proxy` image. Section `metrics.authProxy` has been removed accordingly. Find more details in the [release notes](https://github.com/grafana/k6-operator/releases/tag/v0.0.22).
+
 ## License
 
 Copyright &copy; 2025 Broadcom. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.

+ 1 - 1
bitnami/grafana-k6-operator/crds/k6.io_privateloadzones.yaml

@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/k6-operator/refs/tags/v{{version}}/config/crd/bases/k6.io_privateloadzones.yaml
-# Version: 0.0.21
+# Version: 0.0.22
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

+ 7 - 1
bitnami/grafana-k6-operator/crds/k6.io_testruns.yaml

@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/k6-operator/refs/tags/v{{version}}/config/crd/bases/k6.io_testruns.yaml
-# Version: 0.0.21
+# Version: 0.0.22
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -770,6 +770,8 @@ spec:
                           type: string
                         name:
                           type: string
+                        restartPolicy:
+                          type: string
                         volumeMounts:
                           items:
                             properties:
@@ -2713,6 +2715,8 @@ spec:
                           type: string
                         name:
                           type: string
+                        restartPolicy:
+                          type: string
                         volumeMounts:
                           items:
                             properties:
@@ -4679,6 +4683,8 @@ spec:
                           type: string
                         name:
                           type: string
+                        restartPolicy:
+                          type: string
                         volumeMounts:
                           items:
                             properties:

+ 1 - 6
bitnami/grafana-k6-operator/templates/NOTES.txt

@@ -31,12 +31,7 @@ Grafana k6 Operator will ONLY access resources in the {{ include "common.names.n
 {{- include "common.warnings.rollingTag" .Values.starterImage }}
 {{- $checkImages := list .Values.runnerImage .Values.starterImage .Values.image }}
 {{- $resourcesSections := list "" }}
-{{- if and .Values.metrics.enabled .Values.metrics.authProxy.enabled }}
-  {{- include "common.warnings.rollingTag" .Values.metrics.authProxy.image }}
-  {{- $checkImages = append $checkImages .Values.metrics.authProxy.image }}
-  {{- $resourcesSections = append $resourcesSections "metrics.authProxy" }}
-{{- end }}
 {{- include "common.warnings.resources" (dict "sections" $resourcesSections "context" .) }}
 {{- include "grafana-k6-operator.validateValues" . }}
-{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.image .Values.metrics.authProxy.image .Values.runnerImage .Values.starterImage) "context" $) }}
+{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.image .Values.runnerImage .Values.starterImage) "context" $) }}
 {{- include "common.errors.insecureImages" (dict "images" $checkImages "context" $) }}

+ 1 - 8
bitnami/grafana-k6-operator/templates/_helpers.tpl

@@ -7,7 +7,7 @@ SPDX-License-Identifier: APACHE-2.0
 Return the proper Docker Image Registry Secret Names
 */}}
 {{- define "grafana-k6-operator.imagePullSecrets" -}}
-{{- include "common.images.pullSecrets" (dict "images" (list  .Values.image .Values.runnerImage .Values.starterImage .Values.metrics.authProxy.image) "global" .Values.global) -}}
+{{- include "common.images.pullSecrets" (dict "images" (list  .Values.image .Values.runnerImage .Values.starterImage ) "global" .Values.global) -}}
 {{- end -}}
 
 {{/*
@@ -31,13 +31,6 @@ Return the proper Grafana k6 Operator Sidecar image name
 {{ include "common.images.image" (dict "imageRoot" .Values.starterImage "global" .Values.global) }}
 {{- end -}}
 
-{{/*
-Return the proper kube-auth-proxy image name
-*/}}
-{{- define "grafana-k6-operator.authProxy.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.metrics.authProxy.image "global" .Values.global) }}
-{{- end -}}
-
 {{/*
 Create the name of the service account to use
 */}}

+ 2 - 2
bitnami/grafana-k6-operator/templates/clusterrolebinding.yaml

@@ -26,7 +26,7 @@ subjects:
 kind: ClusterRoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
-  name: {{ printf "%s-proxy" (include "common.names.fullname.namespace" .) | trunc 63 | trimSuffix "-" }}
+  name: {{ printf "%s-metrics-auth" (include "common.names.fullname.namespace" .) | trunc 63 | trimSuffix "-" }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: grafana-k6-operator
     app.kubernetes.io/component: grafana-k6-operator
@@ -36,7 +36,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ printf "%s-proxy" (include "common.names.fullname.namespace" .) | trunc 63 | trimSuffix "-" }}
+  name: {{ printf "%s-metrics-auth" (include "common.names.fullname.namespace" .) | trunc 63 | trimSuffix "-" }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "grafana-k6-operator.serviceAccountName" . }}

+ 1 - 1
bitnami/grafana-k6-operator/templates/clusterroles.yaml

@@ -150,7 +150,7 @@ rules:
   {{- if .Values.rbac.rules }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.rbac.rules "context" $ ) | nindent 2 }}
   {{- end }}
-{{- if and .Values.metrics.enabled .Values.metrics.authProxy.enabled }}
+{{- if .Values.metrics.enabled }}
 ---
 kind: ClusterRole
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}

+ 3 - 85
bitnami/grafana-k6-operator/templates/deployment.yaml

@@ -93,10 +93,10 @@ spec:
           {{- else }}
           args:
             {{- if or (gt (int .Values.replicaCount) 1) .Values.autoscaling.hpa.enabled }}
-            - --enable-leader-election
+            - --leader-elect
             {{- end }}
-            - --metrics-addr=:{{ .Values.containerPorts.metrics }}
-            - --health-addr=:{{ .Values.containerPorts.health }}
+            - --metrics-bind-address=:{{ .Values.containerPorts.metrics }}
+            - --health-probe-bind-address=:{{ .Values.containerPorts.health }}
             {{- if .Values.extraArgs }}
             {{- range .Values.extraArgs }}
             - {{ . | quote }}
@@ -172,88 +172,6 @@ spec:
           {{- if .Values.extraVolumeMounts }}
           volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
           {{- end }}
-        {{- if and .Values.metrics.authProxy.enabled .Values.metrics.enabled }}
-        - name: kube-auth-proxy
-          image: {{ template "grafana-k6-operator.authProxy.image" . }}
-          imagePullPolicy: {{ .Values.metrics.authProxy.image.pullPolicy }}
-          {{- if .Values.metrics.authProxy.containerSecurityContext.enabled }}
-          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.metrics.authProxy.containerSecurityContext "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.metrics.authProxy.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.command "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.metrics.authProxy.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.args "context" $) | nindent 12 }}
-          {{- else }}
-          args:
-            - --secure-listen-address=0.0.0.0:{{ .Values.metrics.authProxy.containerPorts.https }}
-            - --upstream=http://127.0.0.1:{{ .Values.containerPorts.metrics }}/
-            - --proxy-endpoints-port={{ .Values.metrics.authProxy.containerPorts.health }}
-            - --logtostderr=true
-            {{- if .Values.metrics.authProxy.extraArgs }}
-            {{- range .Values.metrics.authProxy.extraArgs }}
-            - {{ . | quote }}
-            {{- end }}
-            {{- end }}
-          {{- end }}
-          env:
-            {{- if .Values.metrics.authProxy.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          envFrom:
-            {{- if .Values.metrics.authProxy.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.extraEnvVarsCM "context" $) }}
-            {{- end }}
-            {{- if .Values.metrics.authProxy.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.extraEnvVarsSecret "context" $) }}
-            {{- end }}
-          {{- if .Values.metrics.authProxy.resources }}
-          resources: {{- toYaml .Values.metrics.authProxy.resources | nindent 12 }}
-          {{- else if ne .Values.metrics.authProxy.resourcesPreset "none" }}
-          resources: {{- include "common.resources.preset" (dict "type" .Values.metrics.authProxy.resourcesPreset) | nindent 12 }}
-          {{- end }}
-          ports:
-            - name: https
-              containerPort: {{ .Values.metrics.authProxy.containerPorts.https }}
-            - name: https-health
-              containerPort: {{ .Values.metrics.authProxy.containerPorts.health }}
-            {{- if .Values.metrics.authProxy.extraContainerPorts }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.extraContainerPorts "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if .Values.metrics.authProxy.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.authProxy.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.authProxy.livenessProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: https-health
-          {{- end }}
-          {{- if .Values.metrics.authProxy.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.authProxy.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.authProxy.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /healthz
-              scheme: HTTPS
-              port: https-health
-          {{- end }}
-          {{- if .Values.metrics.authProxy.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.authProxy.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.authProxy.startupProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /healthz
-              scheme: HTTPS
-              port: https-health
-          {{- end }}
-          {{- if .Values.metrics.authProxy.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.metrics.authProxy.extraVolumeMounts }}
-          volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.authProxy.extraVolumeMounts "context" $) | nindent 12 }}
-          {{- end }}
-        {{- end }}
         {{- if .Values.sidecars }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.sidecars "context" $) | nindent 8 }}
         {{- end }}

+ 2 - 2
bitnami/grafana-k6-operator/templates/metrics-svc.yaml

@@ -23,10 +23,10 @@ spec:
   clusterIP: {{ .Values.metrics.service.clusterIP }}
   {{- end }}
   ports:
-    - name: {{ ternary "https-metrics" "http-metrics" .Values.metrics.authProxy.enabled }}
+    - name: http-metrics
       port: {{ .Values.metrics.service.ports.metrics }}
       protocol: TCP
-      targetPort: {{ ternary "https" "http-metrics" .Values.metrics.authProxy.enabled }}
+      targetPort: http-metrics
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: grafana-k6-operator
     app.kubernetes.io/component: grafana-k6-operator

+ 2 - 6
bitnami/grafana-k6-operator/templates/networkpolicy.yaml

@@ -59,16 +59,12 @@ spec:
   {{- end }}
   ingress:
     - ports:
+        {{- if .Values.metrics.enabled }}
         - port: {{ .Values.containerPorts.metrics }}
-        {{- range .Values.extraContainerPorts }}
-        - port: {{ . }}
         {{- end }}
-        {{- if and .Values.metrics.enabled .Values.metrics.authProxy.enabled }}
-        - port: {{ .Values.metrics.authProxy.containerPorts.https }}
-        {{- range .Values.metrics.authProxy.extraContainerPorts }}
+        {{- range .Values.extraContainerPorts }}
         - port: {{ . }}
         {{- end }}
-        {{- end }}
       {{- if not .Values.networkPolicy.allowExternal }}
       from:
         - podSelector:

+ 1 - 1
bitnami/grafana-k6-operator/templates/servicemonitor.yaml

@@ -27,7 +27,7 @@ spec:
       {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
       {{- end }}
   endpoints:
-    - port: {{ ternary "https-metrics" "http-metrics" .Values.metrics.authProxy.enabled }}
+    - port: http-metrics
       path: "/metrics"
       {{- if .Values.metrics.serviceMonitor.interval }}
       interval: {{ .Values.metrics.serviceMonitor.interval }}

+ 1 - 179
bitnami/grafana-k6-operator/values.yaml

@@ -75,7 +75,7 @@ extraDeploy: []
 image:
   registry: docker.io
   repository: bitnami/grafana-k6-operator
-  tag: 0.0.21-debian-12-r3
+  tag: 0.0.22-debian-12-r0
   digest: ""
   ## Specify a imagePullPolicy
   ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images
@@ -537,184 +537,6 @@ metrics:
   ## @param metrics.enabled Enable the export of Prometheus metrics
   ##
   enabled: false
-  ## kube-auth-proxy parameters
-  ##
-  authProxy:
-    ## @param metrics.authProxy.enabled
-    ##
-    enabled: false
-    ## Bitnami kube-auth-proxy image
-    ## ref: https://hub.docker.com/r/bitnami/kube-auth-proxy/tags/
-    ## @param metrics.authProxy.image.registry [default: REGISTRY_NAME] kube-auth-proxy image registry
-    ## @param metrics.authProxy.image.repository [default: REPOSITORY_NAME/kube-auth-proxy] kube-auth-proxy image repository
-    ## @skip metrics.authProxy.image.tag kube-auth-proxy image tag (immutable tags are recommended)
-    ## @param metrics.authProxy.image.digest kube-auth-proxy image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag
-    ## @param metrics.authProxy.image.pullPolicy kube-auth-proxy image pull policy
-    ## @param metrics.authProxy.image.pullSecrets Specify docker-registry secret names as an array
-    ##
-    image:
-      registry: docker.io
-      repository: bitnami/kube-rbac-proxy
-      tag: 0.19.1-debian-12-r4
-      digest: ""
-      ## Specify a imagePullPolicy
-      ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images
-      ##
-      pullPolicy: IfNotPresent
-      ## Optionally specify an array of imagePullSecrets (secrets must be manually created in the namespace)
-      ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-      ## e.g:
-      ## pullSecrets:
-      ##   - myRegistryKeySecretName
-      ##
-      pullSecrets: []
-    ## @param metrics.authProxy.command Override default container command (useful when using custom images)
-    ##
-    command: []
-    ## @param metrics.authProxy.args Override default container args (useful when using custom images)
-    ##
-    args: []
-    ## @param metrics.authProxy.extraArgs Add extra arguments to the default container args section
-    ##
-    extraArgs: []
-    ## Prometheus kube-auth-proxy containers' Security Context
-    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
-    ## @param metrics.authProxy.containerSecurityContext.enabled Enable Prometheus kube-auth-proxy containers' Security Context
-    ## @param metrics.authProxy.containerSecurityContext.seLinuxOptions [object,nullable] Set SELinux options in container
-    ## @param metrics.authProxy.containerSecurityContext.runAsUser Set Prometheus kube-auth-proxy containers' Security Context runAsUser
-    ## @param metrics.authProxy.containerSecurityContext.runAsGroup Group ID for the Prometheus kube-auth-proxy container
-    ## @param metrics.authProxy.containerSecurityContext.runAsNonRoot Set Prometheus kube-auth-proxy containers' Security Context runAsNonRoot
-    ## @param metrics.authProxy.containerSecurityContext.privileged Set Prometheus kube-auth-proxy container's Security Context privileged
-    ## @param metrics.authProxy.containerSecurityContext.allowPrivilegeEscalation Set Prometheus kube-auth-proxy containers' Security Context allowPrivilegeEscalation
-    ## @param metrics.authProxy.containerSecurityContext.readOnlyRootFilesystem Set Prometheus kube-auth-proxy containers' Security Context readOnlyRootFilesystem
-    ## @param metrics.authProxy.containerSecurityContext.capabilities.drop Set Prometheus kube-auth-proxy containers' Security Context capabilities to be dropped
-    ## @param metrics.authProxy.containerSecurityContext.seccompProfile.type Set Prometheus kube-auth-proxy container's Security Context seccomp profile
-    ## e.g:
-    ##   containerSecurityContext:
-    ##     enabled: true
-    ##     capabilities:
-    ##       drop: ["NET_RAW"]
-    ##     readOnlyRootFilesystem: true
-    ##
-    containerSecurityContext:
-      enabled: true
-      privileged: false
-      runAsNonRoot: true
-      seLinuxOptions: {}
-      runAsUser: 1001
-      runAsGroup: 1001
-      readOnlyRootFilesystem: true
-      allowPrivilegeEscalation: false
-      capabilities:
-        drop: ["ALL"]
-      seccompProfile:
-        type: "RuntimeDefault"
-    ## @param metrics.authProxy.containerPorts.https kube-auth-proxy container port
-    ## @param metrics.authProxy.containerPorts.health kube-auth-proxy health port
-    ##
-    containerPorts:
-      https: 8443
-      health: 8081
-    ## @param metrics.authProxy.extraContainerPorts Optionally specify extra list of additional container ports
-    ## e.g:
-    ## extraContainerPorts:
-    ##   - name: myservice
-    ##     containerPort: 9090
-    ##
-    extraContainerPorts: []
-    ## @param metrics.authProxy.extraVolumeMounts Optionally specify extra list of additional volumeMounts for kube-auth-proxy
-    ##
-    extraVolumeMounts: []
-    ## @param metrics.authProxy.customLivenessProbe Custom livenessProbe that overrides the default one
-    ##
-    customLivenessProbe: {}
-    ## @param metrics.authProxy.customReadinessProbe Custom readinessProbe that overrides the default one
-    ##
-    customReadinessProbe: {}
-    ## @param metrics.authProxy.customStartupProbe Custom startupProbe that overrides the default one
-    ##
-    customStartupProbe: {}
-    ## @param metrics.authProxy.lifecycleHooks for the kube-auth-proxy containers' to automate configuration before or after startup
-    ##
-    lifecycleHooks: {}
-    ## @param metrics.authProxy.extraEnvVars Array with extra environment variables to add to kube-auth-proxy containers
-    ## e.g:
-    ## extraEnvVars:
-    ##   - name: FOO
-    ##     value: "bar"
-    ##
-    extraEnvVars: []
-    ## @param metrics.authProxy.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for ClickHouse Operator Metrics exporter containers
-    ##
-    extraEnvVarsCM: ""
-    ## @param metrics.authProxy.extraEnvVarsSecret Name of existing Secret containing extra env vars for ClickHouse Operator Metrics exporter containers
-    ##
-    extraEnvVarsSecret: ""
-    ## Prometheus kube-auth-proxy resource requests and limits
-    ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-    ## @param metrics.authProxy.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if metrics.authProxy.resources is set (metrics.authProxy.resources is recommended for production).
-    ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
-    ##
-    resourcesPreset: "micro"
-    ## @param metrics.authProxy.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-    ## Example:
-    ## resources:
-    ##   requests:
-    ##     cpu: 2
-    ##     memory: 512Mi
-    ##   limits:
-    ##     cpu: 3
-    ##     memory: 1024Mi
-    ##
-    resources: {}
-    ## Configure extra options for liveness probe
-    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
-    ## @param metrics.authProxy.livenessProbe.enabled Enable livenessProbe
-    ## @param metrics.authProxy.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe
-    ## @param metrics.authProxy.livenessProbe.periodSeconds Period seconds for livenessProbe
-    ## @param metrics.authProxy.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe
-    ## @param metrics.authProxy.livenessProbe.failureThreshold Failure threshold for livenessProbe
-    ## @param metrics.authProxy.livenessProbe.successThreshold Success threshold for livenessProbe
-    ##
-    livenessProbe:
-      enabled: true
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      timeoutSeconds: 30
-      successThreshold: 1
-      failureThreshold: 3
-    ## Configure extra options for readiness probe
-    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
-    ## @param metrics.authProxy.readinessProbe.enabled Enable readinessProbe
-    ## @param metrics.authProxy.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe
-    ## @param metrics.authProxy.readinessProbe.periodSeconds Period seconds for readinessProbe
-    ## @param metrics.authProxy.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe
-    ## @param metrics.authProxy.readinessProbe.failureThreshold Failure threshold for readinessProbe
-    ## @param metrics.authProxy.readinessProbe.successThreshold Success threshold for readinessProbe
-    ##
-    readinessProbe:
-      enabled: true
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      timeoutSeconds: 30
-      successThreshold: 1
-      failureThreshold: 3
-    ## Configure extra options for startup probe
-    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-startup-probes/#configure-probes
-    ## @param metrics.authProxy.startupProbe.enabled Enable startupProbe
-    ## @param metrics.authProxy.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe
-    ## @param metrics.authProxy.startupProbe.periodSeconds Period seconds for startupProbe
-    ## @param metrics.authProxy.startupProbe.timeoutSeconds Timeout seconds for startupProbe
-    ## @param metrics.authProxy.startupProbe.failureThreshold Failure threshold for startupProbe
-    ## @param metrics.authProxy.startupProbe.successThreshold Success threshold for startupProbe
-    ##
-    startupProbe:
-      enabled: false
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      timeoutSeconds: 30
-      successThreshold: 1
-      failureThreshold: 3
 
   ## Metrics service configuration
   ##