From 0b8e344aaa55c53489c99a53a557cd0201203c13 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Wed, 6 Jul 2022 08:23:12 +0000 Subject: [PATCH 1/3] Generated commit to update templated files based on rev 2b73b32 in stackabletech/operator-templating repo. Triggered by: Manual run triggered by: teozkr with message [Allow using operator charts as dependencies, note that this will require the equivalent change to be made for downstream charts] --- deploy/helm/secret-operator/templates/configmap.yaml | 2 +- deploy/helm/secret-operator/templates/serviceaccount.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/helm/secret-operator/templates/configmap.yaml b/deploy/helm/secret-operator/templates/configmap.yaml index 7fa8613d..e75acc25 100644 --- a/deploy/helm/secret-operator/templates/configmap.yaml +++ b/deploy/helm/secret-operator/templates/configmap.yaml @@ -4,6 +4,6 @@ data: {{ (.Files.Glob "configs/*").AsConfig | indent 2 }} kind: ConfigMap metadata: - name: {{ .Release.Name }}-configmap + name: {{ include "operator.fullname" . }}-configmap labels: {{- include "operator.labels" . | nindent 4 }} diff --git a/deploy/helm/secret-operator/templates/serviceaccount.yaml b/deploy/helm/secret-operator/templates/serviceaccount.yaml index ff2b7f8e..8ba0d58c 100644 --- a/deploy/helm/secret-operator/templates/serviceaccount.yaml +++ b/deploy/helm/secret-operator/templates/serviceaccount.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .Release.Name }}-serviceaccount + name: {{ include "operator.fullname" . }}-serviceaccount labels: {{- include "operator.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} @@ -15,15 +15,15 @@ apiVersion: rbac.authorization.k8s.io/v1 # This cluster role binding allows anyone in the "manager" group to read secrets in any namespace. kind: ClusterRoleBinding metadata: - name: {{ .Release.Name }}-clusterrolebinding + name: {{ include "operator.fullname" . }}-clusterrolebinding labels: {{- include "operator.labels" . | nindent 4 }} subjects: - kind: ServiceAccount - name: {{ .Release.Name }}-serviceaccount + name: {{ include "operator.fullname" . }}-serviceaccount namespace: {{ .Release.Namespace }} roleRef: kind: ClusterRole - name: {{ .Release.Name }}-clusterrole + name: {{ include "operator.fullname" . }}-clusterrole apiGroup: rbac.authorization.k8s.io {{- end }} From 33206ff733ce899af46aa1c3b99f4a6da0c440eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Wed, 6 Jul 2022 14:32:54 +0200 Subject: [PATCH 2/3] Fix Secret-op-specific templates --- deploy/helm/secret-operator/templates/daemonset.yaml | 4 ++-- deploy/helm/secret-operator/templates/roles.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/helm/secret-operator/templates/daemonset.yaml b/deploy/helm/secret-operator/templates/daemonset.yaml index 387036d2..da4d9b41 100644 --- a/deploy/helm/secret-operator/templates/daemonset.yaml +++ b/deploy/helm/secret-operator/templates/daemonset.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - name: {{ .Release.Name }}-daemonset + name: {{ include "operator.fullname" . }}-daemonset labels: {{- include "operator.labels" . | nindent 4 }} spec: @@ -22,7 +22,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ .Release.Name }}-serviceaccount + serviceAccountName: {{ include "operator.fullname" . }}-serviceaccount securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: diff --git a/deploy/helm/secret-operator/templates/roles.yaml b/deploy/helm/secret-operator/templates/roles.yaml index 2371fe10..a68a7006 100644 --- a/deploy/helm/secret-operator/templates/roles.yaml +++ b/deploy/helm/secret-operator/templates/roles.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ .Release.Name }}-clusterrole + name: {{ include "operator.fullname" . }}-clusterrole rules: - apiGroups: - "" @@ -62,4 +62,4 @@ rules: resources: - securitycontextconstraints verbs: - - use \ No newline at end of file + - use From 8c335764422ad843ca7af056c6e93336436a0c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Wed, 6 Jul 2022 14:33:58 +0200 Subject: [PATCH 3/3] Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 102f268d..f85f81ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Changed + +- Include chart name when installing with a custom release name ([#153]). + +[#153]: https://github.com/stackabletech/secret-operator/pull/153 + ## [0.5.0] - 2022-06-30 ### Added