chore(monitor): change passport config

Author: duanhongyi

charts/monitor/templates/_helpers.tmpl

@@ -54,22 +54,14 @@ env:
 {{- else }}
   value: http://drycc-passport.{{ .Values.global.platformDomain }}
 {{- end }}
-- name: "SOCIAL_AUTH_DRYCC_AUTHORIZATION_URL"
-  value: "$(DRYCC_PASSPORT_URL)/oauth/authorize/"
-- name: "SOCIAL_AUTH_DRYCC_ACCESS_TOKEN_URL"
-  value: "$(DRYCC_PASSPORT_URL)/oauth/token/"
-- name: "SOCIAL_AUTH_DRYCC_ACCESS_API_URL"
-  value: "$(DRYCC_PASSPORT_URL)"
-- name: "SOCIAL_AUTH_DRYCC_USERINFO_URL"
-  value: "$(DRYCC_PASSPORT_URL)/oauth/userinfo/"
-- name: SOCIAL_AUTH_DRYCC_KEY
+- name: DRYCC_PASSPORT_KEY
   valueFrom:
     secretKeyRef:
       name: passport-creds
-      key: social-auth-drycc-grafana-key
-- name: SOCIAL_AUTH_DRYCC_SECRET
+      key: drycc-passport-grafana-key
+- name: DRYCC_PASSPORT_SECRET
   valueFrom:
     secretKeyRef:
       name: passport-creds
-      key: social-auth-drycc-grafana-secret
+      key: drycc-passport-grafana-secret
 {{- end }}

grafana/rootfs/usr/share/grafana/grafana.ini.tpl

@@ -231,15 +231,15 @@ config_file = "/usr/share/grafana/ldap.toml"
 
 #################################### Generic Oauth ##########################
 [auth.generic_oauth]
-{{ if .SOCIAL_AUTH_DRYCC_KEY }}
+{{ if .DRYCC_PASSPORT_URL }}
 name = OAuth
 enabled = true
-client_id = {{ .SOCIAL_AUTH_DRYCC_KEY }}
-client_secret = {{ .SOCIAL_AUTH_DRYCC_SECRET }}
+client_id = {{ .DRYCC_PASSPORT_KEY }}
+client_secret = {{ .DRYCC_PASSPORT_SECRET }}
 scopes = profile,openid
-auth_url = {{ .SOCIAL_AUTH_DRYCC_AUTHORIZATION_URL }}
-token_url = {{ .SOCIAL_AUTH_DRYCC_ACCESS_TOKEN_URL }}
-api_url = {{ .SOCIAL_AUTH_DRYCC_USERINFO_URL }}
+auth_url = {{ .DRYCC_PASSPORT_URL }}/oauth/authorize/
+token_url = {{ .DRYCC_PASSPORT_URL }}/oauth/token/
+api_url = {{ .DRYCC_PASSPORT_URL }}
 allow_sign_up = true
 tls_skip_verify_insecure = true
 role_attribute_path = (is_superuser && 'Admin') || (is_staff && 'Viewer') || ''