diff --git a/.github/workflows/helm-ci.yml b/.github/workflows/helm-ci.yml index e5ab883..4666047 100644 --- a/.github/workflows/helm-ci.yml +++ b/.github/workflows/helm-ci.yml @@ -18,3 +18,49 @@ jobs: - name: Lint Yaml run: make helm-lint + + call-test: + name: Test Helm Chart + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Set up Helm + uses: azure/setup-helm@v3 + with: + version: v3.8.2 + + # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and + # yamllint (https://github.com/adrienverge/yamllint) which require Python + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.7 + + - name: Set up chart-testing + uses: helm/chart-testing-action@v2.4.0 + + - name: Run chart-testing (list-changed) + id: list-changed + run: | + changed=$(ct list-changed --config "${CT_CONFIGFILE}") + if [[ -n "$changed" ]]; then + echo "changed=true" >> $GITHUB_OUTPUT + fi + + - name: Run chart-testing (lint) + run: ct lint --config "${CT_CONFIGFILE}" --check-version-increment=false + + - name: Create kind cluster + uses: helm/kind-action@v1.8.0 + if: steps.list-changed.outputs.changed == 'true' + with: + config: tools/kind.config + + - name: Run chart-testing (install) + run: | + changed=$(ct list-changed --config "${CT_CONFIGFILE}") + ct install --config "${CT_CONFIGFILE}" diff --git a/charts/meta-monitoring/Chart.lock b/charts/meta-monitoring/Chart.lock index 94afcbb..aebffcb 100644 --- a/charts/meta-monitoring/Chart.lock +++ b/charts/meta-monitoring/Chart.lock @@ -14,5 +14,5 @@ dependencies: - name: minio repository: https://charts.min.io version: 5.0.11 -digest: sha256:4b04084e6fe821c4d481017b2430f7c8cd782a5d60830dd3a24eb8f10a9ece09 -generated: "2023-06-29T14:25:07.247853+01:00" +digest: sha256:da0e744b5046eb7972e0bf82d1d0ba4786e9600af63b65f35b16118105248074 +generated: "2023-08-18T10:58:08.978123+01:00" diff --git a/charts/meta-monitoring/Chart.yaml b/charts/meta-monitoring/Chart.yaml index bf3052c..22823e0 100644 --- a/charts/meta-monitoring/Chart.yaml +++ b/charts/meta-monitoring/Chart.yaml @@ -25,21 +25,21 @@ appVersion: "0.0.1" dependencies: - name: loki - repository: https://grafana.github.io/helm-charts + repository: https://grafana.github.io/helm-charts version: "5.8.0" condition: local.logs.enabled - name: grafana-agent - repository: https://grafana.github.io/helm-charts + repository: https://grafana.github.io/helm-charts version: "0.15.0" - name: mimir-distributed - repository: https://grafana.github.io/helm-charts + repository: https://grafana.github.io/helm-charts version: "4.4.1" condition: local.metrics.enabled - name: tempo-distributed - repository: https://grafana.github.io/helm-charts + repository: https://grafana.github.io/helm-charts version: "1.4.7" condition: local.traces.enabled - name: minio repository: https://charts.min.io version: "5.0.11" - condition: local.minio.enabled \ No newline at end of file + condition: local.minio.enabled diff --git a/charts/meta-monitoring/ct.yaml b/charts/meta-monitoring/ct.yaml new file mode 100644 index 0000000..506f060 --- /dev/null +++ b/charts/meta-monitoring/ct.yaml @@ -0,0 +1,11 @@ +--- +remote: origin +target-branch: main +chart-dirs: + - charts +chart-repos: + - grafana=https://grafana.github.io/helm-charts + - minio=https://charts.min.io +helm-extra-args: --timeout 1200s +check-version-increment: false +validate-maintainers: false diff --git a/charts/meta-monitoring/templates/grafana/mimir-dahboards-5.yaml b/charts/meta-monitoring/templates/grafana/mimir-dashboards-5.yaml similarity index 100% rename from charts/meta-monitoring/templates/grafana/mimir-dahboards-5.yaml rename to charts/meta-monitoring/templates/grafana/mimir-dashboards-5.yaml diff --git a/charts/meta-monitoring/templates/ruler/ruler.yaml b/charts/meta-monitoring/templates/ruler/ruler.yaml index 9fae6e4..99fafb8 100644 --- a/charts/meta-monitoring/templates/ruler/ruler.yaml +++ b/charts/meta-monitoring/templates/ruler/ruler.yaml @@ -1,9 +1,10 @@ +{{- if .Values.local.metrics.enabled }} {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }} apiVersion: apps/v1 kind: Deployment metadata: name: meta-mimir-ruler-for-dashboards - namespace: meta + namespace: {{ $.Release.Namespace }} spec: progressDeadlineSeconds: 600 replicas: 1 @@ -24,7 +25,7 @@ spec: app.kubernetes.io/component: ruler-for-dashboards app.kubernetes.io/instance: meta app.kubernetes.io/name: mimir - namespace: meta + namespace: {{ $.Release.Namespace }} spec: containers: - args: @@ -91,8 +92,6 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccount: meta-mimir - serviceAccountName: meta-mimir terminationGracePeriodSeconds: 180 topologySpreadConstraints: - labelSelector: @@ -124,3 +123,4 @@ spec: name: rules name: rules {{- end }} +{{- end }} diff --git a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml index c3396ef..c2cb34a 100644 --- a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml +++ b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml @@ -1,3 +1,4 @@ +{{- if .Values.local.metrics.enabled }} {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }} --- apiVersion: v1 @@ -16,3 +17,4 @@ data: {{ ($.Files.Glob "src/rules/tempo-rules.yaml").AsConfig | indent 2 }} {{- end }} {{- end }} +{{- end }} diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml index 76cf7d5..d0a26ff 100644 --- a/charts/meta-monitoring/values.yaml +++ b/charts/meta-monitoring/values.yaml @@ -6,6 +6,24 @@ namespacesToMonitor: # The name of the cluster where this will be installed clusterName: "meta-monitoring" +# Set to true to write logs, metrics or traces to Grafana Cloud +cloud: + logs: + enabled: true + endpoint: to_be_changed + username: to_be_changed + password: to_be_changed + metrics: + enabled: true + endpoint: to_be_changed + username: to_be_changed + password: to_be_changed + traces: + enabled: true + endpoint: to_be_changed + username: to_be_changed + password: to_be_changed + # Set to true for a local version of logs, metrics or traces local: logs: @@ -17,24 +35,6 @@ local: minio: enabled: false # This should be set to true if any of the previous is enabled -# Set to true to write logs, metrics or traces to Grafana Cloud -cloud: - logs: - enabled: true - endpoint: - username: - password: - metrics: - enabled: true - endpoint: - username: - password: - traces: - enabled: true - endpoint: - username: - password: - # Adding regexes here will add a stage.replace block for logs. For more information see # https://grafana.com/docs/agent/latest/flow/reference/components/loki.process/#stagereplace-block logs: @@ -193,4 +193,4 @@ minio: cpu: 100m memory: 128Mi # Changed the mc config path to '/tmp' from '/etc' as '/etc' is only writable by root and OpenShift will not permit this. - configPathmc: "/tmp/minio/mc/" \ No newline at end of file + configPathmc: "/tmp/minio/mc/" diff --git a/tools/kind.config b/tools/kind.config new file mode 100644 index 0000000..8a842ce --- /dev/null +++ b/tools/kind.config @@ -0,0 +1,9 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +name: meta +nodes: +- role: control-plane +- role: worker +- role: worker +- role: worker +