diff --git a/create-helm-chart.py b/create-helm-chart.py index b6ad8d2..327a72d 100644 --- a/create-helm-chart.py +++ b/create-helm-chart.py @@ -44,12 +44,7 @@ if __name__ == '__main__': nosql_db_name = data['nosql']['dbName'] nosql_user = data['nosql']['user'] nosql_password = data['nosql']['password'] - #activityProperties: activity - #eventProperties: eventProps - #localeProperties: locales - #organizerProperties: organizerProps - #userProperties: userProps - #templates: templates + tables = data['nosql']['tables'] cache_password = data['cache']['password'] diff --git a/src/Deployment.py b/src/Deployment.py index c0e97e5..fccdd12 100644 --- a/src/Deployment.py +++ b/src/Deployment.py @@ -228,11 +228,4 @@ class Deployment (Template): f.write(' ' + ' ' ' ' + ' ' + ' ' + ' ' + ' ' + 'name: {{ .Release.Name }}-' + third_party.name + '-secret' + '\n') f.write(' ' + ' ' ' ' + ' ' + ' ' + ' ' + ' ' + f'key: {var.replace("_", "-")}' + '\n') - f.write(' ' + ' ' + ' ' + ' ' + '{{- end }}' + '\n') - #f.write(' ' + ' ' + ' ' + ' ' + '{{- if .Values.thirdParty.openai.enabled }}' + '\n') - #f.write(' ' + ' ' + ' ' + ' ' + '- name: OPEANAI_API_KEY' + '\n') - #f.write(' ' + ' ' + ' ' + ' ' + ' ' + 'valueFrom:' + '\n') - #f.write(' ' + ' ' + ' ' + ' ' + ' ' + ' ' + 'secretKeyRef:' + '\n') - #f.write(' ' + ' ' + ' ' + ' ' + ' ' + ' ' + ' ' + 'name: {{ .Release.Name }}-openai-secret' + '\n') - #f.write(' ' + ' ' + ' ' + ' ' + ' ' + ' ' + ' ' + 'key: api-key' + '\n') - #f.write(' ' + ' ' + ' ' + ' ' + '{{- end }}' + '\n') \ No newline at end of file + f.write(' ' + ' ' + ' ' + ' ' + '{{- end }}' + '\n') \ No newline at end of file diff --git a/src/HelmChart.py b/src/HelmChart.py index 0b334d8..d7ee384 100644 --- a/src/HelmChart.py +++ b/src/HelmChart.py @@ -119,7 +119,7 @@ class HelmChart: snake_case_name += token.capitalize() f.write(f'{snake_case_name}: "{value["value"]}"' + '\n') - #f.write('privateRegistryToken: ""' + '\n') + f.write('\n') # If a OAuth template is included in the provided templates than we want to include the appropriate section to the `values.yaml` file. @@ -266,12 +266,7 @@ class HelmChart: if token != snake_case_name: snake_case_name += token.capitalize() f.write(' ' + f'{snake_case_name}: "{value["value"]}"' + '\n') - #f.write(' ' + 'activityProperties: activity' + '\n') - #f.write(' ' + 'eventProperties: eventProps' + '\n') - #f.write(' ' + 'localeProperties: locales' + '\n') - #f.write(' ' + 'organizerProperties: organizerProps' + '\n') - #f.write(' ' + 'userProperties: userProps' + '\n') - #f.write(' ' + 'templates: templates' + '\n') + f.write('\n') # If a Redis template is included in the provided templates than we want to include the appropriate section to the values.yaml file. @@ -354,13 +349,6 @@ class HelmChart: snake_case_name += token.capitalize() f.write(' ' + ' ' + f'{snake_case_name}: {value}' + '\n') f.write(' ' + ' ' + '\n') - #f.write(' ' + '# Configuration for the OpenAI integration' + '\n') - #f.write(' ' + 'openai:' + '\n') - #f.write(' ' + ' ' + '# If the OpenAI integration is enabled' + '\n') - #f.write(' ' + ' ' + 'enabled: true' + '\n') - #f.write(' ' + ' ' + '\n') - #f.write(' ' + ' ' + '# The OpenAI API key' + '\n') - #f.write(' ' + ' ' + 'apiKey: ""' + '\n') def write_helmignore(self): with open('.helmignore', 'w') as f: diff --git a/src/ThirdPartyService.py b/src/ThirdPartyService.py index 63996b3..51a2f68 100644 --- a/src/ThirdPartyService.py +++ b/src/ThirdPartyService.py @@ -26,5 +26,5 @@ class ThirdPartyService (Template): snake_case_name += token.capitalize() f.write(' ' + key.replace('_', '-') + ': {{ .Values.thirdParty.' + self.name + '.' + snake_case_name + ' | b64enc }}' + '\n') - #f.write(' ' + 'api-key: {{ .Values.thirdParty.openai.apiKey | b64enc }}' + '\n') + f.write('{{- end -}}' + '\n') \ No newline at end of file