Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Update templated files to rev 2b73b32 #263

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/helm/druid-operator/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions deploy/helm/druid-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}-deployment
name: {{ include "operator.fullname" . }}-deployment
labels:
{{- include "operator.labels" . | nindent 4 }}
spec:
Expand All @@ -26,7 +26,7 @@ spec:
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ .Release.Name }}-serviceaccount
serviceAccountName: {{ include "operator.fullname" . }}-serviceaccount
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
Expand All @@ -43,7 +43,7 @@ spec:
volumes:
- name: config-spec
configMap:
name: {{ .Release.Name }}-configmap
name: {{ include "operator.fullname" . }}-configmap
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
8 changes: 4 additions & 4 deletions deploy/helm/druid-operator/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}