Skip to content

feat(helm): Regenerate helm chart with latest kubebuilder#159

Merged
GrigoryPervakov merged 4 commits into
ClickHouse:mainfrom
Allex1:main
May 8, 2026
Merged

feat(helm): Regenerate helm chart with latest kubebuilder#159
GrigoryPervakov merged 4 commits into
ClickHouse:mainfrom
Allex1:main

Conversation

@Allex1
Copy link
Copy Markdown
Contributor

@Allex1 Allex1 commented Apr 10, 2026

Replaces #99

@Allex1 Allex1 marked this pull request as draft April 10, 2026 14:17
@GrigoryPervakov GrigoryPervakov self-assigned this Apr 10, 2026
@GrigoryPervakov
Copy link
Copy Markdown
Member

HI @Allex1, it looks great. You can use Helm e2e tests to verify this feature.
If it uses a newer version of kubebuilder, please bump its version

@Allex1
Copy link
Copy Markdown
Contributor Author

Allex1 commented Apr 10, 2026

If it uses a newer version of kubebuilder, please bump its version

This pr fixes it but unfortunately we need to wait for a release that includes it. I generated the chart by building the master branch.

@Allex1 Allex1 marked this pull request as ready for review May 1, 2026 07:12
@Allex1
Copy link
Copy Markdown
Contributor Author

Allex1 commented May 1, 2026

@GrigoryPervakov I think it's ready

@Allex1
Copy link
Copy Markdown
Contributor Author

Allex1 commented May 7, 2026

@GrigoryPervakov can I get a review ?

Copy link
Copy Markdown
Member

@GrigoryPervakov GrigoryPervakov left a comment

Choose a reason for hiding this comment

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

Is this change a pure, freshly generated chart without preserving manually added features?
Most of them were explicitly asked by the community, and I'd prefer not to drop them now

Comment thread dist/chart/Chart.yaml Outdated
Comment thread dist/chart/templates/rbac/metrics-auth-role.yaml
Comment thread dist/chart/templates/rbac/metrics-auth-rolebinding.yaml
@GrigoryPervakov GrigoryPervakov changed the title [Helm] - Regenerate helm chart with latest kubebuilder feat(helm): Regenerate helm chart with latest kubebuilder May 8, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR regenerates the operator’s Helm chart output using the latest Kubebuilder Helm plugin (v4.14.0) and updates the chart scaffolding around RBAC scope, ServiceAccount handling, and metrics/webhook/cert-manager integration. It also adjusts CI to split out OLM-labeled e2e coverage.

Changes:

  • Regenerate Helm chart scaffolding and values structure (including namespaced RBAC option and ServiceAccount naming helper).
  • Update metrics + Prometheus ServiceMonitor templates and add separate cert-manager certificate for secure metrics.
  • Split compatibility e2e tests into non-OLM vs OLM runs and bump Kubebuilder version.

Reviewed changes

Copilot reviewed 8 out of 35 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
PROJECT Updates Kubebuilder helm plugin manifest path reference.
Makefile Updates Helm chart generation flow, adds OLM-only e2e target, bumps Kubebuilder version.
dist/chart/values.yaml Restructures chart values (controller/manager/rbac/serviceAccount/metrics/prometheus).
dist/chart/templates/_helpers.tpl Fixes helper typo and adds serviceAccountName helper.
dist/chart/templates/manager/manager.yaml Regenerated Deployment template: args/env, cert mounts, SA name helper, optional manager install.
dist/chart/templates/rbac/controller-manager.yaml Adds conditional SA creation + annotations/labels support, uses SA name helper.
dist/chart/templates/rbac/manager-role.yaml Adds namespaced vs cluster-scoped RBAC kind switching.
dist/chart/templates/rbac/manager-rolebinding.yaml Adds namespaced vs cluster-scoped binding kind switching and uses SA name helper.
dist/chart/templates/rbac/leader-election-rolebinding.yaml Uses SA name helper.
dist/chart/templates/rbac/metrics-reader.yaml Gates metrics RBAC on secure metrics.
dist/chart/templates/rbac/metrics-auth-role.yaml Gates metrics RBAC on secure metrics.
dist/chart/templates/rbac/metrics-auth-rolebinding.yaml Gates metrics RBAC on secure metrics and uses SA name helper.
dist/chart/templates/rbac/clickhousecluster-admin-role.yaml Moves helper RBAC under rbac.helpers.enable and adds namespaced kind switching.
dist/chart/templates/rbac/clickhousecluster-editor-role.yaml Same as above.
dist/chart/templates/rbac/clickhousecluster-viewer-role.yaml Same as above.
dist/chart/templates/rbac/keepercluster-admin-role.yaml Same as above.
dist/chart/templates/rbac/keepercluster-editor-role.yaml Same as above.
dist/chart/templates/rbac/keepercluster-viewer-role.yaml Same as above.
dist/chart/templates/webhook/webhook-service.yaml Regenerated webhook Service ports formatting.
dist/chart/templates/webhook/validating-webhook-configuration.yaml Regenerated validating webhook configuration template.
dist/chart/templates/webhook/mutating-webhook-configuration.yaml Regenerated mutating webhook configuration template.
dist/chart/templates/cert-manager/serving-cert.yaml Updates webhook certificate generation and secret naming.
dist/chart/templates/cert-manager/metrics-certs.yaml Adds dedicated metrics certificate template for secure metrics.
dist/chart/templates/metrics/metrics-service.yaml Renames metrics Service port name based on secure/insecure mode.
dist/chart/templates/prometheus/controller-manager-metrics-monitor.yaml Adds new ServiceMonitor template under prometheus.enable.
dist/chart/templates/monitoring/servicemonitor.yaml Removes older ServiceMonitor template.
dist/chart/Chart.yaml Removes cert-manager subchart dependency block.
dist/chart/Chart.lock Removes cert-manager dependency lockfile.
config/helm/kustomization.yaml Adds helm-focused kustomization for producing install manifests and replacements.
config/default/kustomization.yaml Updates commented replacement guidance for ServiceMonitor TLS serverName substitution.
config/prometheus/monitor.yaml Updates ServiceMonitor port name + switches to strict TLS config using Secret refs.
config/metrics/service.yaml Renames insecure metrics Service port name to http.
config/metrics_secure/service.yaml Renames secure metrics Service port name to https.
.github/workflows/ci.yaml Adds CI matrix entry to run OLM-labeled deploy e2e.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread PROJECT
Comment thread config/prometheus/monitor.yaml
@GrigoryPervakov GrigoryPervakov merged commit f08fa9e into ClickHouse:main May 8, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants