bjw-s · bjw-s · Jul 29, 2024 · Jun 27, 2024 · Jun 27, 2024 · Jul 29, 2024
diff --git a/charts/library/common-test/ci/advanced-values.yaml b/charts/library/common-test/ci/advanced-values.yaml
@@ -95,3 +95,16 @@ persistence:
           - path: /data/config.yaml
             readOnly: false
             subPath: config.yaml
+
+rawResources:
+  unsupportedPDB:
+    enabled: true
+    nameOverride: pdb
+    apiVersion: policy/v1
+    kind: PodDisruptionBudget
+    spec:
+      spec:
+        minAvailable: 1
+        selector:
+          matchLabels:
+            app.kubernetes.io/instance: "{{ .Release.Name }}"
diff --git a/charts/library/common-test/tests/rawResource/metadata_test.yaml b/charts/library/common-test/tests/rawResource/metadata_test.yaml
@@ -0,0 +1,98 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json
+suite: rawResource metadata
+templates:
+  - common.yaml
+values:
+  - ../_values/controllers_main_default_container.yaml
+set:
+  rawResources:
+    config:
+      apiVersion: v1
+      kind: Endpoint
+      spec:
+        test: test
+tests:
+  - it: default metadata should pass
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: &rawResourceDocument 1
+        isKind:
+          of: Endpoint
+      - documentIndex: *rawResourceDocument
+        notExists:
+          path: metadata.annotations
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: metadata.labels
+          value:
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: common-test-1.0.0
+
+  - it: custom metadata should pass
+    set:
+      rawResources:
+        config:
+          annotations:
+            test_annotation: test
+          labels:
+            test_label: test
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: &rawResourceDocument 1
+        isKind:
+          of: Endpoint
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: metadata.annotations
+          value:
+            test_annotation: test
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: metadata.labels
+          value:
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: common-test-1.0.0
+            test_label: test
+
+  - it: custom metadata with global metadata should pass
+    set:
+      global:
+        labels:
+          global_label: test
+        annotations:
+          global_annotation: test
+      rawResources:
+        config:
+          annotations:
+            test_annotation: test
+          labels:
+            test_label: test
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: &rawResourceDocument 1
+        isKind:
+          of: Endpoint
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: metadata.annotations
+          value:
+            global_annotation: test
+            test_annotation: test
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: metadata.labels
+          value:
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: RELEASE-NAME
+            global_label: test
+            helm.sh/chart: common-test-1.0.0
+            test_label: test
diff --git a/charts/library/common-test/tests/rawResource/values_test.yaml b/charts/library/common-test/tests/rawResource/values_test.yaml
@@ -0,0 +1,78 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json
+suite: rawResource values
+templates:
+  - common.yaml
+values:
+  - ../_values/controllers_main_default_container.yaml
+set:
+  rawResources:
+    endpoint:
+      apiVersion: v1
+      kind: Endpoint
+      spec:
+        subsets:
+          - addresses:
+            - ip: 127.0.0.1
+            ports:
+            - name: "{{ .Release.Name }}"
+              port: 443
+              protocol: TCP
+tests:
+  - it: default should pass
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: &rawResourceDocument 1
+        isKind:
+          of: Endpoint
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: subsets[0].addresses[0].ip
+          value: 127.0.0.1
+
+  - it: nameOverride should pass
+    set:
+      rawResources.endpoint:
+        nameOverride: test
+    asserts:
+      - documentIndex: &rawResourceDocument 1
+        isKind:
+          of: Endpoint
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: metadata.name
+          value: RELEASE-NAME-test
+
+  - it: nameOverride with template should pass
+    set:
+      rawResources.endpoint:
+        nameOverride: "{{ .Release.Name }}"
+    asserts:
+      - documentIndex: &rawResourceDocument 1
+        isKind:
+          of: Endpoint
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: metadata.name
+          value: RELEASE-NAME
+
+  - it: spec with template should pass
+    set:
+      rawResources.endpoint:
+        spec:
+          subsets:
+            - addresses:
+              - ip: 127.0.0.1
+              ports:
+              - name: "{{ .Release.Name }}"
+                port: 443
+                protocol: TCP
+    asserts:
+      - documentIndex: &rawResourceDocument 1
+        isKind:
+          of: Endpoint
+      - documentIndex: *rawResourceDocument
+        equal:
+          path: subsets[0].ports[0].name
+          value: RELEASE-NAME
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for Helm charts
 type: library
-version: 3.2.1
+version: 3.3.0
 kubeVersion: ">=1.22.0-0"
 keywords:
   - common
@@ -16,16 +16,4 @@ annotations:
   artifacthub.io/changes: |-
     - kind: added
       description: |-
-        Support templating in annotation and label values for all objects (fixed in v3.2.1)
-    - kind: added
-      description: |-
-        Support activeDeadlineSeconds field on CronJobs and Jobs
-    - kind: added
-      description: |-
-        Support excluding secrets and configMaps from pod checksum annotation
-    - kind: fixed
-      description: |-
-        Fixed failing ServiceMonitor test
-    - kind: fixed
-      description: |-
-        Fixed networkPolicies not rendering correctly
+        Added support for specifying unsupported raw resources.
diff --git a/charts/library/common/README.md b/charts/library/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 3.2.1](https://img.shields.io/badge/Version-3.2.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 3.3.0](https://img.shields.io/badge/Version-3.3.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 Function library for Helm charts
 
@@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
   - name: common
-    version: 3.2.1
+    version: 3.3.0
     repository: https://bjw-s.github.io/helm-charts/
 ```
 

diff --git a/charts/library/common/schemas/rawResource.json b/charts/library/common/schemas/rawResource.json
@@ -0,0 +1,29 @@
+{
+  "instance": {
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {
+      "enabled": {
+        "type": "boolean",
+        "default": true
+      },
+      "apiVersion": {
+        "type": "string"
+      },
+      "kind": {
+        "type": "string"
+      },
+      "annotations": {
+        "$ref": "definitions.json#/annotations"
+      },
+      "labels": {
+        "$ref": "definitions.json#/labels"
+      },
+      "nameOverride": {
+        "type": "string"
+      },
+      "spec": {}
+    },
+    "required": ["apiVersion", "kind", "spec"]
+  }
+}
diff --git a/charts/library/common/templates/classes/_rawResource.tpl b/charts/library/common/templates/classes/_rawResource.tpl
@@ -0,0 +1,37 @@
+{{/*
+This template serves as a blueprint for all raw resource objects that are created
+within the common library.
+*/}}
+{{- define "bjw-s.common.class.rawResource" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $resourceObject := .object -}}
+
+  {{- $labels := merge
+    ($resourceObject.labels | default dict)
+    (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
+  -}}
+  {{- $annotations := merge
+    ($resourceObject.annotations | default dict)
+    (include "bjw-s.common.lib.metadata.globalAnnotations" $rootContext | fromYaml)
+  -}}
+---
+apiVersion: {{ $resourceObject.apiVersion }}
+kind: {{ $resourceObject.kind }}
+metadata:
+  name: {{ $resourceObject.name }}
+  {{- with $labels }}
+  labels:
+    {{- range $key, $value := . }}
+    {{- printf "%s: %s" $key (tpl $value $rootContext | toYaml ) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+  {{- with $annotations }}
+  annotations:
+    {{- range $key, $value := . }}
+    {{- printf "%s: %s" $key (tpl $value $rootContext | toYaml ) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+{{- with $resourceObject.spec }}
+  {{- tpl (toYaml .) $rootContext | nindent 0 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/library/common/templates/lib/rawResource/_validate.tpl b/charts/library/common/templates/lib/rawResource/_validate.tpl
@@ -0,0 +1,7 @@
+{{/*
+Validate raw resource values
+*/}}
+{{- define "bjw-s.common.lib.rawResource.validate" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $resourceObject := .object -}}
+{{- end -}}
diff --git a/charts/library/common/templates/lib/rawResource/_valuesToObject.tpl b/charts/library/common/templates/lib/rawResource/_valuesToObject.tpl
@@ -0,0 +1,27 @@
+{{/*
+Convert raw resource values to an object
+*/}}
+{{- define "bjw-s.common.lib.rawResource.valuesToObject" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $identifier := .id -}}
+  {{- $objectValues := .values -}}
+
+  {{- /* Determine and inject the raw resource name */ -}}
+  {{- $objectName := (include "bjw-s.common.lib.chart.names.fullname" $rootContext) -}}
+
+  {{- if $objectValues.nameOverride -}}
+    {{- $override := tpl $objectValues.nameOverride $rootContext -}}
+    {{- if not (eq $objectName $override) -}}
+      {{- $objectName = printf "%s-%s" $objectName $override -}}
+    {{- end -}}
+  {{- else -}}
+    {{- if not (eq $objectName $identifier) -}}
+      {{- $objectName = printf "%s-%s" $objectName $identifier -}}
+    {{- end -}}
+  {{- end -}}
+  {{- $_ := set $objectValues "name" $objectName -}}
+  {{- $_ := set $objectValues "identifier" $identifier -}}
+
+  {{- /* Return the raw resource object */ -}}
+  {{- $objectValues | toYaml -}}
+{{- end -}}
diff --git a/charts/library/common/templates/loader/_generate.tpl b/charts/library/common/templates/loader/_generate.tpl
@@ -16,4 +16,5 @@ Secondary entrypoint and primary loader for the common chart
   {{- include "bjw-s.common.render.configMaps" . | nindent 0 -}}
   {{- include "bjw-s.common.render.secrets" . | nindent 0 -}}
   {{- include "bjw-s.common.render.networkpolicies" . | nindent 0 -}}
+  {{- include "bjw-s.common.render.rawResources" . | nindent 0 -}}
 {{- end -}}
diff --git a/charts/library/common/templates/render/_rawResources.tpl b/charts/library/common/templates/render/_rawResources.tpl
@@ -0,0 +1,26 @@
+{{/*
+Renders other arbirtrary objects required by the chart.
+*/}}
+{{- define "bjw-s.common.render.rawResources" -}}
+  {{- /* Generate pvc as required */ -}}
+  {{- range $key, $resource := .Values.rawResources -}}
+    {{- /* Enable by default, but allow override */ -}}
+    {{- $resourceEnabled := true -}}
+    {{- if hasKey $resource "enabled" -}}
+      {{- $resourceEnabled = $resource.enabled -}}
+    {{- end -}}
+
+    {{- if $resourceEnabled -}}
+      {{- $resourceValues := (mustDeepCopy $resource) -}}
+
+      {{- /* Create object from the raw resource values */ -}}
+      {{- $resourceObject := (include "bjw-s.common.lib.rawResource.valuesToObject" (dict "rootContext" $ "id" $key "values" $resourceValues)) | fromYaml -}}
+
+      {{- /* Perform validations on the resource before rendering */ -}}
+      {{- include "bjw-s.common.lib.rawResource.validate" (dict "rootContext" $ "object" $resourceValues) -}}
+
+      {{- /* Include the raw resource class */ -}}
+      {{- include "bjw-s.common.class.rawResource" (dict "rootContext" $ "object" $resourceValues) | nindent 0 -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/library/common/values.schema.json b/charts/library/common/values.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.2.1/charts/library/common/values.schema.json",
+  "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.3.0/charts/library/common/values.schema.json",
 
   "type": "object",
   "properties": {
@@ -71,6 +71,11 @@
       "additionalProperties": {
         "$ref": "schemas/persistence.json#/item"
       }
+    },
+    "rawResources": {
+      "additionalProperties": {
+        "$ref": "schemas/rawResource.json#/instance"
+      }
     }
   }
 }