fluxcd: cleanup chart
diff --git a/charts/flux-bootstrap/templates/fluxcd.yaml b/charts/flux-bootstrap/templates/fluxcd.yaml
index ddd389c..70fe4e3 100644
--- a/charts/flux-bootstrap/templates/fluxcd.yaml
+++ b/charts/flux-bootstrap/templates/fluxcd.yaml
@@ -25,14 +25,17 @@
env:
- name: SSH_KNOWN_HOSTS
value: /.ssh/known_hosts
- command: ["./flux", "bootstrap", "git",
- "--namespace={{ .Values.installationNamespace}}",
- "--url={{ .Values.repositoryAddress }}",
- "--branch={{ .Values.repository.branch }}",
- "--path={{ .Values.repository.path }}",
- "--private-key-file=/access-keys/private.key",
- "--ssh-key-algorithm=ed25519",
- "--silent",
- "--watch-all-namespaces",
- "--verbose"]
+ command:
+ - flux
+ - bootstrap
+ - git
+ - --namespace={{ .Values.installationNamespace }}
+ - --url={{ .Values.repositoryAddress }}
+ - --branch={{ .Values.repository.branch }}
+ - --path={{ .Values.repository.path }}
+ - --private-key-file=/access-keys/private.key
+ - --ssh-key-algorithm=ed25519
+ - --silent
+ - --watch-all-namespaces
+ - --verbose
restartPolicy: Never
diff --git a/charts/flux-bootstrap/templates/service-account.yaml b/charts/flux-bootstrap/templates/service-account.yaml
index f8567e9..a2168eb 100644
--- a/charts/flux-bootstrap/templates/service-account.yaml
+++ b/charts/flux-bootstrap/templates/service-account.yaml
@@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
- name: pcloud-flux-role
+ name: flux-bootstrap
namespace: {{ .Release.Namespace }}
rules:
- apiGroups: ["apiextensions.k8s.io"]
@@ -29,7 +29,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
- name: pcloud-flux-rolebinding
+ name: flux-bootstrap
namespace: {{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
@@ -37,5 +37,5 @@
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
- name: pcloud-flux-role
+ name: flux-bootstrap
apiGroup: rbac.authorization.k8s.io