feat(metallb): add to misc-apps (#121)

adfinis · Nov 19, 2020 · 2d137d1 · 2d137d1
1 parent 8749882
commit 2d137d1
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 3 deletions.
diff --git a/charts/misc-apps/Chart.yaml b/charts/misc-apps/Chart.yaml
@@ -3,8 +3,8 @@ name: misc-apps
 description: Argo CD app-of-apps config for miscellaneous small tools
 type: application
 # version and appVersion are in sync in this chart!
-version: 0.2.4
-appVersion: 0.2.4
+version: 0.2.5
+appVersion: 0.2.5
 home: https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/misc-apps
 sources:
   - https://github.com/adfinis-sygroup/helm-charts

diff --git a/charts/misc-apps/README.md b/charts/misc-apps/README.md
@@ -1,6 +1,6 @@
 # misc-apps
 
-![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.4](https://img.shields.io/badge/AppVersion-0.2.4-informational?style=flat-square)
+![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.5](https://img.shields.io/badge/AppVersion-0.2.5-informational?style=flat-square)
 
 Argo CD app-of-apps config for miscellaneous small tools
 
@@ -30,6 +30,13 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk
 | downscaler.repoURL | string | [repo](https://charts.helm.sh/incubator/) | Repo URL |
 | downscaler.targetRevision | string | `"0.5.*"` | [kube-downscaler Helm chart](https://github.com/helm/charts/tree/master/incubator/kube-downscaler) version |
 | downscaler.values | object | [upstream values](https://github.com/helm/charts/blob/master/incubator/kube-downscaler/values.yaml) | Helm values |
+| metallb | object | - | [metallb](https://github.com/metallb/metallb) ([example](./examples/metallb.yaml) |
+| metallb.chart | string | `"metallb"` | Chart |
+| metallb.destination.namespace | string | `"infra-metallb"` | Namespace |
+| metallb.enabled | bool | `false` | Enable metallb |
+| metallb.repoURL | string | [repo](https://charts.bitnami.com/bitnami) | Repo URL |
+| metallb.targetRevision | string | `"1.0.*"` | [metallb Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/metallb) |
+| metallb.values | object | [upstream values](https://github.com/bitnami/charts/tree/master/bitnami/metallb/values.yaml) | Helm values |
 | sentryKubernetes | object | - | [sentry-kubernetes](https://github.com/getsentry/sentry-kubernetes) ([example](./examples/sentry-kubernetes.yaml) |
 | sentryKubernetes.chart | string | `"sentry-kubernetes"` | Chart |
 | sentryKubernetes.destination.namespace | string | `"infra-sentry-kubernetes"` | Namespace |

diff --git a/charts/misc-apps/ci/default-values.yaml b/charts/misc-apps/ci/default-values.yaml
@@ -5,3 +5,11 @@ downscaler:
 signalilo:
   enabled: true
   values: {}
+
+sentryKubernetes:
+  enabled: true
+  values: {}
+
+metallb:
+  enabled: true
+  values: {}
diff --git a/charts/misc-apps/examples/metallb.yaml b/charts/misc-apps/examples/metallb.yaml
@@ -0,0 +1,14 @@
+metallb:
+  enabled: true
+  project: infra-metallb
+  values:
+    prometheus:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+    configInline:
+      address-pools:
+        - name: default
+          protocol: layer2
+          addresses:
+          - 192.168.1.10-192.168.1.20
diff --git a/charts/misc-apps/templates/metallb.yaml b/charts/misc-apps/templates/metallb.yaml
@@ -0,0 +1,33 @@
+{{ if .Values.metallb.enabled }}
+{{ template "argoconfig.application" (list . "misc-apps.metallb") }}
+{{ end }}
+
+{{- define "misc-apps.metallb" -}}{{- $app := unset .Values.metallb "enabled" -}}{{- $name := default $app.destination.namespace $app.name -}}
+metadata:
+  name: {{ template "common.fullname" . }}-{{ $name }}
+spec:
+  {{- if $app.project }}
+  project: {{ $app.project | quote }}
+  {{- end }}
+  source:
+    repoURL: {{ $app.repoURL | quote }}
+    chart: {{ $app.chart | quote }}
+    targetRevision: {{ $app.targetRevision | quote }}
+    helm:
+      releaseName: {{ $name | quote }}
+      values: |-
+        nameOverride: {{ $name | quote }}
+        {{- $app.values | toYaml | nindent 8 }}
+  {{- if $app.destination }}
+  destination:
+    {{ $app.destination | toYaml | nindent 4 }}
+  {{- end }}
+  {{- if $app.syncPolicy }}
+  syncPolicy:
+    {{ $app.syncPolicy | toYaml | nindent 4 }}
+  {{- end }}
+  {{- if $app.ignoreDifferences }}
+  ignoreDifferences:
+    {{ $app.ignoreDifferences | toYaml | nindent 4 }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml
@@ -54,3 +54,22 @@ sentryKubernetes:
   # sentryKubernetes.values -- Helm values
   # @default -- [upstream values](https://github.com/sentry-kubernetes/charts/blob/develop/sentry-kubernetes/values.yaml)
   values: {}
+
+# metallb -- [metallb](https://github.com/metallb/metallb) ([example](./examples/metallb.yaml)
+# @default -- -
+metallb:
+  # metallb.enabled -- Enable metallb
+  enabled: false
+  destination:
+    # metallb.destination.namespace -- Namespace
+    namespace: "infra-metallb"
+  # metallb.repoURL -- Repo URL
+  # @default -- [repo](https://charts.bitnami.com/bitnami)
+  repoURL: "https://charts.bintami.com/bitnami"
+  # metallb.chart -- Chart
+  chart: "metallb"
+  # metallb.targetRevision -- [metallb Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/metallb)
+  targetRevision: "1.0.*"
+  # metallb.values -- Helm values
+  # @default -- [upstream values](https://github.com/bitnami/charts/tree/master/bitnami/metallb/values.yaml)
+  values: {}