From 243c2d6353e91052caa73d7b042b1c43149793f1 Mon Sep 17 00:00:00 2001 From: Keyvan Date: Wed, 11 Sep 2024 11:39:47 +0200 Subject: [PATCH 1/5] Bumped graylog version --- etc/base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/base.yaml b/etc/base.yaml index 224998db..2e005b33 100644 --- a/etc/base.yaml +++ b/etc/base.yaml @@ -38,7 +38,7 @@ elasticsearch: graylog: _install: true - _chart_version: 2.2.0 + _chart_version: 2.2.1 _extra_timeout: 180 # Needed for graylog. If graylog is set not to install, this can be disabled as well. From 796a892594d3f204bf25aa42a290cff2c6b54e8e Mon Sep 17 00:00:00 2001 From: Keyvan Date: Wed, 11 Sep 2024 11:57:32 +0200 Subject: [PATCH 2/5] Don't pass URLs to radar-home if the service isn't enabled --- helmfile.d/10-services.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/helmfile.d/10-services.yaml b/helmfile.d/10-services.yaml index 8eb02f8d..d42e2a44 100644 --- a/helmfile.d/10-services.yaml +++ b/helmfile.d/10-services.yaml @@ -194,24 +194,32 @@ releases: values: [ {{ .Values.server_name }} ] - name: s3.enabled value: {{ dig "s3" "enabled" .Values.minio._install .Values.radar_home }} + {{ if dig "s3" "enabled" .Values.minio._install .Values.radar_home }} - name: s3.url value: {{ dig "s3" "url" (printf "https://s3.%s/login" .Values.server_name) .Values.radar_home }} + {{ end }} - name: dashboard.enabled value: {{ dig "dashboard" "enabled" .Values.radar_grafana._install .Values.radar_home }} + {{ if dig "dashboard" "enabled" .Values.radar_grafana._install .Values.radar_home }} - name: dashboard.url value: {{ dig "dashboard" "url" (printf "https://dashboard.%s/" .Values.server_name) .Values.radar_home }} + {{ end }} - name: uploadPortal.enabled value: {{ dig "uploadPortal" "enabled" .Values.radar_upload_connect_frontend._install .Values.radar_home }} - name: restAuthorizer.enabled value: {{ dig "restAuthorizer" "enabled" .Values.radar_rest_sources_authorizer._install .Values.radar_home }} - name: monitoring.enabled value: {{ dig "monitoring" "enabled" .Values.kube_prometheus_stack._install .Values.radar_home }} + {{ if dig "monitoring" "enabled" .Values.kube_prometheus_stack._install .Values.radar_home }} - name: monitoring.url value: {{ dig "monitoring" "url" (printf "https://grafana.%s/login" .Values.server_name) .Values.radar_home }} + {{ end }} - name: logging.enabled value: {{ dig "logging" "enabled" .Values.graylog._install .Values.radar_home }} + {{ if dig "logging" "enabled" .Values.graylog._install .Values.radar_home }} - name: logging.url value: {{ dig "logging" "url" (printf "https://graylog.%s/" .Values.server_name) .Values.radar_home }} + {{ end }} - name: postgresql chart: radar/postgresql From ca14ffa63bc8fab9d6ab0d5a0ad234be7ecd7da3 Mon Sep 17 00:00:00 2001 From: Keyvan Date: Wed, 11 Sep 2024 12:00:42 +0200 Subject: [PATCH 3/5] Enable logging and monitoring during CI tests --- .github/workflows/push.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 4248f1d2..547b09d7 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -9,7 +9,7 @@ on: description: "Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)" required: false default: false - + jobs: install: strategy: @@ -47,6 +47,7 @@ jobs: helmfile_mods+='\ \ \ \ \ \ - ../.github/ci_config/secrets.yaml.gotmpl' sed -i "/secrets.yaml/a $helmfile_mods" environments.yaml sed -i '/_install: /s/false/true/' etc/production.yaml + sed -i '/enable_logging_monitoring: /s/false/true/' etc/production.yaml - name: Run helmfile template env: From 17dc57faa827bda8a9b09cc488345c38c81425c0 Mon Sep 17 00:00:00 2001 From: Keyvan Date: Wed, 11 Sep 2024 12:07:57 +0200 Subject: [PATCH 4/5] Continue CI run when K3S has already been deleted --- .github/workflows/push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 547b09d7..feed03c6 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -60,7 +60,7 @@ jobs: INSTALL_K3S_VERSION: ${{ matrix.K3S_VERSION }} K3S_KUBECONFIG_MODE: "644" run: | - /usr/local/bin/k3s-uninstall.sh + /usr/local/bin/k3s-uninstall.sh || true curl -sfL https://get.k3s.io | sh -s - --disable traefik --disable-helm-controller cp /etc/rancher/k3s/k3s.yaml ~/.kube/config From 7e19d1abf435963d8fd2dea04e61efa0736a87c7 Mon Sep 17 00:00:00 2001 From: Keyvan Date: Wed, 11 Sep 2024 14:04:49 +0200 Subject: [PATCH 5/5] Updated radar-gateway version --- etc/base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/base.yaml b/etc/base.yaml index 2e005b33..baeca02e 100644 --- a/etc/base.yaml +++ b/etc/base.yaml @@ -397,7 +397,7 @@ ksql_server: radar_gateway: _install: true - _chart_version: 1.2.0 + _chart_version: 1.2.1 _extra_timeout: 0 replicaCount: 1