chore(helmbroker): modify charts

Author: lijianguo

charts/helmbroker/templates/_helpers.tpl

@@ -1,6 +1,8 @@
 {{/* Generate helmbroker deployment envs */}}
-{{- define "helmbroker.envs" -}}
+{{- define "helmbroker.envs" }}
 env:
+- name: "TZ"
+  value: {{ .Values.time_zone | default "UTC" | quote }}
 {{- range $key, $value := .Values.environment }}
 - name: {{ $key }}
   value: {{ $value | quote }}
@@ -44,7 +46,7 @@ volumes:
 - name: helmbroker-data
   persistentVolumeClaim:
     claimName: drycc-helmbroker
-{{- else}}
+{{- else }}
 - name: helmbroker-data
   emptyDir: {}
 {{- end }}

charts/helmbroker/templates/helmbroker-cm.yaml

@@ -8,7 +8,7 @@ metadata:
   annotations:
     component.drycc.cc/version: {{ .Values.image_tag }}
 data:
-    repositories:
+  repositories: |
     {{- range .Values.repositories }}
     - name: {{ .name }}
       url: {{ .url }}

charts/helmbroker/templates/helmbroker-cronjob-daily.yaml

@@ -21,7 +21,11 @@ spec:
           - image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.image_pull_policy}}
             name: drycc-helmbroker-cleaner
-            command: ['python', '-m', 'helmbroker.cleaner']
+            command:
+              - /bin/bash
+              - -c
+            args:
+              - python -m helmbroker.cleaner
             {{- include "helmbroker.envs" . | indent 12 }}
             {{- include "helmbroker.volumeMounts" . | indent 12 }}
           {{- include "helmbroker.volumes" . | indent 10 }}

charts/helmbroker/templates/helmbroker-deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: drycc-helmbroker-cm
+  name: drycc-helmbroker
   labels:
     heritage: drycc
   annotations:
@@ -23,10 +23,14 @@ spec:
     spec:
       serviceAccount: drycc-helmbroker
       initContainers:
-      - name: loader
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
-        command: ['python', '-m', 'helmbroker.loader']
+        - name: loader
+          image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
+          imagePullPolicy: {{.Values.image_pull_policy}}
+          command:
+            - /bin/bash
+            - -c
+          args:
+            - python -m helmbroker.loader
           {{- include "helmbroker.envs" . | indent 10 }}
           {{- include "helmbroker.volumeMounts" . | indent 10 }}
       containers:
@@ -36,18 +40,18 @@ spec:
           livenessProbe:
             httpGet:
               path: /healthz
-              port: 5000
+              port: 8000
             initialDelaySeconds: 30
             timeoutSeconds: 10
           readinessProbe:
             httpGet:
               path: /readiness
-              port: 5000
+              port: 8000
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 5
           ports:
-            - containerPort: 5000
+            - containerPort: 8000
               name: http
           {{- include "helmbroker.limits" . | indent 10 }}
           {{- include "helmbroker.envs" . | indent 10 }}

charts/helmbroker/templates/helmbroker-service.yaml

@@ -8,6 +8,6 @@ spec:
   ports:
     - name: http
       port: 80
-      targetPort: 5000
+      targetPort: 8000
   selector:
     app: drycc-helmbroker

rootfs/Dockerfile

@@ -31,4 +31,4 @@ RUN apk add --update --virtual .build-deps \
   && /app/bin/install
 
 CMD ["/app/bin/boot"]
-EXPOSE 5000
+EXPOSE 8000

rootfs/Dockerfile.test

@@ -34,4 +34,4 @@ RUN apk add --update --virtual .build-deps \
 COPY . /app
 
 CMD ["/app/bin/boot"]
-EXPOSE 5000
+EXPOSE 8000

rootfs/helmbroker/loader.py

@@ -109,6 +109,6 @@ def load_addons(repository):
 
 
 if __name__ == '__main__':
-    with open(CONFIG_PATH, 'r') as f:
-        repository = yaml.load(f.read(), Loader=yaml.Loader)
-        load_addons(repository['repositories'][0])
+    with open(f'{CONFIG_PATH}/repositories', 'r') as f:
+        repositories = yaml.load(f.read(), Loader=yaml.Loader)
+        load_addons(repositories[0])