Migrate Helm plugin from v1-alpha to v2-alpha

.gitignore

@@ -17,6 +17,9 @@ Dockerfile.cross
 go.work
 go.work.sum
 
+# Generated build-installer
+dist/*
+
 # Kubernetes Generated files - skip generated files, except for vendored files
 !vendor/**/zz_generated.*
 

Makefile

@@ -80,13 +80,11 @@ docker-push: FORCE
 # Generate a consolidated YAML with CRDs and deployment.
 build-installer: FORCE generate install-kustomize
 	@printf "\e[1;36m>> kustomize build config/default > dist/install.yaml\e[0m\n"
-	@cd config/manager && kustomize edit set image controller=$(IMG)
-	@mkdir -p build; kustomize build config/default > dist/install.yaml
+	@mkdir -p dist; kustomize build config/default > dist/install.yaml
 
 # Deploy controller to the k8s cluster
 deploy: FORCE generate install-kustomize
 	@printf "\e[1;36m>> kustomize build config/default | kubectl apply -f -\e[0m\n"
-	@cd config/manager && kustomize edit set image controller=$(IMG)
 	@kustomize build config/default | kubectl apply -f -
 
 # Undeploy controller from the k8s cluster
@@ -132,12 +130,14 @@ tilt-up: FORCE kind-create
 	@printf "\e[1;36m>> tilt up --context kind-$(KIND_CLUSTER)\e[0m\n"
 	@tilt up --context kind-$(KIND_CLUSTER)
 
+manifests: generate
+
 # Generate manifests e.g. CRD, RBAC etc.
 charts: FORCE generate
-	@printf "\e[1;36m>> kubebuilder edit --plugins=helm/v1-alpha\e[0m\n"
-	@mkdir dist && mv charts/network-operator dist/chart
-	@kubebuilder edit --plugins=helm/v1-alpha
-	@mv dist/chart charts/network-operator && rm -rf dist
+	@printf "\e[1;36m>> kubebuilder edit --plugins=helm/v2-alpha\e[0m\n"
+	@mv charts/network-operator charts/chart
+	@kubebuilder edit --plugins=helm/v2-alpha --output-dir=charts
+	@mv charts/chart charts/network-operator && rm -rf dist
 
 netop-provider:
 	@printf "\e[1;36m>> go build -o build/netop-provider ./hack/provider\e[0m\n"

Makefile.maker.yaml

@@ -124,13 +124,11 @@ verbatim: |
   # Generate a consolidated YAML with CRDs and deployment.
   build-installer: FORCE generate install-kustomize
     @printf "\e[1;36m>> kustomize build config/default > dist/install.yaml\e[0m\n"
-    @cd config/manager && kustomize edit set image controller=$(IMG)
-    @mkdir -p build; kustomize build config/default > dist/install.yaml
+    @mkdir -p dist; kustomize build config/default > dist/install.yaml
 
   # Deploy controller to the k8s cluster
   deploy: FORCE generate install-kustomize
     @printf "\e[1;36m>> kustomize build config/default | kubectl apply -f -\e[0m\n"
-    @cd config/manager && kustomize edit set image controller=$(IMG)
     @kustomize build config/default | kubectl apply -f -
 
   # Undeploy controller from the k8s cluster
@@ -176,12 +174,14 @@ verbatim: |
     @printf "\e[1;36m>> tilt up --context kind-$(KIND_CLUSTER)\e[0m\n"
     @tilt up --context kind-$(KIND_CLUSTER)
 
+  manifests: generate
+
   # Generate manifests e.g. CRD, RBAC etc.
   charts: FORCE generate
-    @printf "\e[1;36m>> kubebuilder edit --plugins=helm/v1-alpha\e[0m\n"
-    @mkdir dist && mv charts/network-operator dist/chart
-    @kubebuilder edit --plugins=helm/v1-alpha
-    @mv dist/chart charts/network-operator && rm -rf dist
+    @printf "\e[1;36m>> kubebuilder edit --plugins=helm/v2-alpha\e[0m\n"
+    @mv charts/network-operator charts/chart
+    @kubebuilder edit --plugins=helm/v2-alpha --output-dir=charts
+    @mv charts/chart charts/network-operator && rm -rf dist
 
   netop-provider:
     @printf "\e[1;36m>> go build -o build/netop-provider ./hack/provider\e[0m\n"

PROJECT

@@ -7,7 +7,9 @@ layout:
 - go.kubebuilder.io/v4
 multigroup: true
 plugins:
-  helm.kubebuilder.io/v1-alpha: {}
+  helm.kubebuilder.io/v2-alpha:
+    manifests: dist/install.yaml
+    output: charts
 projectName: network-operator
 repo: github.com/ironcore-dev/network-operator
 resources:

charts/network-operator/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: oci://ghcr.io/sapcc/helm-charts
   version: 1.0.0
 digest: sha256:7643f231cc4ebda347fd12ec62fe4445c280e2b71d27eec555f3025290f5038f
-generated: "2025-08-07T13:01:53.383695+02:00"
+generated: "2026-02-17T17:07:50.077747+01:00"

charts/network-operator/templates/NOTES.txt

@@ -0,0 +1,15 @@
+Thank you for installing {{ .Chart.Name }}.
+
+Your release is named {{ .Release.Name }}.
+
+The controller and CRDs have been installed in namespace {{ .Release.Namespace }}.
+
+To verify the installation:
+
+  kubectl get pods -n {{ .Release.Namespace }}
+  kubectl get customresourcedefinitions
+
+To learn more about the release, try:
+
+  $ helm status {{ .Release.Name }} -n {{ .Release.Namespace }}
+  $ helm get all {{ .Release.Name }} -n {{ .Release.Namespace }}

charts/network-operator/templates/_helpers.tpl

@@ -1,50 +1,50 @@
-{{- define "chart.name" -}}
-{{- if .Chart }}
-  {{- if .Chart.Name }}
-    {{- .Chart.Name | trunc 63 | trimSuffix "-" }}
-  {{- else if .Values.nameOverride }}
-    {{ .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-  {{- else }}
-    network-operator
-  {{- end }}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "network-operator.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "network-operator.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-  network-operator
-{{- end }}
-{{- end }}
-
-
-{{- define "chart.labels" -}}
-{{- if .Chart.AppVersion -}}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
-{{- if .Chart.Version }}
-helm.sh/chart: {{ .Chart.Version | quote }}
 {{- end }}
-app.kubernetes.io/name: {{ include "chart.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
-
-{{- define "chart.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "chart.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
+{{/*
+Namespace for generated references.
+Always uses the Helm release namespace.
+*/}}
+{{- define "network-operator.namespaceName" -}}
+{{- .Release.Namespace }}
 {{- end }}
 
-
-{{- define "chart.hasMutatingWebhooks" -}}
-{{- $hasMutating := false }}
-{{- range . }}
-  {{- if eq .type "mutating" }}
-    $hasMutating = true }}{{- end }}
+{{/*
+Resource name with proper truncation for Kubernetes 63-character limit.
+Takes a dict with:
+  - .suffix: Resource name suffix (e.g., "metrics", "webhook")
+  - .context: Template context (root context with .Values, .Release, etc.)
+Dynamically calculates safe truncation to ensure total name length <= 63 chars.
+*/}}
+{{- define "network-operator.resourceName" -}}
+{{- $fullname := include "network-operator.fullname" .context }}
+{{- $suffix := .suffix }}
+{{- $maxLen := sub 62 (len $suffix) | int }}
+{{- if gt (len $fullname) $maxLen }}
+{{- printf "%s-%s" (trunc $maxLen $fullname | trimSuffix "-") $suffix | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" $fullname $suffix | trunc 63 | trimSuffix "-" }}
 {{- end }}
-{{ $hasMutating }}}}{{- end }}
-
-
-{{- define "chart.hasValidatingWebhooks" -}}
-{{- $hasValidating := false }}
-{{- range . }}
-  {{- if eq .type "validating" }}
-    $hasValidating = true }}{{- end }}
 {{- end }}
-{{ $hasValidating }}}}{{- end }}

charts/network-operator/templates/cert-manager/metrics-certs.yaml

@@ -0,0 +1,20 @@
+{{- if and .Values.certManager.enable .Values.metrics.enable }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+    labels:
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/name: {{ include "network-operator.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    name: {{ include "network-operator.resourceName" (dict "suffix" "metrics-certs" "context" $) }}
+    namespace: {{ .Release.Namespace }}
+spec:
+    dnsNames:
+        - {{ include "network-operator.resourceName" (dict "suffix" "controller-manager-metrics-service" "context" $) }}.{{ include "network-operator.namespaceName" $ }}.svc
+        - {{ include "network-operator.resourceName" (dict "suffix" "controller-manager-metrics-service" "context" $) }}.{{ include "network-operator.namespaceName" $ }}.svc.cluster.local
+    issuerRef:
+        kind: Issuer
+        name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
+    secretName: metrics-server-cert
+{{- end }}

charts/network-operator/templates/cert-manager/selfsigned-issuer.yaml

@@ -0,0 +1,14 @@
+{{- if .Values.certManager.enable }}
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+    labels:
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/name: {{ include "network-operator.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
+    namespace: {{ .Release.Namespace }}
+spec:
+    selfSigned: {}
+{{- end }}

charts/network-operator/templates/cert-manager/serving-cert.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.certManager.enable }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+    labels:
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/name: {{ include "network-operator.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    name: {{ include "network-operator.resourceName" (dict "suffix" "serving-cert" "context" $) }}
+    namespace: {{ .Release.Namespace }}
+spec:
+    dnsNames:
+        - {{ include "network-operator.resourceName" (dict "suffix" "webhook-service" "context" $) }}.{{ .Release.Namespace }}.svc
+        - {{ include "network-operator.resourceName" (dict "suffix" "webhook-service" "context" $) }}.{{ .Release.Namespace }}.svc.cluster.local
+    issuerRef:
+        kind: Issuer
+        name: {{ include "network-operator.resourceName" (dict "suffix" "selfsigned-issuer" "context" $) }}
+    secretName: webhook-server-cert
+{{- end }}