From b4da35366a213e2abe54bb03bed9a01b266b99a8 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 2 Sep 2020 21:19:54 +0200 Subject: [PATCH 01/10] :sparkles: (misc-apps) init misc-app --- README.md | 1 + charts/misc-apps/.helmignore | 23 +++++++++ charts/misc-apps/Chart.lock | 6 +++ charts/misc-apps/Chart.yaml | 18 +++++++ charts/misc-apps/README.md | 47 +++++++++++++++++++ charts/misc-apps/ci/default-values.yaml | 7 +++ .../misc-apps/examples/kube-downscaler.yaml | 12 +++++ charts/misc-apps/examples/signalilo.yaml | 23 +++++++++ charts/misc-apps/templates/NOTES.txt | 7 +++ charts/misc-apps/templates/downscaler.yaml | 33 +++++++++++++ charts/misc-apps/templates/signalilo.yaml | 33 +++++++++++++ charts/misc-apps/values.yaml | 27 +++++++++++ 12 files changed, 237 insertions(+) create mode 100644 charts/misc-apps/.helmignore create mode 100644 charts/misc-apps/Chart.lock create mode 100644 charts/misc-apps/Chart.yaml create mode 100644 charts/misc-apps/README.md create mode 100644 charts/misc-apps/ci/default-values.yaml create mode 100644 charts/misc-apps/examples/kube-downscaler.yaml create mode 100644 charts/misc-apps/examples/signalilo.yaml create mode 100644 charts/misc-apps/templates/NOTES.txt create mode 100644 charts/misc-apps/templates/downscaler.yaml create mode 100644 charts/misc-apps/templates/signalilo.yaml create mode 100644 charts/misc-apps/values.yaml diff --git a/README.md b/README.md index 4744cb875..6a2b446c1 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ helm repo add adfinis https://charts.adfinis.com | [caasperli](charts/caasperli) | Deploy Caasperli to a Kubernetes Cluster | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) ![App version: latest](https://img.shields.io/badge/app%20version-latest-brightgreen) | | [common](charts/common) | Common chartbuilding components and helpers, based on incubator/common | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) ![App version: 0.x](https://img.shields.io/badge/app%20version-0.x-brightgreen) | | [kasperleyn](charts/kasperleyn) | A Helm 2 chart to deploy Caasperli | ![Version: 1.0.x](https://img.shields.io/badge/version-1.0.x-brightgreen) ![App version: 0.x](https://img.shields.io/badge/app%20version-0.x-brightgreen) | +| [misc-apps](charts/misc-apps) | Argo CD app-of-apps config for miscellaneous small tools | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) ![App version: 0.x](https://img.shields.io/badge/app%20version-0.x-brightgreen) | | [sentry-apps](charts/sentry-apps) | Sentry on premise | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) ![App version: 5.1.x](https://img.shields.io/badge/app%20version-5.1.x-brightgreen) | | [timed](charts/timed) | Chart for Timed application | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) ![App version: 1.1.x](https://img.shields.io/badge/app%20version-1.1.x-brightgreen) | diff --git a/charts/misc-apps/.helmignore b/charts/misc-apps/.helmignore new file mode 100644 index 000000000..0e8a0eb36 --- /dev/null +++ b/charts/misc-apps/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/misc-apps/Chart.lock b/charts/misc-apps/Chart.lock new file mode 100644 index 000000000..575efd470 --- /dev/null +++ b/charts/misc-apps/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: argoconfig + repository: https://charts.adfinis.com + version: 0.6.0 +digest: sha256:d485e6aa8cea0d86794f8d88c90950809e83028a681121ef0d4bfed8c5674499 +generated: "2020-07-02T16:22:43.418846+02:00" diff --git a/charts/misc-apps/Chart.yaml b/charts/misc-apps/Chart.yaml new file mode 100644 index 000000000..933bfff67 --- /dev/null +++ b/charts/misc-apps/Chart.yaml @@ -0,0 +1,18 @@ +apiVersion: v2 +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.1.0 +appVersion: 0.1.0 +home: https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/misc-apps +sources: + - https://github.com/adfinis-sygroup/helm-charts +maintainers: + - name: adfinis-sygroup + email: support@adfinis.com + url: https://adfinis.com +dependencies: + - name: argoconfig + version: 0.6.0 + repository: https://charts.adfinis.com diff --git a/charts/misc-apps/README.md b/charts/misc-apps/README.md new file mode 100644 index 000000000..232044307 --- /dev/null +++ b/charts/misc-apps/README.md @@ -0,0 +1,47 @@ +# misc-apps + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) + +Argo CD app-of-apps config for miscellaneous small tools + +**Homepage:** + +## Maintainers +This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk_kwd=helm-charts). + +## Source Code + +* + +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://charts.adfinis.com | argoconfig | 0.6.0 | + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| downscaler | object | see [values.yaml](./values.yaml) | [kube-downscaler](https://github.com/hjacobs/kube-downscaler) | +| downscaler.enabled | bool | `false` | Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) | +| 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 | +| signalilo | object | see [values.yaml](./values.yaml) | [sigalilo](https://github.com/vshn/signalilo) | +| signalilo.enabled | bool | `false` | Enable signalilo: [example](./examples/signalilo.yaml) | +| signalilo.targetRevision | string | `"0.5.*"` | [signalilo Helm chart](https://github.com/appuio/charts/tree/master/signalilo) version | +| signalilo.values | object | [upstream values](https://github.com/appuio/charts/blob/master/signalilo/values.yaml) | Helm values | + +## About this chart + +Adfinis fights for a software world that is more open, where the quality is +better and where software must be accessible to everyone. This chart +is part of the action behind this commitment. Feel free to +[contact](https://adfinis.com/kontakt/?pk_campaign=github&pk_kwd=helm-charts) +us if you have any questions. + +## License + +This Helm chart is free software: you can redistribute it and/or modify it under the terms +of the GNU Affero General Public License as published by the Free Software Foundation, +version 3 of the License. diff --git a/charts/misc-apps/ci/default-values.yaml b/charts/misc-apps/ci/default-values.yaml new file mode 100644 index 000000000..31af1c179 --- /dev/null +++ b/charts/misc-apps/ci/default-values.yaml @@ -0,0 +1,7 @@ +downscaler: + enabled: true + values: {} + +signalilo: + enabled: true + values: {} diff --git a/charts/misc-apps/examples/kube-downscaler.yaml b/charts/misc-apps/examples/kube-downscaler.yaml new file mode 100644 index 000000000..90001f344 --- /dev/null +++ b/charts/misc-apps/examples/kube-downscaler.yaml @@ -0,0 +1,12 @@ +downscaler: + enabled: true + values: + debug: + enable: false + resources: + limits: + cpu: 50m + memory: 200Mi + excludedNamespaces: + - kube-system + - infra-downscaler diff --git a/charts/misc-apps/examples/signalilo.yaml b/charts/misc-apps/examples/signalilo.yaml new file mode 100644 index 000000000..e53df27a1 --- /dev/null +++ b/charts/misc-apps/examples/signalilo.yaml @@ -0,0 +1,23 @@ +signalilo: + enabled: true + values: + resources: + limits: + cpu: 50m + memory: 200Mi + config: + # needs replacing with a fresh uuid + uuid: + icinga_hostname: kubernetes.default.svc + icinga_url: https://icinga.int.example.com + icinga_username: api-user + icinga_password: secret + alertmanager_bearer_token: secret + extraEnvVars: + - name: SIGNALILO_ICINGA_DEBUG + value: "false" + # the CA of your icinga setup, if needed + - name: SIGNALILO_ICINGA_CA + value: | + -----BEGIN CERTIFICATE----- + -----END CERTIFICATE----- diff --git a/charts/misc-apps/templates/NOTES.txt b/charts/misc-apps/templates/NOTES.txt new file mode 100644 index 000000000..497a5a698 --- /dev/null +++ b/charts/misc-apps/templates/NOTES.txt @@ -0,0 +1,7 @@ +The following apps are available: +{{ if .Values.downscaler.enabled }} +* kube-downscaler +{{ end }} +{{ if .Values.signalilo.enabled }} +* signalilo +{{ end }} diff --git a/charts/misc-apps/templates/downscaler.yaml b/charts/misc-apps/templates/downscaler.yaml new file mode 100644 index 000000000..e5a95f8ec --- /dev/null +++ b/charts/misc-apps/templates/downscaler.yaml @@ -0,0 +1,33 @@ +{{ if .Values.downscaler.enabled }} +{{ template "argoconfig.application" (list . "misc-apps.downscaler") }} +{{ end }} + +{{- define "misc-apps.downscaler" -}}{{- $app := unset .Values.downscaler "enabled" -}}{{- $name := default $app.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/templates/signalilo.yaml b/charts/misc-apps/templates/signalilo.yaml new file mode 100644 index 000000000..1fb653877 --- /dev/null +++ b/charts/misc-apps/templates/signalilo.yaml @@ -0,0 +1,33 @@ +{{ if .Values.signalilo.enabled }} +{{ template "argoconfig.application" (list . "misc-apps.signalilo") }} +{{ end }} + +{{- define "misc-apps.signalilo" -}}{{- $app := unset .Values.signalilo "enabled" -}}{{- $name := default $app.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 new file mode 100644 index 000000000..6e23cd3e8 --- /dev/null +++ b/charts/misc-apps/values.yaml @@ -0,0 +1,27 @@ +# downscaler -- [kube-downscaler](https://github.com/hjacobs/kube-downscaler) +# @default -- see [values.yaml](./values.yaml) +downscaler: + # downscaler.enabled -- Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) + enabled: false + namespace: "infra-downscaler" + repoURL: "http://storage.googleapis.com/kubernetes-charts-incubator" + chart: "kube-downscaler" + # downscaler.targetRevision -- [kube-downscaler Helm chart](https://github.com/helm/charts/tree/master/incubator/kube-downscaler) version + targetRevision: "0.5.*" + # downscaler.values -- Helm values + # @default -- [upstream values](https://github.com/helm/charts/blob/master/incubator/kube-downscaler/values.yaml) + values: {} + +# signalilo -- [sigalilo](https://github.com/vshn/signalilo) +# @default -- see [values.yaml](./values.yaml) +signalilo: + # signalilo.enabled -- Enable signalilo: [example](./examples/signalilo.yaml) + enabled: false + namespace: "infra-signalilo" + repoURL: "https://charts.appuio.ch" + chart: "signalilo" + # signalilo.targetRevision -- [signalilo Helm chart](https://github.com/appuio/charts/tree/master/signalilo) version + targetRevision: "0.5.*" + # signalilo.values -- Helm values + # @default -- [upstream values](https://github.com/appuio/charts/blob/master/signalilo/values.yaml) + values: {} From f2c4b63953994191ea1b2c08a3ceeabd3f62fe51 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Tue, 8 Sep 2020 19:56:12 +0200 Subject: [PATCH 02/10] !fixup :sparkles: (misc-apps) init misc-app Co-authored-by: David Blaser <61097608+blaserd@users.noreply.github.com> --- charts/misc-apps/examples/kube-downscaler.yaml | 1 + charts/misc-apps/examples/signalilo.yaml | 1 + charts/misc-apps/values.yaml | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/misc-apps/examples/kube-downscaler.yaml b/charts/misc-apps/examples/kube-downscaler.yaml index 90001f344..313b886a3 100644 --- a/charts/misc-apps/examples/kube-downscaler.yaml +++ b/charts/misc-apps/examples/kube-downscaler.yaml @@ -1,5 +1,6 @@ downscaler: enabled: true + project: infra-downscaler values: debug: enable: false diff --git a/charts/misc-apps/examples/signalilo.yaml b/charts/misc-apps/examples/signalilo.yaml index e53df27a1..fbc3518a6 100644 --- a/charts/misc-apps/examples/signalilo.yaml +++ b/charts/misc-apps/examples/signalilo.yaml @@ -1,5 +1,6 @@ signalilo: enabled: true + project: infra-signalilo values: resources: limits: diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml index 6e23cd3e8..4c0e7109b 100644 --- a/charts/misc-apps/values.yaml +++ b/charts/misc-apps/values.yaml @@ -3,7 +3,8 @@ downscaler: # downscaler.enabled -- Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) enabled: false - namespace: "infra-downscaler" + destination: + namespace: "infra-downscaler" repoURL: "http://storage.googleapis.com/kubernetes-charts-incubator" chart: "kube-downscaler" # downscaler.targetRevision -- [kube-downscaler Helm chart](https://github.com/helm/charts/tree/master/incubator/kube-downscaler) version @@ -17,7 +18,8 @@ downscaler: signalilo: # signalilo.enabled -- Enable signalilo: [example](./examples/signalilo.yaml) enabled: false - namespace: "infra-signalilo" + destination: + namespace: "infra-signalilo" repoURL: "https://charts.appuio.ch" chart: "signalilo" # signalilo.targetRevision -- [signalilo Helm chart](https://github.com/appuio/charts/tree/master/signalilo) version From b3cf0d95ed5293e3fc08a82e53da5cb6e00e0ce1 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Tue, 8 Sep 2020 19:59:38 +0200 Subject: [PATCH 03/10] fixup! :sparkles: (misc-apps) init misc-app --- charts/misc-apps/Chart.lock | 6 +++--- charts/misc-apps/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/misc-apps/Chart.lock b/charts/misc-apps/Chart.lock index 575efd470..7e012317e 100644 --- a/charts/misc-apps/Chart.lock +++ b/charts/misc-apps/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: argoconfig repository: https://charts.adfinis.com - version: 0.6.0 -digest: sha256:d485e6aa8cea0d86794f8d88c90950809e83028a681121ef0d4bfed8c5674499 -generated: "2020-07-02T16:22:43.418846+02:00" + version: 0.6.3 +digest: sha256:0288146a81727cebb26606a32948691d2758b48c4a6c00ecc6bd5f413a5e4fa2 +generated: "2020-09-08T19:58:21.947318+02:00" diff --git a/charts/misc-apps/Chart.yaml b/charts/misc-apps/Chart.yaml index 933bfff67..c6f506d22 100644 --- a/charts/misc-apps/Chart.yaml +++ b/charts/misc-apps/Chart.yaml @@ -14,5 +14,5 @@ maintainers: url: https://adfinis.com dependencies: - name: argoconfig - version: 0.6.0 + version: 0.6.3 repository: https://charts.adfinis.com From de62508b8e07c7e55f71324b736fd7149ee94820 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Tue, 8 Sep 2020 20:32:56 +0200 Subject: [PATCH 04/10] fixup! :sparkles: (misc-apps) init misc-app --- charts/misc-apps/README.md | 11 ++++++++--- charts/misc-apps/values.yaml | 12 ++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/charts/misc-apps/README.md b/charts/misc-apps/README.md index 232044307..95c6541fe 100644 --- a/charts/misc-apps/README.md +++ b/charts/misc-apps/README.md @@ -17,17 +17,22 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | Repository | Name | Version | |------------|------|---------| -| https://charts.adfinis.com | argoconfig | 0.6.0 | +| https://charts.adfinis.com | argoconfig | 0.6.3 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| downscaler | object | see [values.yaml](./values.yaml) | [kube-downscaler](https://github.com/hjacobs/kube-downscaler) | +| downscaler | object | see below | [kube-downscaler](https://github.com/hjacobs/kube-downscaler) | +| downscaler.chart | string | `"kube-downscaler"` | Chart | +| downscaler.destination.namespace | string | `"infra-downscaler"` | Namespace | | downscaler.enabled | bool | `false` | Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) | +| downscaler.repoURL | string | [repo](http://storage.googleapis.com/kubernetes-charts-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 | -| signalilo | object | see [values.yaml](./values.yaml) | [sigalilo](https://github.com/vshn/signalilo) | +| signalilo | object | see below | [sigalilo](https://github.com/vshn/signalilo) | +| signalilo.chart | string | `"signalilo"` | Chart | +| signalilo.destination.namespace | string | `"infra-signalilo"` | Namespace | | signalilo.enabled | bool | `false` | Enable signalilo: [example](./examples/signalilo.yaml) | | signalilo.targetRevision | string | `"0.5.*"` | [signalilo Helm chart](https://github.com/appuio/charts/tree/master/signalilo) version | | signalilo.values | object | [upstream values](https://github.com/appuio/charts/blob/master/signalilo/values.yaml) | Helm values | diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml index 4c0e7109b..07359a70b 100644 --- a/charts/misc-apps/values.yaml +++ b/charts/misc-apps/values.yaml @@ -1,11 +1,15 @@ # downscaler -- [kube-downscaler](https://github.com/hjacobs/kube-downscaler) -# @default -- see [values.yaml](./values.yaml) +# @default -- see below downscaler: # downscaler.enabled -- Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) enabled: false destination: + # downscaler.destination.namespace -- Namespace namespace: "infra-downscaler" + # downscaler.repoURL -- Repo URL + # @default -- [repo](http://storage.googleapis.com/kubernetes-charts-incubator) repoURL: "http://storage.googleapis.com/kubernetes-charts-incubator" + # downscaler.chart -- Chart chart: "kube-downscaler" # downscaler.targetRevision -- [kube-downscaler Helm chart](https://github.com/helm/charts/tree/master/incubator/kube-downscaler) version targetRevision: "0.5.*" @@ -14,13 +18,17 @@ downscaler: values: {} # signalilo -- [sigalilo](https://github.com/vshn/signalilo) -# @default -- see [values.yaml](./values.yaml) +# @default -- see below signalilo: # signalilo.enabled -- Enable signalilo: [example](./examples/signalilo.yaml) enabled: false destination: + # signalilo.destination.namespace -- Namespace namespace: "infra-signalilo" + # signalilo.repoURL -- + # @default -- [repo](https://charts.appuio.ch) repoURL: "https://charts.appuio.ch" + # signalilo.chart -- Chart chart: "signalilo" # signalilo.targetRevision -- [signalilo Helm chart](https://github.com/appuio/charts/tree/master/signalilo) version targetRevision: "0.5.*" From aa1127997b25c118bb4a306a23e5ade35bc4e10b Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Tue, 8 Sep 2020 20:34:40 +0200 Subject: [PATCH 05/10] fixup! :sparkles: (misc-apps) init misc-app --- charts/misc-apps/README.md | 1 + charts/misc-apps/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/misc-apps/README.md b/charts/misc-apps/README.md index 95c6541fe..5558e7d5a 100644 --- a/charts/misc-apps/README.md +++ b/charts/misc-apps/README.md @@ -34,6 +34,7 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | signalilo.chart | string | `"signalilo"` | Chart | | signalilo.destination.namespace | string | `"infra-signalilo"` | Namespace | | signalilo.enabled | bool | `false` | Enable signalilo: [example](./examples/signalilo.yaml) | +| signalilo.repoURL | string | [repo](https://charts.appuio.ch) | Repo URL | | signalilo.targetRevision | string | `"0.5.*"` | [signalilo Helm chart](https://github.com/appuio/charts/tree/master/signalilo) version | | signalilo.values | object | [upstream values](https://github.com/appuio/charts/blob/master/signalilo/values.yaml) | Helm values | diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml index 07359a70b..f0627ea36 100644 --- a/charts/misc-apps/values.yaml +++ b/charts/misc-apps/values.yaml @@ -25,7 +25,7 @@ signalilo: destination: # signalilo.destination.namespace -- Namespace namespace: "infra-signalilo" - # signalilo.repoURL -- + # signalilo.repoURL -- Repo URL # @default -- [repo](https://charts.appuio.ch) repoURL: "https://charts.appuio.ch" # signalilo.chart -- Chart From 136fac137776c3a9fbe265d6eb8c8376facc65a4 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Tue, 8 Sep 2020 20:40:52 +0200 Subject: [PATCH 06/10] fixup! :sparkles: (misc-apps) init misc-app --- charts/misc-apps/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml index f0627ea36..247d4d2e6 100644 --- a/charts/misc-apps/values.yaml +++ b/charts/misc-apps/values.yaml @@ -3,6 +3,7 @@ downscaler: # downscaler.enabled -- Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) enabled: false + name: downscaler destination: # downscaler.destination.namespace -- Namespace namespace: "infra-downscaler" @@ -22,6 +23,7 @@ downscaler: signalilo: # signalilo.enabled -- Enable signalilo: [example](./examples/signalilo.yaml) enabled: false + name: signalilo destination: # signalilo.destination.namespace -- Namespace namespace: "infra-signalilo" From 8cc234f23517fdfa332bd30caa5a9f0ca386adfc Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Tue, 8 Sep 2020 21:25:41 +0200 Subject: [PATCH 07/10] fixup! :sparkles: (misc-apps) init misc-app --- charts/misc-apps/README.md | 8 ++++---- charts/misc-apps/values.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/misc-apps/README.md b/charts/misc-apps/README.md index 5558e7d5a..9f0a48878 100644 --- a/charts/misc-apps/README.md +++ b/charts/misc-apps/README.md @@ -23,17 +23,17 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | Key | Type | Default | Description | |-----|------|---------|-------------| -| downscaler | object | see below | [kube-downscaler](https://github.com/hjacobs/kube-downscaler) | +| downscaler | object | [example](./examples/kube-downscaler.yaml) | [kube-downscaler](https://github.com/hjacobs/kube-downscaler) | | downscaler.chart | string | `"kube-downscaler"` | Chart | | downscaler.destination.namespace | string | `"infra-downscaler"` | Namespace | -| downscaler.enabled | bool | `false` | Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) | +| downscaler.enabled | bool | `false` | Enable kube-downscaler | | downscaler.repoURL | string | [repo](http://storage.googleapis.com/kubernetes-charts-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 | -| signalilo | object | see below | [sigalilo](https://github.com/vshn/signalilo) | +| signalilo | object | [example](./examples/signalilo.yaml) | [sigalilo](https://github.com/vshn/signalilo) | | signalilo.chart | string | `"signalilo"` | Chart | | signalilo.destination.namespace | string | `"infra-signalilo"` | Namespace | -| signalilo.enabled | bool | `false` | Enable signalilo: [example](./examples/signalilo.yaml) | +| signalilo.enabled | bool | `false` | Enable signalilo | | signalilo.repoURL | string | [repo](https://charts.appuio.ch) | Repo URL | | signalilo.targetRevision | string | `"0.5.*"` | [signalilo Helm chart](https://github.com/appuio/charts/tree/master/signalilo) version | | signalilo.values | object | [upstream values](https://github.com/appuio/charts/blob/master/signalilo/values.yaml) | Helm values | diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml index 247d4d2e6..4455a56b3 100644 --- a/charts/misc-apps/values.yaml +++ b/charts/misc-apps/values.yaml @@ -1,7 +1,7 @@ # downscaler -- [kube-downscaler](https://github.com/hjacobs/kube-downscaler) -# @default -- see below +# @default -- [example](./examples/kube-downscaler.yaml) downscaler: - # downscaler.enabled -- Enable kube-downscaler: [example](./examples/kube-downscaler.yaml) + # downscaler.enabled -- Enable kube-downscaler enabled: false name: downscaler destination: @@ -19,9 +19,9 @@ downscaler: values: {} # signalilo -- [sigalilo](https://github.com/vshn/signalilo) -# @default -- see below +# @default -- [example](./examples/signalilo.yaml) signalilo: - # signalilo.enabled -- Enable signalilo: [example](./examples/signalilo.yaml) + # signalilo.enabled -- Enable signalilo enabled: false name: signalilo destination: From b1bf1f3dfb49a66d84191f4edb5680648ba5dee9 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 9 Sep 2020 16:30:53 +0200 Subject: [PATCH 08/10] fixup! :sparkles: (misc-apps) init misc-app --- charts/misc-apps/README.md | 4 ++-- charts/misc-apps/values.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/misc-apps/README.md b/charts/misc-apps/README.md index 9f0a48878..65959dfa9 100644 --- a/charts/misc-apps/README.md +++ b/charts/misc-apps/README.md @@ -23,14 +23,14 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | Key | Type | Default | Description | |-----|------|---------|-------------| -| downscaler | object | [example](./examples/kube-downscaler.yaml) | [kube-downscaler](https://github.com/hjacobs/kube-downscaler) | +| downscaler | object | - | [kube-downscaler](https://github.com/hjacobs/kube-downscaler) ([example](./examples/kube-downscaler.yaml)) | | downscaler.chart | string | `"kube-downscaler"` | Chart | | downscaler.destination.namespace | string | `"infra-downscaler"` | Namespace | | downscaler.enabled | bool | `false` | Enable kube-downscaler | | downscaler.repoURL | string | [repo](http://storage.googleapis.com/kubernetes-charts-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 | -| signalilo | object | [example](./examples/signalilo.yaml) | [sigalilo](https://github.com/vshn/signalilo) | +| signalilo | object | - | [sigalilo](https://github.com/vshn/signalilo) ([example](./examples/signalilo.yaml)) | | signalilo.chart | string | `"signalilo"` | Chart | | signalilo.destination.namespace | string | `"infra-signalilo"` | Namespace | | signalilo.enabled | bool | `false` | Enable signalilo | diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml index 4455a56b3..b626a9680 100644 --- a/charts/misc-apps/values.yaml +++ b/charts/misc-apps/values.yaml @@ -1,5 +1,5 @@ -# downscaler -- [kube-downscaler](https://github.com/hjacobs/kube-downscaler) -# @default -- [example](./examples/kube-downscaler.yaml) +# downscaler -- [kube-downscaler](https://github.com/hjacobs/kube-downscaler) ([example](./examples/kube-downscaler.yaml)) +# @default -- - downscaler: # downscaler.enabled -- Enable kube-downscaler enabled: false @@ -18,8 +18,8 @@ downscaler: # @default -- [upstream values](https://github.com/helm/charts/blob/master/incubator/kube-downscaler/values.yaml) values: {} -# signalilo -- [sigalilo](https://github.com/vshn/signalilo) -# @default -- [example](./examples/signalilo.yaml) +# signalilo -- [sigalilo](https://github.com/vshn/signalilo) ([example](./examples/signalilo.yaml)) +# @default -- - signalilo: # signalilo.enabled -- Enable signalilo enabled: false From 3ece9eb1ccf527e93e7ded1ab7e5ca00e2880f3f Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 9 Sep 2020 16:41:55 +0200 Subject: [PATCH 09/10] fixup! :sparkles: (misc-apps) init misc-app --- charts/misc-apps/templates/downscaler.yaml | 2 +- charts/misc-apps/templates/signalilo.yaml | 2 +- charts/misc-apps/values.yaml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/charts/misc-apps/templates/downscaler.yaml b/charts/misc-apps/templates/downscaler.yaml index e5a95f8ec..f1cabb2ff 100644 --- a/charts/misc-apps/templates/downscaler.yaml +++ b/charts/misc-apps/templates/downscaler.yaml @@ -2,7 +2,7 @@ {{ template "argoconfig.application" (list . "misc-apps.downscaler") }} {{ end }} -{{- define "misc-apps.downscaler" -}}{{- $app := unset .Values.downscaler "enabled" -}}{{- $name := default $app.namespace $app.name -}} +{{- define "misc-apps.downscaler" -}}{{- $app := unset .Values.downscaler "enabled" -}}{{- $name := default $app.destination.namespace $app.name -}} metadata: name: {{ template "common.fullname" . }}-{{ $name }} spec: diff --git a/charts/misc-apps/templates/signalilo.yaml b/charts/misc-apps/templates/signalilo.yaml index 1fb653877..f531e40bb 100644 --- a/charts/misc-apps/templates/signalilo.yaml +++ b/charts/misc-apps/templates/signalilo.yaml @@ -2,7 +2,7 @@ {{ template "argoconfig.application" (list . "misc-apps.signalilo") }} {{ end }} -{{- define "misc-apps.signalilo" -}}{{- $app := unset .Values.signalilo "enabled" -}}{{- $name := default $app.namespace $app.name -}} +{{- define "misc-apps.signalilo" -}}{{- $app := unset .Values.signalilo "enabled" -}}{{- $name := default $app.destination.namespace $app.name -}} metadata: name: {{ template "common.fullname" . }}-{{ $name }} spec: diff --git a/charts/misc-apps/values.yaml b/charts/misc-apps/values.yaml index b626a9680..a118ddfd0 100644 --- a/charts/misc-apps/values.yaml +++ b/charts/misc-apps/values.yaml @@ -3,7 +3,6 @@ downscaler: # downscaler.enabled -- Enable kube-downscaler enabled: false - name: downscaler destination: # downscaler.destination.namespace -- Namespace namespace: "infra-downscaler" @@ -23,7 +22,6 @@ downscaler: signalilo: # signalilo.enabled -- Enable signalilo enabled: false - name: signalilo destination: # signalilo.destination.namespace -- Namespace namespace: "infra-signalilo" From e8970915ed30940bb1591eeb46df394fab7479e7 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 9 Sep 2020 16:46:38 +0200 Subject: [PATCH 10/10] fixup! :sparkles: (misc-apps) init misc-app Co-authored-by: David Blaser <61097608+blaserd@users.noreply.github.com> --- charts/misc-apps/examples/signalilo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/misc-apps/examples/signalilo.yaml b/charts/misc-apps/examples/signalilo.yaml index fbc3518a6..9d1fb85f5 100644 --- a/charts/misc-apps/examples/signalilo.yaml +++ b/charts/misc-apps/examples/signalilo.yaml @@ -4,7 +4,7 @@ signalilo: values: resources: limits: - cpu: 50m + cpu: 100m memory: 200Mi config: # needs replacing with a fresh uuid