chore(helmbroker): up chart

Author: lijianguo

charts/helmbroker/templates/_helpers.tpl

@@ -44,5 +44,8 @@ volumes:
 - name: helmbroker-data
   persistentVolumeClaim:
     claimName: drycc-helmbroker
+{{- else}}
+- name: helmbroker-data
+  emptyDir: {}
 {{- end }}
 {{- end }}

charts/helmbroker/templates/helmbroker-certificate.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.cert_manager_enabled }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: drycc-helmbroker
+spec:
+  secretName: drycc-helmbroker-certificate-auto
+  issuerRef:
+    name: drycc-cluster-issuer
+    kind: ClusterIssuer
+  dnsNames:
+  - drycc-helmbroker.{{ .Values.platform_domain }}
+  privateKey:
+    rotationPolicy: Always
+{{- end }}

charts/helmbroker/templates/helmbroker-deployment.yaml

@@ -22,6 +22,13 @@ spec:
         app: drycc-helmbroker
     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'];
+          {{- include "helmbroker.envs" . | indent 10 }}
+          {{- include "helmbroker.volumeMounts" . | indent 10 }}
       containers:
         - name: drycc-helmbroker
           image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
@@ -40,7 +47,7 @@ spec:
             timeoutSeconds: 10
             periodSeconds: 5
           ports:
-            - containerPort: 8000
+            - containerPort: 5000
               name: http
           {{- include "helmbroker.limits" . | indent 10 }}
           {{- include "helmbroker.envs" . | indent 10 }}

charts/helmbroker/templates/helmbroker-ingress.yaml

@@ -0,0 +1,36 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: "helmbroker-api-server"
+  labels:
+    app: "helmbroker"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    {{- if not (eq .Values.ingress_class "") }}
+    kubernetes.io/ingress.class: "{{ .Values.ingress_class }}"
+    {{- end }}
+spec:
+  rules:
+  - host: drycc.{{ .Values.platform_domain }}
+    http:
+      paths:
+      - pathType: Prefix
+        {{- if eq .Values.ingress_class "gce" "alb" }}
+        path: /*
+        {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
+        path: /
+        {{- end }}
+        backend:
+          service:
+            name: drycc-helmbroker
+            port:
+              number: 80
+  {{- if .Values.cert_manager_enabled }}
+  tls:
+    - secretName: drycc-helmbroker-certificate-auto
+      hosts:
+        - drycc.{{ .Values.platform_domain }}
+  {{- end }}

charts/helmbroker/templates/helmbroker-service-account.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: drycc-helmbroker
+  labels:
+    heritage: drycc

charts/helmbroker/templates/helmbroker-service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: drycc-helmbroker
+  labels:
+    heritage: drycc
+spec:
+  ports:
+    - name: http
+      port: 80
+      targetPort: 5000
+  selector:
+    app: drycc-helmbroker

charts/helmbroker/values.yaml

@@ -16,4 +16,17 @@ persistence:
   accessMode: ReadWriteOnce
   size: 5Gi
   storageClass: ""
-  volumeName: ""
+  volumeName: ""
+
+ingress_class: ""
+# A domain name consists of one or more parts.
+# Periods (.) are used to separate these parts.
+# Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
+# It must start and end with a lowercase letter or digit.
+cluster_domain: "cluster.local"
+# The public resolvable hostname to build your cluster with.
+#
+# This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"
+platform_domain: ""
+# Whether cert_manager is enabled to automatically generate helmbroker certificates
+cert_manager_enabled: "true"

rootfs/helmbroker/config.py

@@ -9,5 +9,3 @@
 
 class Config:
     DEBUG = os.environ.get("DEBUG", False)
-    if not os.path.exists(ADDONS_PATH):
-        os.makedirs(ADDONS_PATH)

rootfs/helmbroker/loader.py

@@ -86,11 +86,13 @@ def load_addons(repository):
         encoding="utf-8")
     # compare index.yaml, is update
     local_index = read_file(local_index_file)
-    if remote_index == local_index:
+    if local_index and remote_index == local_index:
         return
     # delete old repository catalog
     if os.path.exists(ADDONS_PATH):
         shutil.rmtree(ADDONS_PATH)
+    else:
+        os.makedirs(ADDONS_PATH, exist_ok=True)
     # new index
     save_file(remote_index, ADDONS_PATH, index_name)
     remote_index = yaml.load(remote_index, Loader=yaml.Loader)