feat(common)!: Release v3.0.0-beta2 (#280)

charts/library/common/Chart.yaml

@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for Helm charts
 type: library
-version: 3.0.0-beta1
+version: 3.0.0-beta2
 kubeVersion: ">=1.22.0-0"
 keywords:
   - common

charts/library/common/schemas/containers.json

@@ -353,40 +353,7 @@
         "type": ["number", "string"]
       },
       "spec": {
-        "allOf": [
-          {
-            "if": {},
-            "then": {"$ref": "k8s-api.json#/core.v1.Probe"},
-            "else": {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "failureThreshold": {
-                  "type": "integer",
-                  "default": 3
-                },
-                "initialDelaySeconds": {
-                  "type": "integer",
-                  "default": 0
-                },
-                "periodSeconds": {
-                  "type": "integer",
-                  "default": 10
-                },
-                "timeoutSeconds": {
-                  "type": "integer",
-                  "default": 1
-                }
-              },
-              "required": [
-                "initialDelaySeconds",
-                "periodSeconds",
-                "timeoutSeconds",
-                "failureThreshold"
-              ]
-            }
-          }
-        ]
+        "$ref": "k8s-api.json#/core.v1.Probe"
       },
       "type": {
         "type": "string",

charts/library/common/templates/lib/configMap/_valuesToObject.tpl

@@ -12,9 +12,7 @@ Convert configMap values to an object
   {{- if $objectValues.nameOverride -}}
     {{- $objectName = printf "%s-%s" $objectName $objectValues.nameOverride -}}
   {{- else -}}
-    {{- if ne $identifier "main" -}}
-      {{- $objectName = printf "%s-%s" $objectName $identifier -}}
-    {{- end -}}
+    {{- $objectName = printf "%s-%s" $objectName $identifier -}}
   {{- end -}}
   {{- $_ := set $objectValues "name" $objectName -}}
   {{- $_ := set $objectValues "identifier" $identifier -}}

charts/library/common/templates/lib/controller/_enabled_controllers.tpl

@@ -0,0 +1,23 @@
+{{/*
+Return the enabled controllers.
+*/}}
+{{- define "bjw-s.common.lib.controller.enabledControllers" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $enabledControllers := dict -}}
+
+  {{- range $name, $controller := $rootContext.Values.controllers -}}
+    {{- if kindIs "map" $controller -}}
+      {{- /* Enable by default, but allow override */ -}}
+      {{- $controllerEnabled := true -}}
+      {{- if hasKey $controller "enabled" -}}
+        {{- $controllerEnabled = $controller.enabled -}}
+      {{- end -}}
+
+      {{- if $controllerEnabled -}}
+        {{- $_ := set $enabledControllers $name . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- $enabledControllers | toYaml -}}
+{{- end -}}

charts/library/common/templates/lib/controller/_valuesToObject.tpl

@@ -17,7 +17,8 @@ Convert controller values to an object
   {{- if $objectValues.nameOverride -}}
     {{- $objectName = printf "%s-%s" $objectName $objectValues.nameOverride -}}
   {{- else -}}
-    {{- if ne $identifier "main" -}}
+    {{- $enabledControllers := (include "bjw-s.common.lib.controller.enabledControllers" (dict "rootContext" $rootContext) | fromYaml ) }}
+    {{- if gt (len $enabledControllers) 1 -}}
       {{- $objectName = printf "%s-%s" $objectName $identifier -}}
     {{- end -}}
   {{- end -}}

charts/library/common/templates/lib/ingress/_enabled_ingresses.tpl

@@ -0,0 +1,23 @@
+{{/*
+Return the enabled Ingresses.
+*/}}
+{{- define "bjw-s.common.lib.ingress.enabledIngresses" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $enabledIngress := dict -}}
+
+  {{- range $name, $ingress := $rootContext.Values.ingress -}}
+    {{- if kindIs "map" $ingress -}}
+      {{- /* Enable by default, but allow override */ -}}
+      {{- $ingressEnabled := true -}}
+      {{- if hasKey $ingress "enabled" -}}
+        {{- $ingressEnabled = $ingress.enabled -}}
+      {{- end -}}
+
+      {{- if $ingressEnabled -}}
+        {{- $_ := set $enabledIngress $name . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- $enabledIngress | toYaml -}}
+{{- end -}}

charts/library/common/templates/lib/ingress/_valuesToObject.tpl

@@ -12,7 +12,8 @@ Convert ingress values to an object
   {{- if $objectValues.nameOverride -}}
     {{- $objectName = printf "%s-%s" $objectName $objectValues.nameOverride -}}
   {{- else -}}
-    {{- if ne $identifier "main" -}}
+    {{- $enabledIngresses := (include "bjw-s.common.lib.ingress.enabledIngresses" (dict "rootContext" $rootContext) | fromYaml ) }}
+    {{- if gt (len $enabledIngresses) 1 -}}
       {{- $objectName = printf "%s-%s" $objectName $identifier -}}
     {{- end -}}
   {{- end -}}

charts/library/common/templates/lib/networkpolicy/_enabled_networkpolicies.tpl

@@ -0,0 +1,23 @@
+{{/*
+Return the enabled NetworkPolicies.
+*/}}
+{{- define "bjw-s.common.lib.networkPolicy.enabledNetworkPolicies" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $enabledNetworkPolicies := dict -}}
+
+  {{- range $name, $networkPolicy := $rootContext.Values.networkPolicy -}}
+    {{- if kindIs "map" $networkPolicy -}}
+      {{- /* Enable by default, but allow override */ -}}
+      {{- $networkPolicyEnabled := true -}}
+      {{- if hasKey $networkPolicy "enabled" -}}
+        {{- $networkPolicyEnabled = $networkPolicy.enabled -}}
+      {{- end -}}
+
+      {{- if $networkPolicyEnabled -}}
+        {{- $_ := set $enabledNetworkPolicies $name . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- $enabledNetworkPolicies | toYaml -}}
+{{- end -}}

charts/library/common/templates/lib/networkpolicy/_valuesToObject.tpl

@@ -12,7 +12,8 @@ Convert networkPolicy values to an object
   {{- if $objectValues.nameOverride -}}
     {{- $objectName = printf "%s-%s" $objectName $objectValues.nameOverride -}}
   {{- else -}}
-    {{- if ne $identifier "main" -}}
+    {{- $enabledNetworkPolicies := (include "bjw-s.common.lib.networkPolicy.enabledNetworkPolicies" (dict "rootContext" $rootContext) | fromYaml ) }}
+    {{- if gt (len $enabledNetworkPolicies) 1 -}}
       {{- $objectName = printf "%s-%s" $objectName $identifier -}}
     {{- end -}}
   {{- end -}}

charts/library/common/templates/lib/secret/_valuesToObject.tpl

@@ -12,9 +12,7 @@ Convert Secret values to an object
   {{- if $objectValues.nameOverride -}}
     {{- $objectName = printf "%s-%s" $objectName $objectValues.nameOverride -}}
   {{- else -}}
-    {{- if ne $identifier "main" -}}
-      {{- $objectName = printf "%s-%s" $objectName $identifier -}}
-    {{- end -}}
+    {{- $objectName = printf "%s-%s" $objectName $identifier -}}
   {{- end -}}
   {{- $_ := set $objectValues "name" $objectName -}}
   {{- $_ := set $objectValues "identifier" $identifier -}}

charts/library/common/templates/lib/service/_valuesToObject.tpl

@@ -13,7 +13,7 @@ Convert Service values to an object
     {{- $objectName = printf "%s-%s" $objectName $objectValues.nameOverride -}}
   {{- else -}}
     {{- $enabledServices := (include "bjw-s.common.lib.service.enabledServices" (dict "rootContext" $rootContext) | fromYaml ) }}
-    {{- if and (not $objectValues.primary) (gt 1 (len $enabledServices)) -}}
+    {{- if and (not $objectValues.primary) (gt (len $enabledServices) 1) -}}
       {{- $objectName = printf "%s-%s" $objectName $identifier -}}
     {{- end -}}
   {{- end -}}

charts/library/common/templates/lib/serviceMonitor/_enabled_servicemonitors.tpl

@@ -0,0 +1,23 @@
+{{/*
+Return the enabled ServiceMonitors.
+*/}}
+{{- define "bjw-s.common.lib.serviceMonitor.enabledServiceMonitors" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $enabledServiceMonitors := dict -}}
+
+  {{- range $name, $serviceMonitor := $rootContext.Values.serviceMonitor -}}
+    {{- if kindIs "map" $serviceMonitor -}}
+      {{- /* Enable by default, but allow override */ -}}
+      {{- $serviceMonitorEnabled := true -}}
+      {{- if hasKey $serviceMonitor "enabled" -}}
+        {{- $serviceMonitorEnabled = $serviceMonitor.enabled -}}
+      {{- end -}}
+
+      {{- if $serviceMonitorEnabled -}}
+        {{- $_ := set $enabledServiceMonitors $name . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- $enabledServiceMonitors | toYaml -}}
+{{- end -}}

charts/library/common/templates/lib/serviceMonitor/_valuesToObject.tpl

@@ -12,7 +12,8 @@ Convert ServiceMonitor values to an object
   {{- if $objectValues.nameOverride -}}
     {{- $objectName = printf "%s-%s" $objectName $objectValues.nameOverride -}}
   {{- else -}}
-    {{- if ne $identifier "main" -}}
+    {{- $enabledServiceMonitors := (include "bjw-s.common.lib.serviceMonitor.enabledServiceMonitors" (dict "rootContext" $rootContext) | fromYaml ) }}
+    {{- if gt (len $enabledServiceMonitors) 1 -}}
       {{- $objectName = printf "%s-%s" $objectName $identifier -}}
     {{- end -}}
   {{- end -}}

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.0.0-beta1/charts/library/common/values.schema.json",
+  "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.0.0-beta2/charts/library/common/values.schema.json",
 
   "type": "object",
   "properties": {