diff --git a/chart/Chart.yaml b/chart/Chart.yaml index d56bb7c..c049eb6 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: badhouseplants-net description: A Helm chart for Kubernetes type: application -version: 0.3.3 +version: 0.3.4 appVersion: "1.16.0" diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index f5ece53..7413337 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -46,6 +46,9 @@ spec: resources: {{- toYaml .Values.rclone.container.resources | nindent 12 }} - name: {{ .Values.hugo.container.name }} + env: + - name: HUGO_BASEURL + value: {{ .Values.hugo.env.HUGO_BASEURL }} volumeMounts: - name: {{ .Values.volumes.rclone.name }} mountPath: /src/static diff --git a/chart/values.yaml b/chart/values.yaml index bd51298..999943c 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -33,6 +33,8 @@ hugo: repository: git.badhouseplants.net/allanger/badhouseplants-net pullPolicy: Always tag: latest + env: + HUGO_BASEURL: badhouseplants.net istio: enabled: true diff --git a/kube/applicationset.yaml b/kube/applicationset.yaml index 4f05c71..a4e7a04 100644 --- a/kube/applicationset.yaml +++ b/kube/applicationset.yaml @@ -10,6 +10,14 @@ spec: - name: dynamic-charts app: badhouseplants branch: dynamic-charts + chart_version: 0.3.3 + value: | + istio: + hosts: + - dynamic-charts-dev.badhouseplants.net + hugo: + image: + tag: f230ff63c02fddecc77608b08cefb21f513160e2 template: metadata: name: "{{ app }}-{{ name }}" @@ -20,11 +28,13 @@ spec: helm: valueFiles: - values.yaml - values: |- - {{ values }} + values: "{{ value }}" repoURL: https://git.badhouseplants.net/api/packages/allanger/helm - targetRevision: "{{ chart.version }}" + targetRevision: "{{ chart_version }}" chart: badhouseplants-net destination: - server: "{{ argo.cluster }}" + server: "https://kubernetes.default.svc" namespace: "{{ app }}-{{ name }}" + syncPolicy: + syncOptions: + - CreateNamespace=true