chore(helmbroker): fixup configMap

Author: lijianguo

charts/helmbroker/templates/_helpers.tpl

@@ -3,6 +3,10 @@
 env:
 - name: "TZ"
   value: {{ .Values.time_zone | default "UTC" | quote }}
+- name: USERNAME:
+  {{ if .Values.username | default "" | ne "" }}{{ .Values.username | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
+- name: PASSWORD:
+  {{ if .Values.password | default "" | ne "" }}{{ .Values.password | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
 {{- range $key, $value := .Values.environment }}
 - name: {{ $key }}
   value: {{ $value | quote }}

charts/helmbroker/values.yaml

@@ -11,8 +11,13 @@ repositories: {}
 #- name: drycc-helm-broker
 #  url: http://helm-broker.drycc.cc/index-drycc.yaml
 
+# broker_credentials:
+# Optional Usernames and passwords that will be required to communicate with service broker
+username: admin
+password: admin
+
 persistence:
-  enabled: false
+  enabled: true
   accessMode: ReadWriteMany
   size: 5Gi
   storageClass: ""

rootfs/helmbroker/config.py

@@ -6,6 +6,9 @@
 CONFIG_PATH = os.path.join(HELMBROKER_ROOT, 'config')
 INSTANCES_PATH = os.path.join(HELMBROKER_ROOT, 'instances')
 
+USERNAME = os.environ.get('USERNAME')
+PASSWORD = os.environ.get('PASSWORD')
+
 
 class Config:
     DEBUG = os.environ.get("DEBUG", False)

rootfs/helmbroker/loader.py

@@ -66,6 +66,7 @@ def addons_meta_file():
     for addon_meta in addons_meta:
         with open(f'{ADDONS_PATH}/{"/".join(addon_meta)}', 'r') as f:
             meta = yaml.load(f.read(), Loader=yaml.Loader)
+            meta['tags'] = meta.get('tags').split(', ') if meta.get('tags') else [] # noqa
             meta['plans'] = []
             addons_dict[meta['name']] = meta
 

rootfs/helmbroker/meta.py

@@ -136,5 +136,4 @@ def dump_addons_meta(data):
     file = os.path.join(ADDONS_PATH, "addons.json")
     validate(instance=data, schema=INSTANCE_META_SCHEMA)
     with open(file, "w") as f:
-        print("save addons.json")
         f.write(json.dumps(data, sort_keys=True, indent=2))

rootfs/helmbroker/wsgi.py

@@ -2,7 +2,7 @@
 from flask import Flask, make_response
 from openbrokerapi import api, log_util
 from helmbroker.broker import HelmServiceBroker
-from helmbroker.config import Config
+from helmbroker.config import Config, USERNAME, PASSWORD
 
 application = Flask("helmbroker")
 
@@ -24,4 +24,8 @@ def readiness():
 
 
 application.config.from_object(Config)
-application.register_blueprint(api.get_blueprint(HelmServiceBroker(), api.BrokerCredentials("", ""), log_util.basic_config()))  # noqa
+catalog_api = api.get_blueprint(
+    HelmServiceBroker(),
+    api.BrokerCredentials(USERNAME, PASSWORD),
+    log_util.basic_config())
+application.register_blueprint(catalog_api)