fix: Single chart

charts/ledger-agent/templates/deployment.yaml → charts/ledger/templates/agent_deployment.yaml

@@ -1,28 +1,33 @@
+{{- if .Values.ledgerAgent.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "ledger-agent.fullname" . }}
+  name: {{ include "ledger.fullname" . }}-agent
   labels:
-    {{- include "ledger-agent.labels" . | nindent 4 }}
+    {{- include "ledger.labels" . | nindent 4 }}
+    component: agent
 spec:
   replicas: 1
   selector:
     matchLabels:
-      {{- include "ledger-agent.selectorLabels" . | nindent 6 }}
+      {{- include "ledger.selectorLabels" . | nindent 6 }}
+      component: agent
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
+        checksum/secret: {{ include (print $.Template.BasePath "/agent_secret.yaml") . | sha256sum }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "ledger-agent.selectorLabels" . | nindent 8 }}
+        {{- include "ledger.selectorLabels" . | nindent 8 }}
+        component: agent
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "ledger-agent.serviceAccountName" . }}
+      serviceAccountName: {{ include "ledger.serviceAccountName" . }}-agent
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -39,12 +44,14 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: endpoint
-                  name: {{ include "ledger-agent.fullname" . }}
+                  name: {{ include "ledger.fullname" . }}-agent
             - name: TOKEN
               valueFrom:
                 secretKeyRef:
                   key: token
-                  name: {{ include "ledger-agent.fullname" . }}
+                  name: {{ include "ledger.fullname" . }}-agent
+            - name: LEDGER_NAMESPACE
+              value: {{ .Values.ledgerAgent.namespaced ? .Release.Namespace : "" }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -57,3 +64,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}

charts/ledger/templates/agent_role.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.ledgerAgent.enabled -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "ledger.fullname" . }}-agent
+  labels:
+    {{- include "ledger.labels" . | nindent 4 }}
+    component: agent
+rules:
+- apiGroups:
+  - "apps"
+  resources:
+  - deployments
+  - statefulsets
+  verbs:
+  - watch
+{{- end }}

charts/ledger/templates/agent_rolebinding.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.ledgerAgent.enabled -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "ledger.fullname" . }}
+  labels:
+    {{- include "ledger.labels" . | nindent 4 }}
+    component: agent
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "ledger.fullname" . }}-agent
+subjects:
+- kind: ServiceAccount
+  name: {{ include "ledger.serviceAccountName" . }}-agent
+  namespace: {{ .Release.Namespace }}
+{{- end }}

charts/ledger-agent/templates/secret.yaml → charts/ledger/templates/agent_secret.yaml

@@ -1,11 +1,14 @@
+{{- if .Values.ledgerAgent.enabled -}}
 apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: {{ include "ledger-agent.fullname" . }}
+  name: {{ include "ledger.fullname" . }}-agent
   labels:
-    {{- include "ledger-agent.labels" . | nindent 4 }}
+    {{- include "ledger.labels" . | nindent 4 }}
+    component: agent
 data:
   endpoint: {{ .Values.ledgerAgent.endpoint | b64enc }}
   token: {{ .Values.ledgerAgent.token | b64enc }}
   log-level: {{ .Values.ledgerAgent.log.level | b64enc }}
+{{- end }}

charts/ledger-agent/templates/serviceaccount.yaml → charts/ledger/templates/agent_serviceaccount.yaml

@@ -1,12 +1,15 @@
+{{- if .Values.ledgerAgent.enabled -}}
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "ledger-agent.serviceAccountName" . }}
+  name: {{ include "ledger.serviceAccountName" . }}-agent
   labels:
-    {{- include "ledger-agent.labels" . | nindent 4 }}
+    {{- include "ledger.labels" . | nindent 4 }}
+    component: agent
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
+{{- end }}

charts/ledger/templates/deployment.yaml → charts/ledger/templates/server_deployment.yaml

@@ -1,25 +1,29 @@
+{{- if .Values.ledgerServer.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "ledger.fullname" . }}
   labels:
     {{- include "ledger.labels" . | nindent 4 }}
+    component: server
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
       {{- include "ledger.selectorLabels" . | nindent 6 }}
+      component: server
   template:
     metadata:
       annotations:
-        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/server_secret.yaml") . | sha256sum }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
         {{- include "ledger.selectorLabels" . | nindent 8 }}
+        component: server
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -86,3 +90,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}