Skip to content

Support re-using LAPI credentials in Agent and AppSec #266

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

Open
krezovic wants to merge 1 commit into
base: main
Choose a base branch
from
+90 −3
Open

Support re-using LAPI credentials in Agent and AppSec #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 30 additions & 1 deletion charts/crowdsec/templates/agent-daemonSet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,36 @@ spec:
- name: wait-for-lapi-and-register
image: "{{ .Values.image.repository | default "crowdsecurity/crowdsec" }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: ['sh', '-c', 'until nc "$LAPI_HOST" "$LAPI_PORT" -z; do echo waiting for lapi to start; sleep 5; done; ln -s /staging/etc/crowdsec /etc/crowdsec && cscli lapi register --machine "$USERNAME" -u "$LAPI_URL" --token "$REGISTRATION_TOKEN" && cp /etc/crowdsec/local_api_credentials.yaml /tmp_config/local_api_credentials.yaml']
command:
- sh
- "-c"
- |
until nc "$LAPI_HOST" "$LAPI_PORT" -z; do
echo waiting for lapi to start
sleep 5
done

ln -s /staging/etc/crowdsec /etc/crowdsec

if test -f /tmp_config/local_api_credentials.yaml
then
cp /tmp_config/local_api_credentials.yaml /etc/crowdsec/local_api_credentials.yaml

cscli lapi status &>/dev/null
val=$?

if test $val -eq 0
then
echo "Credentials found and valid"
exit 0
else
echo "Credentials found but not valid, trying re-register"
fi
fi

set -e
cscli lapi register --machine "$USERNAME" -u "$LAPI_URL" --token "$REGISTRATION_TOKEN"
cp /etc/crowdsec/local_api_credentials.yaml /tmp_config/local_api_credentials.yaml
{{- else }}
- name: wait-for-lapi
image: "{{ .Values.agent.wait_for_lapi.image.repository }}:{{ .Values.agent.wait_for_lapi.image.tag }}"
Expand Down
31 changes: 30 additions & 1 deletion charts/crowdsec/templates/agent-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,36 @@ spec:
- name: wait-for-lapi-and-register
image: "{{ .Values.image.repository | default "crowdsecurity/crowdsec" }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: ['sh', '-c', 'until nc "$LAPI_HOST" "$LAPI_PORT" -z; do echo waiting for lapi to start; sleep 5; done; ln -s /staging/etc/crowdsec /etc/crowdsec && cscli lapi register --machine "$USERNAME" -u "$LAPI_URL" --token "$REGISTRATION_TOKEN" && cp /etc/crowdsec/local_api_credentials.yaml /tmp_config/local_api_credentials.yaml']
command:
- sh
- "-c"
- |
until nc "$LAPI_HOST" "$LAPI_PORT" -z; do
echo waiting for lapi to start
sleep 5
done

ln -s /staging/etc/crowdsec /etc/crowdsec

if test -f /tmp_config/local_api_credentials.yaml
then
cp /tmp_config/local_api_credentials.yaml /etc/crowdsec/local_api_credentials.yaml

cscli lapi status &>/dev/null
val=$?

if test $val -eq 0
then
echo "Credentials found and valid"
exit 0
else
echo "Credentials found but not valid, trying re-register"
fi
fi

set -e
cscli lapi register --machine "$USERNAME" -u "$LAPI_URL" --token "$REGISTRATION_TOKEN"
cp /etc/crowdsec/local_api_credentials.yaml /tmp_config/local_api_credentials.yaml
{{- else }}
- name: wait-for-lapi
image: "{{ .Values.agent.wait_for_lapi.image.repository }}:{{ .Values.agent.wait_for_lapi.image.tag }}"
Expand Down
31 changes: 30 additions & 1 deletion charts/crowdsec/templates/appsec-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,36 @@ spec:
- name: wait-for-lapi-and-register
image: "{{ .Values.image.repository | default "crowdsecurity/crowdsec" }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: ['sh', '-c', 'until nc "$LAPI_HOST" "$LAPI_PORT" -z; do echo waiting for lapi to start; sleep 5; done; ln -s /staging/etc/crowdsec /etc/crowdsec && cscli lapi register --machine "$USERNAME" -u "$LAPI_URL" --token "$REGISTRATION_TOKEN" && cp /etc/crowdsec/local_api_credentials.yaml /tmp_config/local_api_credentials.yaml']
command:
- sh
- "-c"
- |
until nc "$LAPI_HOST" "$LAPI_PORT" -z; do
echo waiting for lapi to start
sleep 5
done

ln -s /staging/etc/crowdsec /etc/crowdsec

if test -f /tmp_config/local_api_credentials.yaml
then
cp /tmp_config/local_api_credentials.yaml /etc/crowdsec/local_api_credentials.yaml

cscli lapi status &>/dev/null
val=$?

if test $val -eq 0
then
echo "Credentials found and valid"
exit 0
else
echo "Credentials found but not valid, trying re-register"
fi
fi

set -e
cscli lapi register --machine "$USERNAME" -u "$LAPI_URL" --token "$REGISTRATION_TOKEN"
cp /etc/crowdsec/local_api_credentials.yaml /tmp_config/local_api_credentials.yaml
{{- else }}
- name: wait-for-lapi
image: "{{ .Values.appsec.wait_for_lapi.image.repository }}:{{ .Values.appsec.wait_for_lapi.image.tag }}"
Expand Down