From 51035c0eaf5f317d4eb0325e934765bdfa6e79ac Mon Sep 17 00:00:00 2001 From: Bernd Schorgers Date: Fri, 8 Mar 2024 10:33:53 +0100 Subject: [PATCH] feat(common)!: Release v3.0.0-beta3 --- .../tests/controller/metadata_cronjob_test.yaml | 8 ++++---- .../tests/controller/metadata_daemonset_test.yaml | 6 +++--- .../tests/controller/metadata_deployment_test.yaml | 6 +++--- .../tests/controller/metadata_job_test.yaml | 8 ++++---- .../tests/controller/metadata_statefulset_test.yaml | 6 +++--- .../common-test/tests/controller/type_test.yaml | 10 +++++----- .../common-test/tests/networkpolicy/values_test.yaml | 2 +- charts/library/common/Chart.yaml | 2 +- charts/library/common/templates/classes/_cronjob.tpl | 2 +- charts/library/common/templates/classes/_daemonset.tpl | 4 ++-- .../library/common/templates/classes/_deployment.tpl | 4 ++-- charts/library/common/templates/classes/_job.tpl | 2 +- .../common/templates/classes/_networkpolicy.tpl | 2 +- charts/library/common/templates/classes/_service.tpl | 2 +- .../library/common/templates/classes/_statefulset.tpl | 4 ++-- .../common/templates/lib/pod/metadata/_labels.tpl | 2 +- charts/library/common/values.schema.json | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml b/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml index 4f6d0c4a..c49a3d9f 100644 --- a/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml +++ b/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml @@ -22,7 +22,7 @@ tests: equal: path: metadata.labels value: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: main app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/name: RELEASE-NAME test_label: test diff --git a/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml b/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml index 3df79c3f..6adb0294 100644 --- a/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml +++ b/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml @@ -18,7 +18,7 @@ tests: equal: path: metadata.labels value: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: main app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: RELEASE-NAME diff --git a/charts/library/common-test/tests/controller/metadata_deployment_test.yaml b/charts/library/common-test/tests/controller/metadata_deployment_test.yaml index 59800904..78f04d2a 100644 --- a/charts/library/common-test/tests/controller/metadata_deployment_test.yaml +++ b/charts/library/common-test/tests/controller/metadata_deployment_test.yaml @@ -18,7 +18,7 @@ tests: equal: path: metadata.labels value: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: main app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: RELEASE-NAME diff --git a/charts/library/common-test/tests/controller/metadata_job_test.yaml b/charts/library/common-test/tests/controller/metadata_job_test.yaml index 688793c7..b7521ad6 100644 --- a/charts/library/common-test/tests/controller/metadata_job_test.yaml +++ b/charts/library/common-test/tests/controller/metadata_job_test.yaml @@ -18,7 +18,7 @@ tests: equal: path: metadata.labels value: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: main app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/name: RELEASE-NAME test_label: test diff --git a/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml b/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml index 00bd75c2..1835a671 100644 --- a/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml +++ b/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml @@ -18,7 +18,7 @@ tests: equal: path: metadata.labels value: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: 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: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: main app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: RELEASE-NAME diff --git a/charts/library/common-test/tests/controller/type_test.yaml b/charts/library/common-test/tests/controller/type_test.yaml index 6705e7c5..33e167db 100644 --- a/charts/library/common-test/tests/controller/type_test.yaml +++ b/charts/library/common-test/tests/controller/type_test.yaml @@ -15,7 +15,7 @@ tests: value: RELEASE-NAME - documentIndex: *deploymentDoc equal: - path: metadata.labels['app.kubernetes.io/component'] + path: metadata.labels['common.bjw-s.dev/controller'] value: main - it: additional controllers should pass @@ -39,7 +39,7 @@ tests: value: RELEASE-NAME-main - documentIndex: *firstDeploymentDoc equal: - path: metadata.labels['app.kubernetes.io/component'] + path: metadata.labels['common.bjw-s.dev/controller'] value: main - documentIndex: &secondDeploymentDoc 1 isKind: @@ -50,7 +50,7 @@ tests: value: RELEASE-NAME-second - documentIndex: *secondDeploymentDoc equal: - path: metadata.labels['app.kubernetes.io/component'] + path: metadata.labels['common.bjw-s.dev/controller'] value: second - it: additional controllers with nameOverride should pass @@ -75,7 +75,7 @@ tests: value: RELEASE-NAME-main - documentIndex: *firstDeploymentDoc equal: - path: metadata.labels['app.kubernetes.io/component'] + path: metadata.labels['common.bjw-s.dev/controller'] value: main - documentIndex: &secondDeploymentDoc 1 isKind: @@ -86,7 +86,7 @@ tests: value: RELEASE-NAME-testOverride - documentIndex: *secondDeploymentDoc equal: - path: metadata.labels['app.kubernetes.io/component'] + path: metadata.labels['common.bjw-s.dev/controller'] value: second - it: daemonset should pass diff --git a/charts/library/common-test/tests/networkpolicy/values_test.yaml b/charts/library/common-test/tests/networkpolicy/values_test.yaml index 012b3066..8dbb17bf 100644 --- a/charts/library/common-test/tests/networkpolicy/values_test.yaml +++ b/charts/library/common-test/tests/networkpolicy/values_test.yaml @@ -50,7 +50,7 @@ tests: path: spec.podSelector value: matchLabels: - app.kubernetes.io/component: main + common.bjw-s.dev/controller: main app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/name: RELEASE-NAME diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index f0a578f7..ded59e57 100644 --- 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.0.0-beta2 +version: 3.0.0-beta3 kubeVersion: ">=1.22.0-0" keywords: - common diff --git a/charts/library/common/templates/classes/_cronjob.tpl b/charts/library/common/templates/classes/_cronjob.tpl index 91d0d7aa..04a26be6 100644 --- a/charts/library/common/templates/classes/_cronjob.tpl +++ b/charts/library/common/templates/classes/_cronjob.tpl @@ -12,7 +12,7 @@ using the common library. {{- end -}} {{- $labels := merge - (dict "app.kubernetes.io/component" $cronjobObject.identifier) + (dict "common.bjw-s.dev/controller" $cronjobObject.identifier) ($cronjobObject.labels | default dict) (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml) -}} diff --git a/charts/library/common/templates/classes/_daemonset.tpl b/charts/library/common/templates/classes/_daemonset.tpl index 0ce6edd2..990f7be8 100644 --- a/charts/library/common/templates/classes/_daemonset.tpl +++ b/charts/library/common/templates/classes/_daemonset.tpl @@ -7,7 +7,7 @@ within the common library. {{- $daemonsetObject := .object -}} {{- $labels := merge - (dict "app.kubernetes.io/component" $daemonsetObject.identifier) + (dict "common.bjw-s.dev/controller" $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: - app.kubernetes.io/component: {{ $daemonsetObject.identifier }} + common.bjw-s.dev/controller: {{ $daemonsetObject.identifier }} {{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }} template: metadata: diff --git a/charts/library/common/templates/classes/_deployment.tpl b/charts/library/common/templates/classes/_deployment.tpl index b39f9dff..d10f1e51 100644 --- a/charts/library/common/templates/classes/_deployment.tpl +++ b/charts/library/common/templates/classes/_deployment.tpl @@ -7,7 +7,7 @@ using the common library. {{- $deploymentObject := .object -}} {{- $labels := merge - (dict "app.kubernetes.io/component" $deploymentObject.identifier) + (dict "common.bjw-s.dev/controller" $deploymentObject.identifier) ($deploymentObject.labels | default dict) (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml) -}} @@ -50,7 +50,7 @@ spec: {{- end }} selector: matchLabels: - app.kubernetes.io/component: {{ $deploymentObject.identifier }} + common.bjw-s.dev/controller: {{ $deploymentObject.identifier }} {{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }} template: metadata: diff --git a/charts/library/common/templates/classes/_job.tpl b/charts/library/common/templates/classes/_job.tpl index 0ba51539..eca0b888 100644 --- a/charts/library/common/templates/classes/_job.tpl +++ b/charts/library/common/templates/classes/_job.tpl @@ -7,7 +7,7 @@ within the common library. {{- $jobObject := .object -}} {{- $labels := merge - (dict "app.kubernetes.io/component" $jobObject.identifier) + (dict "common.bjw-s.dev/controller" $jobObject.identifier) ($jobObject.labels | default dict) (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml) -}} diff --git a/charts/library/common/templates/classes/_networkpolicy.tpl b/charts/library/common/templates/classes/_networkpolicy.tpl index 0854d145..536b78d3 100644 --- a/charts/library/common/templates/classes/_networkpolicy.tpl +++ b/charts/library/common/templates/classes/_networkpolicy.tpl @@ -20,7 +20,7 @@ within the common library. {{- else -}} {{- $podSelector = dict "matchLabels" (merge ($networkPolicyObject.extraSelectorLabels | default dict) - (dict "app.kubernetes.io/component" $networkPolicyObject.controller) + (dict "common.bjw-s.dev/controller" $networkPolicyObject.controller) (include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | fromYaml) ) -}} {{- end -}} diff --git a/charts/library/common/templates/classes/_service.tpl b/charts/library/common/templates/classes/_service.tpl index 35aa24f5..7a6dd93e 100644 --- a/charts/library/common/templates/classes/_service.tpl +++ b/charts/library/common/templates/classes/_service.tpl @@ -96,7 +96,7 @@ spec: {{- end -}} {{- with (merge ($serviceObject.extraSelectorLabels | default dict) - (dict "app.kubernetes.io/component" $serviceObject.controller) + (dict "common.bjw-s.dev/controller" $serviceObject.controller) (include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | fromYaml) ) }} selector: {{- toYaml . | nindent 4 }} diff --git a/charts/library/common/templates/classes/_statefulset.tpl b/charts/library/common/templates/classes/_statefulset.tpl index c244aca5..2c3c79ea 100644 --- a/charts/library/common/templates/classes/_statefulset.tpl +++ b/charts/library/common/templates/classes/_statefulset.tpl @@ -7,7 +7,7 @@ within the common library. {{- $statefulsetObject := .object -}} {{- $labels := merge - (dict "app.kubernetes.io/component" $statefulsetObject.identifier) + (dict "common.bjw-s.dev/controller" $statefulsetObject.identifier) ($statefulsetObject.labels | default dict) (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml) -}} @@ -38,7 +38,7 @@ spec: {{- end }} selector: matchLabels: - app.kubernetes.io/component: {{ $statefulsetObject.identifier }} + common.bjw-s.dev/controller: {{ $statefulsetObject.identifier }} {{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }} serviceName: {{ include "bjw-s.common.lib.chart.names.fullname" $rootContext }} template: diff --git a/charts/library/common/templates/lib/pod/metadata/_labels.tpl b/charts/library/common/templates/lib/pod/metadata/_labels.tpl index 837ffa29..83121383 100644 --- a/charts/library/common/templates/lib/pod/metadata/_labels.tpl +++ b/charts/library/common/templates/lib/pod/metadata/_labels.tpl @@ -7,7 +7,7 @@ Returns the value for labels {{- /* Default labels */ -}} {{- $labels := merge - (dict "app.kubernetes.io/component" $controllerObject.identifier) + (dict "common.bjw-s.dev/controller" $controllerObject.identifier) -}} {{- /* Fetch the Pod selectorLabels */ -}} diff --git a/charts/library/common/values.schema.json b/charts/library/common/values.schema.json index 3c0f5335..9a39e3f9 100644 --- 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.0.0-beta2/charts/library/common/values.schema.json", + "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.0.0-beta3/charts/library/common/values.schema.json", "type": "object", "properties": {