Skip to content

Commit

Permalink
fix: reduce Helm resource templates name
Browse files Browse the repository at this point in the history
  • Loading branch information
ssttehrani committed Oct 1, 2023
1 parent 8aac957 commit 580906d
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager-config
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr-config
labels:
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: svc-lb-to-cilium-netpolicy
app.kubernetes.io/part-of: svc-lb-to-cilium-netpolicy
control-plane: controller-manager
{{- include "svc-lb-to-cilium-netpolicy-operator.labels" . | nindent 4 }}
data:
conf: {{ .Values.controllerManagerConfig.conf | toYaml | indent 1 }}
conf: {{ .Values.controllerManagerConfig.conf | toYaml | indent 1 }}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr
labels:
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: svc-lb-to-cilium-netpolicy
Expand Down Expand Up @@ -84,12 +84,12 @@ spec:
name: config
securityContext:
runAsNonRoot: true
serviceAccountName: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager
serviceAccountName: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr
terminationGracePeriodSeconds: 10
volumes:
- configMap:
items:
- key: conf
path: config.yaml
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager-config
name: config
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr-config
name: config
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ roleRef:
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-leader-election-role'
subjects:
- kind: ServiceAccount
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager'
namespace: '{{ .Release.Namespace }}'
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr'
namespace: '{{ .Release.Namespace }}'
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-manager-role
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-mgr-role
labels:
{{- include "svc-lb-to-cilium-netpolicy-operator.labels" . | nindent 4 }}
rules:
Expand Down Expand Up @@ -51,7 +51,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-manager-rolebinding
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-mgr-rolebinding
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: svc-lb-to-cilium-netpolicy
Expand All @@ -60,8 +60,8 @@ metadata:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-manager-role'
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-mgr-role'
subjects:
- kind: ServiceAccount
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager'
namespace: '{{ .Release.Namespace }}'
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr'
namespace: '{{ .Release.Namespace }}'
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager-metrics-service
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr-metrics-service
labels:
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: svc-lb-to-cilium-netpolicy
Expand All @@ -14,4 +14,4 @@ spec:
control-plane: controller-manager
{{- include "svc-lb-to-cilium-netpolicy-operator.selectorLabels" . | nindent 4 }}
ports:
{{- .Values.metricsService.ports | toYaml | nindent 2 -}}
{{- .Values.metricsService.ports | toYaml | nindent 2 -}}
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ roleRef:
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-proxy-role'
subjects:
- kind: ServiceAccount
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager'
namespace: '{{ .Release.Namespace }}'
name: '{{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr'
namespace: '{{ .Release.Namespace }}'
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-controller-manager
name: {{ include "svc-lb-to-cilium-netpolicy-operator.fullname" . }}-ctrl-mgr
labels:
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: svc-lb-to-cilium-netpolicy
app.kubernetes.io/part-of: svc-lb-to-cilium-netpolicy
{{- include "svc-lb-to-cilium-netpolicy-operator.labels" . | nindent 4 }}
annotations:
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}

0 comments on commit 580906d

Please sign in to comment.