Merge pull request #16 from nicolastakashi/refactory-chart-secret

[REFACTORY] chart auth secret

charts/gitana/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.0
+version: 1.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/gitana/templates/_helpers.tpl

@@ -68,8 +68,8 @@ Create the name of the service account to use
 {{- end }}
 
 {{- define "gitana.authSecretName" -}}
-{{- if .Values.authSecret.secretname }}
-{{- .Values.authSecret.secretname }}
+{{- if .Values.flags.repository.auth.secret.name }}
+{{- .Values.flags.repository.auth.secret.name }}
 {{- else }}
 {{- printf "%s-auth-secret" (include "gitana.fullname" .) }}
 {{- end }}

charts/gitana/templates/authsecret.yaml

@@ -1,17 +1,20 @@
-{{- if and .Values.authSecret.enabled .Values.authSecret.create }}
+{{- if and .Values.flags.repository.auth.enabled .Values.flags.repository.auth.secret.create }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "gitana.authSecretName" . }}
   labels:
     {{- include "gitana.labels" . | nindent 4 }}
-  {{- with .Values.authSecret.annotations }}
+  {{- with .Values.flags.repository.auth.secret.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.flags.repository.auth.secret.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 stringData:
   auth.yaml: |-
-    username: {{ .Values.authSecret.username | quote }}
-    password: {{ .Values.authSecret.password | quote }}
+    username: {{ .Values.flags.repository.auth.username | quote }}
+    password: {{ .Values.flags.repository.auth.password | quote }}
 type: Opaque
 {{- end }}

charts/gitana/templates/deployment.yaml

@@ -39,11 +39,7 @@ spec:
             {{- end }}
             - --dashboard.labels={{- include "dashboard.labels" . | trimSuffix "," }} 
             - --namespace={{ .Values.flags.namespace }}
-            {{- if .Values.flags.repository.auth }}
-            - --repository.auth.user={{ .Values.flags.repository.auth }}
-            - --repository.auth.user={{ .Values.flags.repository.password }}
-            {{- end }}
-            {{- if .Values.authSecret.enabled }}
+            {{- if .Values.flags.repository.auth.enabled }}
             - --repository.auth.secretname={{ include "gitana.authSecretName" . }}
             {{- end }}
             {{- if .Values.flags.repository.dashboardPath }}

charts/gitana/templates/role.yaml

@@ -12,3 +12,8 @@ rules:
       - get
       - list
       - update
+  - apiGroups: [""]
+    resources:
+      - secrets
+    verbs:
+      - get

charts/gitana/values.yaml

@@ -2,7 +2,7 @@ image:
   repository: ntakashi/gitana
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.1.0
+  tag: 1.2.0
 
 imagePullSecrets: []
 nameOverride: ""
@@ -61,14 +61,6 @@ serviceMonitor:
   # ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint
   scrapeTimeout: ""
 
-authSecret:
-  enabled: true
-  create: true
-  secretname: ""
-  annotations: {}
-  username: "cenas"
-  password: "123"
-
 flags:
   # (optional) absolute path to the kubeconfig file
   kubeconfig: ""
@@ -107,8 +99,13 @@ flags:
     # repository url
     url: ""
 
-    auth: {}
-      # username to perform authentication
-      # user: ""
-      # password to perform authentication
-      # password:
+    # auth secret configuration
+    auth:
+      enabled: false
+      username: ""
+      password: ""
+      secret:
+        create: true
+        name: ""
+        annotations: {}
+        labels: {}