fix(charts): reserved names miss

Author: duanhongyi

charts/passport/templates/_helpers.tpl

@@ -100,77 +100,3 @@ volumes:
     configMap:
       name: passport-config
 {{- end }}
-
-{{/* Generate passport default reserved usernames */}}
-{{- define "passport.defaultReservedUsernames" }}
-admin
-administrator
-anonymous
-asshole
-bastard
-billing
-callback
-cancer
-cocaine
-contact
-coronavirus
-cracker
-database
-developer
-doopai
-drycc
-email
-explore
-faggot
-feedback
-hacker
-helpdesk
-hentai
-heroin
-hitler
-homophobic
-horny
-idiot
-killer
-login
-logout
-moderator
-murder
-nigger
-nigga
-official
-payment
-pedophile
-pornhub
-profile
-racist
-rapist
-recovery
-register
-retard
-scammer
-security
-service
-settings
-sexist
-signup
-signin
-slave
-spammer
-staff
-suicide
-support
-system
-terrorism
-trending
-undefined
-update
-username
-verification
-verify
-webmaster
-webhook
-wetback
-whore
-xvideos
-{{- end }}

charts/passport/templates/passport-configmap.yaml

@@ -8,8 +8,8 @@ data:
   init-applications.json: |-
 {{ toPrettyJson .Values.initApplications | indent 4 }}
   reserved-name-patterns.txt: |-
-    {{- if .Values.config.reservedNames }}
-    {{- (tpl .Values.config.reservedNames $)  | nindent 4 }}
+    {{- if .Values.reservedNames }}
+    {{- (tpl .Values.reservedNames $)  | nindent 4 }}
     {{- else}}
     {{- .Files.Get "files/reserved-name-patterns.txt" | nindent 4 }}
     {{- end }}

charts/passport/values.yaml

@@ -86,8 +86,8 @@ environment:
 adminUsername: "admin"
 adminPassword: "admin"
 adminEmail: "admin@email.com"
-# Reserved usernames
-reservedUsernames: ""
+# Reserved names
+reservedNames: ""
 # The following configurations to initialize oauth2 application
 # Names are all lowercase letters
 # The key and secret are generated automatically if they are empty