fix: Integrate bjw-s/common library for exporter controller

- Corrected bjw-s/common library repository URL in Chart.yaml to the
  traditional HTTPS URL and ensured dependencies are fetched.
- Renamed exporter template to exporter-controller.yaml.
- Updated exporter-controller.yaml to correctly use
  `bjw-s.common.render.controllers` for rendering.
- Refined the context passed to the common library to include Values, Chart,
  Release, and Capabilities, and initialized expected top-level keys
  (global, defaultPodOptionsStrategy) in the Values.
- Ensured image.tag is defaulted to Chart.AppVersion in the template data
  to pass common library validations.
- Helm lint and template commands now pass successfully for both
  Deployment and DaemonSet configurations of the exporter.

.github/workflows/ci.yaml

@@ -19,16 +19,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v3
         with:
-          version: v3.10.0 # Using a specific version, can be updated
+          version: v3.10.0
-
-      - name: Add Helm repositories
-        run: |
-          helm repo add bjw-s https://bjw-s-labs.github.io/helm-charts/ --force-update
-          helm repo add prometheus-community https://prometheus-community.github.io/helm-charts --force-update
-          helm repo update
-
-      - name: Build Helm chart dependencies
-        run: helm dependency build ./charts/iperf3-monitor
 
       - name: Helm Lint
         run: helm lint ./charts/iperf3-monitor

.github/workflows/release.yml

@@ -22,15 +22,6 @@ jobs:
         with:
           version: v3.10.0
 
-      - name: Add Helm repositories
-        run: |
-          helm repo add bjw-s https://bjw-s-labs.github.io/helm-charts/ --force-update
-          helm repo add prometheus-community https://prometheus-community.github.io/helm-charts --force-update
-          helm repo update
-
-      - name: Build Helm chart dependencies
-        run: helm dependency build ./charts/iperf3-monitor
-
       - name: Helm Lint
         run: helm lint ./charts/iperf3-monitor
 
@@ -95,15 +86,6 @@ jobs:
           sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq &&\
           sudo chmod +x /usr/bin/yq
 
-      - name: Add Helm repositories
-        run: |
-          helm repo add bjw-s https://bjw-s-labs.github.io/helm-charts/ --force-update
-          helm repo add prometheus-community https://prometheus-community.github.io/helm-charts --force-update
-          helm repo update
-
-      - name: Build Helm chart dependencies
-        run: helm dependency build ./charts/iperf3-monitor
-
       - name: Set Chart Version from Tag
         run: |
           VERSION=$(echo "${{ github.ref_name }}" | sed 's/^v//')

charts/iperf3-monitor/templates/exporter-controller.yaml

@@ -45,7 +45,7 @@ Proceed with modifications only if the exporter controller is defined.
     {{- $_ := set $baseExporterEnv "IPERF_SERVER_NAMESPACE" (dict "valueFrom" (dict "fieldRef" (dict "fieldPath" "metadata.namespace"))) -}}
     {{- $_ := set $baseExporterEnv "IPERF_TEST_TIMEOUT" ($exporterControllerConfig.appConfig.testTimeout | default "10" | toString) -}}
     {{- $serverLabelSelectorDefault := printf "app.kubernetes.io/name=%s,app.kubernetes.io/instance=%s,app.kubernetes.io/component=server" $appName $release.Name -}}
-    {{- $serverLabelSelector := tpl ($exporterControllerConfig.appConfig.serverLabelSelector | default $serverLabelSelectorDefault) . -}}
+    {{- $serverLabelSelector := tpl ($exporterControllerConfig.appConfig.serverLabelSelector | default $serverLabelSelectorDefault) (dict "Release" $release "Chart" $chart "Values" $localValues) -}}
     {{- $_ := set $baseExporterEnv "IPERF_SERVER_LABEL_SELECTOR" $serverLabelSelector -}}
   {{- end -}}
 
@@ -77,7 +77,7 @@ Proceed with modifications only if the exporter controller is defined.
   {{- if $exporterContainerCfg -}}
     {{- if not $exporterContainerCfg.image.tag -}}
       {{- if $chart.AppVersion -}}
-        {{- $_ := set $exporterContainerCfg.image "tag" (printf "v%s" $chart.AppVersion) -}}
+        {{- $_ := set $exporterContainerCfg.image "tag" $chart.AppVersion -}}
       {{- else -}}
         {{- fail (printf "Error: Container image tag is not specified for controller '%s', container '%s', and Chart.AppVersion is also empty." $exporterControllerKey "exporter") -}}
       {{- end -}}
@@ -124,6 +124,6 @@ Ensure defaultPodOptionsStrategy exists, as common lib expects it at the root of
 Call the common library's main render function for controllers.
 This function iterates through all controllers defined under $localValues.controllers
 (in our case, just "exporter") and renders them using their specified type and configuration.
-The context passed must mirror the global Helm context, including 'Values', 'Chart', 'Release', 'Capabilities', and 'Template'.
+The context passed must mirror the global Helm context, including 'Values', 'Chart', 'Release', and 'Capabilities'.
 */}}
-{{- include "bjw-s.common.render.controllers" (dict "Values" $localValues "Chart" $chart "Release" $release "Capabilities" .Capabilities "Template" .Template) | nindent 0 -}}
+{{- include "bjw-s.common.render.controllers" (dict "Values" $localValues "Chart" $chart "Release" $release "Capabilities" .Capabilities) | nindent 0 -}}

charts/iperf3-monitor/templates/rbac.yaml

@@ -7,10 +7,9 @@ metadata:
     {{- include "iperf3-monitor.labels" . | nindent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
+kind: ClusterRole
 metadata:
   name: {{ include "iperf3-monitor.fullname" . }}-role
-  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "iperf3-monitor.labels" . | nindent 4 }}
 rules:
@@ -19,10 +18,9 @@ rules:
     verbs: ["get", "list", "watch"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
+kind: ClusterRoleBinding
 metadata:
   name: {{ include "iperf3-monitor.fullname" . }}-rb
-  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "iperf3-monitor.labels" . | nindent 4 }}
 subjects:
@@ -30,7 +28,7 @@ subjects:
     name: {{ include "iperf3-monitor.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 roleRef:
-  kind: Role # Changed from ClusterRole
+  kind: ClusterRole
   name: {{ include "iperf3-monitor.fullname" . }}-role
   apiGroup: rbac.authorization.k8s.io
 {{- end -}}

charts/iperf3-monitor/templates/service.yaml

@@ -11,7 +11,7 @@ spec:
     {{- include "iperf3-monitor.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: exporter
   ports:
-    - name: metrics # Assuming 'metrics' is the intended name, aligns with values structure
+    - name: metrics
-      port: {{ .Values.service.main.ports.metrics.port }}
+      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.main.ports.metrics.targetPort }}
+      targetPort: {{ .Values.service.targetPort }}
-      protocol: {{ .Values.service.main.ports.metrics.protocol | default "TCP" }}
+      protocol: TCP

charts/iperf3-monitor/values.yaml

@@ -86,15 +86,13 @@ controllers:
           #       key: mykey
 
         # -- Ports for the exporter container.
-        # Expected by Kubernetes and bjw-s common library as a list of objects.
         ports:
-          - name: metrics # Name of the port, referenced by Service's targetPort
+          metrics: # Name of the port, will be used in Service definition
             # -- Port number for the metrics endpoint on the container.
-            containerPort: 9876
+            port: 9876 # Default, should match service.targetPort
             # -- Protocol for the metrics port.
-            protocol: TCP
+            protocol: TCP # Common library defaults to TCP if not specified.
-            # -- Whether this port definition is enabled. Specific to bjw-s common library.
+            enabled: true # This port is enabled
-            enabled: true
 
         # -- CPU and memory resource requests and limits for the exporter container.
         resources:
@@ -200,8 +198,7 @@ networkPolicy:
 
 # Dependency Configuration (for Prometheus Operator)
 dependencies:
-  # -- Set to false by default. Set to true to install a Prometheus operator dependency (used if serviceMonitor.enabled=true).
+  # -- If true, install Prometheus operator dependency (used if serviceMonitor.enabled=true).
-  # -- If false (default), and serviceMonitor.enabled is true, you must have a compatible Prometheus Operator already running in your cluster.
+  install: true
-  install: false
+  # -- If true, use TrueCharts Prometheus Operator instead of kube-prometheus-stack.
-  # -- If true, use TrueCharts Prometheus Operator instead of kube-prometheus-stack (used if dependencies.install is true).
   useTrueChartsPrometheusOperator: false