mirror of
https://github.com/bjw-s-labs/helm-charts.git
synced 2025-07-03 16:37:04 +02:00
feat(common): Release common-3.0.1
This commit is contained in:
parent
9fa045e337
commit
14e70ce553
18 changed files with 38 additions and 38 deletions
|
@ -22,7 +22,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -50,7 +50,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -85,7 +85,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -116,7 +116,7 @@ tests:
|
|||
equal:
|
||||
path: spec.jobTemplate.spec.template.metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
test_label: test
|
||||
|
|
|
@ -18,7 +18,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -46,7 +46,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -81,7 +81,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
|
|
@ -18,7 +18,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -46,7 +46,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -81,7 +81,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
|
|
@ -18,7 +18,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -46,7 +46,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -81,7 +81,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -112,7 +112,7 @@ tests:
|
|||
equal:
|
||||
path: spec.template.metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
test_label: test
|
||||
|
|
|
@ -18,7 +18,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -46,7 +46,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
@ -81,7 +81,7 @@ tests:
|
|||
equal:
|
||||
path: metadata.labels
|
||||
value:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/managed-by: Helm
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
|
|
@ -15,7 +15,7 @@ tests:
|
|||
value: RELEASE-NAME
|
||||
- documentIndex: *deploymentDoc
|
||||
equal:
|
||||
path: metadata.labels['common.bjw-s.dev/controller']
|
||||
path: metadata.labels['app.kubernetes.io/component']
|
||||
value: main
|
||||
|
||||
- it: additional controllers should pass
|
||||
|
@ -39,7 +39,7 @@ tests:
|
|||
value: RELEASE-NAME-main
|
||||
- documentIndex: *firstDeploymentDoc
|
||||
equal:
|
||||
path: metadata.labels['common.bjw-s.dev/controller']
|
||||
path: metadata.labels['app.kubernetes.io/component']
|
||||
value: main
|
||||
- documentIndex: &secondDeploymentDoc 1
|
||||
isKind:
|
||||
|
@ -50,7 +50,7 @@ tests:
|
|||
value: RELEASE-NAME-second
|
||||
- documentIndex: *secondDeploymentDoc
|
||||
equal:
|
||||
path: metadata.labels['common.bjw-s.dev/controller']
|
||||
path: metadata.labels['app.kubernetes.io/component']
|
||||
value: second
|
||||
|
||||
- it: additional controllers with nameOverride should pass
|
||||
|
@ -75,7 +75,7 @@ tests:
|
|||
value: RELEASE-NAME-main
|
||||
- documentIndex: *firstDeploymentDoc
|
||||
equal:
|
||||
path: metadata.labels['common.bjw-s.dev/controller']
|
||||
path: metadata.labels['app.kubernetes.io/component']
|
||||
value: main
|
||||
- documentIndex: &secondDeploymentDoc 1
|
||||
isKind:
|
||||
|
@ -86,7 +86,7 @@ tests:
|
|||
value: RELEASE-NAME-testOverride
|
||||
- documentIndex: *secondDeploymentDoc
|
||||
equal:
|
||||
path: metadata.labels['common.bjw-s.dev/controller']
|
||||
path: metadata.labels['app.kubernetes.io/component']
|
||||
value: second
|
||||
|
||||
- it: daemonset should pass
|
||||
|
|
|
@ -50,7 +50,7 @@ tests:
|
|||
path: spec.podSelector
|
||||
value:
|
||||
matchLabels:
|
||||
common.bjw-s.dev/controller: main
|
||||
app.kubernetes.io/component: main
|
||||
app.kubernetes.io/instance: RELEASE-NAME
|
||||
app.kubernetes.io/name: RELEASE-NAME
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: v2
|
|||
name: common
|
||||
description: Function library for Helm charts
|
||||
type: library
|
||||
version: 3.0.0
|
||||
version: 3.0.1
|
||||
kubeVersion: ">=1.22.0-0"
|
||||
keywords:
|
||||
- common
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# common
|
||||
|
||||
 
|
||||
 
|
||||
|
||||
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.0.0
|
||||
version: 3.0.1
|
||||
repository: https://bjw-s.github.io/helm-charts/
|
||||
```
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ using the common library.
|
|||
{{- end -}}
|
||||
|
||||
{{- $labels := merge
|
||||
(dict "common.bjw-s.dev/controller" $cronjobObject.identifier)
|
||||
(dict "app.kubernetes.io/component" $cronjobObject.identifier)
|
||||
($cronjobObject.labels | default dict)
|
||||
(include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
|
||||
-}}
|
||||
|
|
|
@ -7,7 +7,7 @@ within the common library.
|
|||
{{- $daemonsetObject := .object -}}
|
||||
|
||||
{{- $labels := merge
|
||||
(dict "common.bjw-s.dev/controller" $daemonsetObject.identifier)
|
||||
(dict "app.kubernetes.io/component" $daemonsetObject.identifier)
|
||||
($daemonsetObject.labels | default dict)
|
||||
(include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
|
||||
-}}
|
||||
|
@ -30,7 +30,7 @@ spec:
|
|||
revisionHistoryLimit: {{ default 3 $daemonsetObject.revisionHistoryLimit }}
|
||||
selector:
|
||||
matchLabels:
|
||||
common.bjw-s.dev/controller: {{ $daemonsetObject.identifier }}
|
||||
app.kubernetes.io/component: {{ $daemonsetObject.identifier }}
|
||||
{{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
|
|
|
@ -7,7 +7,7 @@ using the common library.
|
|||
{{- $deploymentObject := .object -}}
|
||||
|
||||
{{- $labels := merge
|
||||
(dict "common.bjw-s.dev/controller" $deploymentObject.identifier)
|
||||
(dict "app.kubernetes.io/component" $deploymentObject.identifier)
|
||||
($deploymentObject.labels | default dict)
|
||||
(include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
|
||||
-}}
|
||||
|
@ -50,7 +50,7 @@ spec:
|
|||
{{- end }}
|
||||
selector:
|
||||
matchLabels:
|
||||
common.bjw-s.dev/controller: {{ $deploymentObject.identifier }}
|
||||
app.kubernetes.io/component: {{ $deploymentObject.identifier }}
|
||||
{{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
|
|
|
@ -7,7 +7,7 @@ within the common library.
|
|||
{{- $jobObject := .object -}}
|
||||
|
||||
{{- $labels := merge
|
||||
(dict "common.bjw-s.dev/controller" $jobObject.identifier)
|
||||
(dict "app.kubernetes.io/component" $jobObject.identifier)
|
||||
($jobObject.labels | default dict)
|
||||
(include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
|
||||
-}}
|
||||
|
|
|
@ -20,7 +20,7 @@ within the common library.
|
|||
{{- else -}}
|
||||
{{- $podSelector = dict "matchLabels" (merge
|
||||
($networkPolicyObject.extraSelectorLabels | default dict)
|
||||
(dict "common.bjw-s.dev/controller" $networkPolicyObject.controller)
|
||||
(dict "app.kubernetes.io/component" $networkPolicyObject.controller)
|
||||
(include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | fromYaml)
|
||||
) -}}
|
||||
{{- end -}}
|
||||
|
|
|
@ -96,7 +96,7 @@ spec:
|
|||
{{- end -}}
|
||||
{{- with (merge
|
||||
($serviceObject.extraSelectorLabels | default dict)
|
||||
(dict "common.bjw-s.dev/controller" $serviceObject.controller)
|
||||
(dict "app.kubernetes.io/component" $serviceObject.controller)
|
||||
(include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | fromYaml)
|
||||
) }}
|
||||
selector: {{- toYaml . | nindent 4 }}
|
||||
|
|
|
@ -7,7 +7,7 @@ within the common library.
|
|||
{{- $statefulsetObject := .object -}}
|
||||
|
||||
{{- $labels := merge
|
||||
(dict "common.bjw-s.dev/controller" $statefulsetObject.identifier)
|
||||
(dict "app.kubernetes.io/component" $statefulsetObject.identifier)
|
||||
($statefulsetObject.labels | default dict)
|
||||
(include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
|
||||
-}}
|
||||
|
@ -38,7 +38,7 @@ spec:
|
|||
{{- end }}
|
||||
selector:
|
||||
matchLabels:
|
||||
common.bjw-s.dev/controller: {{ $statefulsetObject.identifier }}
|
||||
app.kubernetes.io/component: {{ $statefulsetObject.identifier }}
|
||||
{{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }}
|
||||
serviceName: {{ include "bjw-s.common.lib.chart.names.fullname" $rootContext }}
|
||||
template:
|
||||
|
|
|
@ -7,7 +7,7 @@ Returns the value for labels
|
|||
|
||||
{{- /* Default labels */ -}}
|
||||
{{- $labels := merge
|
||||
(dict "common.bjw-s.dev/controller" $controllerObject.identifier)
|
||||
(dict "app.kubernetes.io/component" $controllerObject.identifier)
|
||||
-}}
|
||||
|
||||
{{- /* Fetch the Pod selectorLabels */ -}}
|
||||
|
|
|
@ -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/charts/library/common/values.schema.json",
|
||||
"$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.0.1/charts/library/common/values.schema.json",
|
||||
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue