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

Only download kubectl and provide volume if graylog version is < 4.2.0-0 #154

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Only download kubectl and provide volume if graylog version is < 4.2.0-0 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7108a4
Only download kubectl and provide volume if graylog version is < 4.2.0-0
tuxBurner Jan 2, 2024
9c66710
Bumped chart version to 2.3.5
tuxBurner Jan 2, 2024
5ed06cb
Removed master detection and added env POD_NAME
tuxBurner Jan 2, 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
2 changes: 1 addition & 1 deletion charts/graylog/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: graylog
home: https://www.graylog.org
version: 2.3.4
version: 2.3.5
Copy link
Owner

Choose a reason for hiding this comment

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

Please bump chart version one more.

appVersion: 5.0.3
description: Graylog is the centralized log management solution built to open
standards for capturing, storing, and enabling real-time analysis of terabytes
Expand Down
60 changes: 30 additions & 30 deletions charts/graylog/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,36 +162,36 @@ data:
find ${GRAYLOG_HOME}/plugins-default/ -type f -exec cp {} ${GRAYLOG_PLUGIN_DIR} \;
# Looking for Master IP
retry=1
for i in {0..2}
do
MASTER_IP=`/k8s/kubectl --namespace {{ .Release.Namespace }} get pod -o jsonpath='{range .items[*]}{.metadata.name} {.status.podIP}{"\n"}{end}' -l graylog-role=master --field-selector=status.phase=Running|awk '{print $2}'`
SELF_IP=`/k8s/kubectl --namespace {{ .Release.Namespace }} get pod $HOSTNAME -o jsonpath='{.status.podIP}'`
echo "Current master is $MASTER_IP"
echo "Self IP is $SELF_IP"
retry=$((retry+1))
[[ ! -z "$MASTER_IP" ]] && break
echo "[Try ${retry}/3] Waiting for master node..."
sleep 2
done
if [[ -z "$MASTER_IP" ]]; then
echo "Launching $HOSTNAME as master"
export GRAYLOG_IS_MASTER="true"
export GRAYLOG_IS_LEADER="true"
/k8s/kubectl --namespace {{ .Release.Namespace }} label --overwrite pod $HOSTNAME graylog-role="master"
else
# When container was recreated or restart, MASTER_IP == SELF_IP, running as master and no need to change label graylog-role="master"
if [ "$SELF_IP" == "$MASTER_IP" ];then
echo "Launching $HOSTNAME as master"
export GRAYLOG_IS_MASTER="true"
export GRAYLOG_IS_LEADER="true"
else
# MASTER_IP != SELF_IP, running as coordinating
echo "Launching $HOSTNAME as coordinating"
export GRAYLOG_IS_MASTER="false"
export GRAYLOG_IS_LEADER="false"
/k8s/kubectl --namespace {{ .Release.Namespace }} label --overwrite pod $HOSTNAME graylog-role="coordinating"
fi
fi
#for i in {0..2}
Copy link
Owner

Choose a reason for hiding this comment

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

@tuxBurner sorry for being late. Instead of commenting out, it would be better to delete them from manifest.

#do
# MASTER_IP=`/k8s/kubectl --namespace {{ .Release.Namespace }} get pod -o jsonpath='{range .items[*]}{.metadata.name} {.status.podIP}{"\n"}{end}' -l graylog-role=master --field-selector=status.phase=Running|awk '{print $2}'`
# SELF_IP=`/k8s/kubectl --namespace {{ .Release.Namespace }} get pod $HOSTNAME -o jsonpath='{.status.podIP}'`
# echo "Current master is $MASTER_IP"
# echo "Self IP is $SELF_IP"
# retry=$((retry+1))
# [[ ! -z "$MASTER_IP" ]] && break
# echo "[Try ${retry}/3] Waiting for master node..."
# sleep 2
#done
#if [[ -z "$MASTER_IP" ]]; then
# echo "Launching $HOSTNAME as master"
# export GRAYLOG_IS_MASTER="true"
# export GRAYLOG_IS_LEADER="true"
# /k8s/kubectl --namespace {{ .Release.Namespace }} label --overwrite pod $HOSTNAME graylog-role="master"
#else
# # When container was recreated or restart, MASTER_IP == SELF_IP, running as master and no need to change label graylog-role="master"
# if [ "$SELF_IP" == "$MASTER_IP" ];then
# echo "Launching $HOSTNAME as master"
# export GRAYLOG_IS_MASTER="true"
# export GRAYLOG_IS_LEADER="true"
# else
# # MASTER_IP != SELF_IP, running as coordinating
# echo "Launching $HOSTNAME as coordinating"
# export GRAYLOG_IS_MASTER="false"
# export GRAYLOG_IS_LEADER="false"
# /k8s/kubectl --namespace {{ .Release.Namespace }} label --overwrite pod $HOSTNAME graylog-role="coordinating"
# fi
#fi
# Download plugins
{{- if .Values.graylog.plugins.proxy.enabled }}
export https_proxy={{ .Values.graylog.plugins.proxy.host }}
Expand Down
16 changes: 15 additions & 1 deletion charts/graylog/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
{{- with .Values.graylog.customLabels }}
{{ . | toYaml | indent 4 }}
{{- end }}
{{ $graylogVersion := .Values.graylog.image.tag | default .Chart.AppVersion }}
spec:
serviceName: {{ template "graylog.service.headless.name" . }}
replicas: {{ .Values.graylog.replicas }}
Expand Down Expand Up @@ -72,12 +73,14 @@ spec:
rm -rf /usr/share/graylog/data/journal/messagejournal-0
rm -rf /usr/share/graylog/data/journal/recovery-point-offset-checkpoint
{{- end }}
{{- if semverCompare "< 4.2.0-0" ( $graylogVersion ) }}
Copy link
Owner

Choose a reason for hiding this comment

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

The Graylog 4 is very out of date. We can say the chart no longer supports Graylog version < 4.2.
You can remove all kubectl related.

{{- if .Values.graylog.init.kubectlLocation }}
wget {{ .Values.graylog.init.kubectlLocation }} -O /k8s/kubectl
{{- else }}
wget https://storage.googleapis.com/kubernetes-release/release/{{ .Values.graylog.init.kubectlVersion | default .Capabilities.KubeVersion.Version }}/bin/linux/amd64/kubectl -O /k8s/kubectl
{{- end }}
chmod +x /k8s/kubectl
{{- end }}

GRAYLOG_HOME=/usr/share/graylog
chown -R 1100:1100 ${GRAYLOG_HOME}/data/
Expand All @@ -89,8 +92,10 @@ spec:
volumeMounts:
- name: journal
mountPath: /usr/share/graylog/data/journal
{{- if semverCompare "< 4.2.0-0" ( $graylogVersion ) }}
- name: kubectl
mountPath: /k8s
{{- end }}
{{- if .Values.graylog.init.resources }}
resources:
{{ toYaml .Values.graylog.init.resources | indent 12 }}
Expand All @@ -105,6 +110,12 @@ spec:
command:
- /entrypoint.sh
env:
# Kubernetes Auto Master Selection
# https://go2docs.graylog.org/5-0/downloading_and_installing_graylog/docker_installation.htm#KubernetesAutomaticMasterSelection
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: GRAYLOG_SERVER_JAVA_OPTS
{{- $javaOpts := .Values.graylog.javaOpts }}
{{- if .Values.graylog.heapSize }}
Expand Down Expand Up @@ -224,12 +235,13 @@ spec:
- name: files
mountPath: /etc/graylog/server
{{- end }}
{{- if semverCompare "< 4.2.0-0" ( $graylogVersion ) }}
- name: kubectl
mountPath: /k8s
{{- end }}
{{- if .Values.graylog.extraVolumeMounts }}
{{ toYaml .Values.graylog.extraVolumeMounts | nindent 12 }}
{{- end }}
{{ $graylogVersion := .Values.graylog.image.tag | default .Chart.AppVersion }}
{{- if semverCompare "< 4.2.0-0" ( $graylogVersion ) }}
lifecycle:
preStop:
Expand Down Expand Up @@ -271,8 +283,10 @@ spec:
configMap:
name: {{ template "graylog.fullname" . }}-files
{{- end }}
{{- if semverCompare "< 4.2.0-0" ( $graylogVersion ) }}
- name: kubectl
emptyDir: {}
{{- end }}
{{- if .Values.graylog.extraVolumes }}
{{ toYaml .Values.graylog.extraVolumes | nindent 8 }}
{{- end }}
Expand Down