Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bumped graylog version #324

Merged
merged 5 commits into from
Sep 11, 2024
Merged

Bumped graylog version #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
243c2d6
Bumped graylog version
keyvaann Sep 11, 2024
796a892
Don't pass URLs to radar-home if the service isn't enabled
keyvaann Sep 11, 2024
ca14ffa
Enable logging and monitoring during CI tests
keyvaann Sep 11, 2024
17dc57f
Continue CI run when K3S has already been deleted
keyvaann Sep 11, 2024
7e19d1a
Updated radar-gateway version
keyvaann Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -59,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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this not cause troubles when K3S is not installed for some reason? Why did you remove this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It isn't removed, it's added

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh perfect then!

curl -sfL https://get.k3s.io | sh -s - --disable traefik --disable-helm-controller
cp /etc/rancher/k3s/k3s.yaml ~/.kube/config

Expand Down
4 changes: 2 additions & 2 deletions etc/base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
8 changes: 8 additions & 0 deletions helmfile.d/10-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading