renaming rbac.enable -> rbac.create, removing ---, removing image pul…

…l secret support
FairwindsOps · Apr 1, 2019 · 5a71316 · 5a71316
1 parent 52fa0b3
commit 5a71316
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -33,9 +33,6 @@ kubectl apply -f deploy/all.yaml
 
 ## Helm Deploy Option
 
-* Create ImagePullSecret:
-`kubectl -n fairwinds create secret docker-registry fairwinds --docker-server=<docker_registry> --docker-username=<docker_username> --docker-password=<docker_password> --docker-email=<docker_email>`
-
 * Create release with Helm:
 ```
 helm upgrade --install fairwinds charts/fairwinds/ --namespace fairwinds --recreate-pods

diff --git a/charts/fairwinds/templates/fairwinds-dash.svc.yaml b/charts/fairwinds/templates/fairwinds-dash.svc.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.dashboard.service -}}
----
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/charts/fairwinds/templates/fairwinds.clusterrole.yaml b/charts/fairwinds/templates/fairwinds.clusterrole.yaml
@@ -1,5 +1,4 @@
-{{- if .Values.rbac.enable -}}
----
+{{- if .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:

diff --git a/charts/fairwinds/templates/fairwinds.clusterrolebinding.yaml b/charts/fairwinds/templates/fairwinds.clusterrolebinding.yaml
@@ -1,5 +1,4 @@
-{{- if .Values.rbac.enable -}}
----
+{{- if .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:

diff --git a/charts/fairwinds/templates/fairwinds.configmap.yaml b/charts/fairwinds/templates/fairwinds.configmap.yaml
@@ -1,5 +1,3 @@
-{{- if .Values.config -}}
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -12,4 +10,3 @@ metadata:
   namespace: '{{.Release.Namespace}}'
 data:
   config.yml: {{- toYaml .Values.config | indent 2 -}}
-{{ end }}
diff --git a/charts/fairwinds/templates/fairwinds.deployment-dashboard.yaml b/charts/fairwinds/templates/fairwinds.deployment-dashboard.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-        checksum/config: '{{ include (print $.Template.BasePath "/fairwinds.configmap.yaml") . | sha256sum }}'
+    checksum/config: '{{ include (print $.Template.BasePath "/fairwinds.configmap.yaml") . | sha256sum }}'
   labels:
     app: '{{.Release.Name}}'
     chart: '{{.Chart.Name}}-{{.Chart.Version}}'
@@ -49,7 +49,5 @@ spec:
           name: '{{ template "fullname" . }}'
           readOnly: true
           subPath: config.yml
-      imagePullSecrets:
-      - name: '{{.Values.imagePullSecrets}}'
       serviceAccountName: '{{ template "fullname" . }}'
 {{- end -}}
diff --git a/charts/fairwinds/templates/fairwinds.deployment-webook.yaml b/charts/fairwinds/templates/fairwinds.deployment-webook.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-        checksum/config: '{{ include (print $.Template.BasePath "/fairwinds.configmap.yaml") . | sha256sum }}'
+    checksum/config: '{{ include (print $.Template.BasePath "/fairwinds.configmap.yaml") . | sha256sum }}'
   labels:
     app: '{{.Release.Name}}'
     chart: '{{.Chart.Name}}-{{.Chart.Version}}'
@@ -51,7 +51,5 @@ spec:
           name: '{{ template "fullname" . }}'
           readOnly: true
           subPath: config.yml
-      imagePullSecrets:
-      - name: '{{.Values.imagePullSecrets}}'
       serviceAccountName: '{{ template "fullname" . }}'
 {{- end -}}
diff --git a/charts/fairwinds/templates/fairwinds.secret.yaml b/charts/fairwinds/templates/fairwinds.secret.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/charts/fairwinds/templates/fairwinds.serviceaccount.yaml b/charts/fairwinds/templates/fairwinds.serviceaccount.yaml
@@ -1,5 +1,3 @@
-{{- if .Values.rbac.enable -}}
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,4 +7,3 @@ metadata:
     release: '{{.Release.Name}}'
   name: '{{ template "fullname" . }}'
   namespace: '{{.Release.Namespace}}'
-{{- end -}}
diff --git a/charts/fairwinds/values.yaml b/charts/fairwinds/values.yaml
@@ -45,7 +45,6 @@ webhook:
   image: quay.io/reactiveops/fairwinds
   imagePullPolicy: IfNotPresent
   imageTag: dev-f16f12d0af38fd547918d394ce717037223b7f94
-imagePullSecrets: fairwinds
 replicas: 1 
 rbac:
-  enable: true
+  create: true