public/helm-charts
1
0
Fork 0
mirror of https://github.com/bjw-s-labs/helm-charts.git synced 2025-07-03 16:37:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: Fix SA Secret annotation

Browse source
This commit is contained in:
Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs 2022-11-19 14:58:19 +01:00
parent eed8d60822
commit 0a5fb9d3d4
No known key found for this signature in database
GPG key ID: BC5E2BD907F9A8EC
13 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
charts/library/common/Chart.yaml
View file

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

14
charts/library/common/templates/render/_serviceaccount.tpl
View file

@ -5,19 +5,9 @@ Renders the serviceAccount object required by the chart.
{{- if .Values.serviceAccount.create -}}
{{- /* Create a service account secret */ -}}
{{- $_ := set .Values.secrets "sa-token" (dict "enabled" true "type" "kubernetes.io/service-account-token") -}}
{{- $serviceAccountName := include "bjw-s.common.lib.chart.names.serviceAccountName" . -}}
{{- $_ := set .Values.secrets "sa-token" (dict "enabled" true "annotations" (dict "kubernetes.io/service-account.name" $serviceAccountName) "type" "kubernetes.io/service-account-token") -}}
{{- include "bjw-s.common.class.serviceAccount" $ | nindent 0 -}}
{{- end -}}
{{- end -}}
# serviceAccount:
# # -- Specifies whether a service account should be created
# create: false
# # -- Annotations to add to the service account
# annotations: {}
# # -- The name of the service account to use.
# # If not set and create is true, a name is generated using the fullname template
# name: ""

4
charts/other/app-template/Chart.yaml
View file

@ -2,7 +2,7 @@
apiVersion: v2
description: A common powered chart template. This can be useful for small projects that don't have their own chart.
name: app-template
version: 1.1.1
version: 1.1.2
kubeVersion: ">=1.22.0-0"
maintainers:
- name: bjw-s
@ -10,7 +10,7 @@ maintainers:
dependencies:
- name: common
repository: https://bjw-s.github.io/helm-charts
version: 1.1.1
version: 1.1.2
annotations:
artifacthub.io/changes: |-
- kind: changed

6
charts/other/app-template/tests/configmap/metadata_test.yaml
View file

@ -23,7 +23,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -52,7 +52,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -89,5 +89,5 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

6
charts/other/app-template/tests/controller/metadata_daemonset_test.yaml
View file

@ -19,7 +19,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -45,7 +45,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -79,5 +79,5 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

6
charts/other/app-template/tests/controller/metadata_deployment_test.yaml
View file

@ -19,7 +19,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -45,7 +45,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -79,5 +79,5 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

6
charts/other/app-template/tests/controller/metadata_statefulset_test.yaml
View file

@ -19,7 +19,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -45,7 +45,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -79,5 +79,5 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

6
charts/other/app-template/tests/ingress/metadata_test.yaml
View file

@ -19,7 +19,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -45,7 +45,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -79,5 +79,5 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

8
charts/other/app-template/tests/pvc/metadata_test.yaml
View file

@ -19,7 +19,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: retain enabled should pass
set:
@ -42,7 +42,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -68,7 +68,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -102,5 +102,5 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

6
charts/other/app-template/tests/route/metadata_test.yaml
View file

@ -23,7 +23,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -52,7 +52,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -89,5 +89,5 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

6
charts/other/app-template/tests/secret/metadata_test.yaml
View file

@ -23,7 +23,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -52,7 +52,7 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -89,7 +89,7 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom secret type should pass

6
charts/other/app-template/tests/service/metadata_test.yaml
View file

@ -18,7 +18,7 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
app.kubernetes.io/service: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
- it: custom metadata should pass
set:
@ -45,7 +45,7 @@ tests:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: RELEASE-NAME
app.kubernetes.io/service: RELEASE-NAME
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test
- it: custom metadata with global metadata should pass
@ -80,5 +80,5 @@ tests:
app.kubernetes.io/name: RELEASE-NAME
app.kubernetes.io/service: RELEASE-NAME
global_label: test
helm.sh/chart: app-template-1.1.1
helm.sh/chart: app-template-1.1.2
test_label: test

10
charts/other/app-template/tests/serviceAccount/serviceaccount_test.yaml
View file

@ -59,6 +59,11 @@ tests:
equal:
path: spec.template.spec.serviceAccountName
value: *ServiceAccountName
- documentIndex: *SecretDocument
equal:
path: metadata.annotations
value:
kubernetes.io/service-account.name: RELEASE-NAME
- it: a serviceAccount and Secret are created with custom name
set:
@ -93,3 +98,8 @@ tests:
equal:
path: spec.template.spec.serviceAccountName
value: *ServiceAccountName
- documentIndex: *SecretDocument
equal:
path: metadata.annotations
value:
kubernetes.io/service-account.name: *ServiceAccountName