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

add command to openldap container #194

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

add command to openldap container #194

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
312d16b
add command to openldap container to ensure non-first containers dont…
davidfrickert Sep 10, 2024
376e94b
Merge branch 'jp-gouin:master' into feat/fix-openldap-init-issue
davidfrickert Oct 1, 2024
f25cf0d
Merge commit 'c22e62eff5bb08817acb0f92ca9bcc5bf294f5ec' into feat/fix…
davidfrickert Nov 6, 2024
b67d654
Merge branch 'feat/fix-openldap-init-issue' of https://github.com/dav…
davidfrickert Nov 6, 2024
bc93130
fix custom command, rely on values so that custom containers can be used
davidfrickert Nov 6, 2024
cceef94
adapt command since we cant use templates
davidfrickert Nov 6, 2024
0ec559f
need to use case instead of [[ ]] due to not having bash
davidfrickert Nov 6, 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
16 changes: 16 additions & 0 deletions templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,22 @@ spec:
{{- if .Values.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }}
command:
Copy link
Contributor

Choose a reason for hiding this comment

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

This one conflicts with recently restored command on L177.
To not overwrite user supplied .Values.command please move above L176 or incorporate condition block.

- sh
- -c
- |
host=$(hostname)
if [ "$host" = "{{ template "openldap.fullname" . }}-0" ]
then
echo "This is the first openldap pod so let's init all additional schemas and ldifs here"
else
echo "This is not the first openldap pod so let's not init anything"
unset LDAP_CONFIGURE_PPOLICY LDAP_PPOLICY_HASH_CLEARTEXT
export LDAP_SKIP_DEFAULT_TREE=yes
fi

/opt/bitnami/scripts/openldap/entrypoint.sh /opt/bitnami/scripts/openldap/run.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

This is bitnami-specific and fail on custom container.
Either we postulate that only bitnami/openldap is supported, or check that things in place before calls.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, the /opt/bitnami/scripts/openldap/run.sh is actually default CMD (args in k8s manifest), so highly recommend change:

  • fom /opt/bitnami/scripts/openldap/entrypoint.sh /opt/bitnami/scripts/openldap/run.sh
  • to exec /opt/bitnami/scripts/openldap/entrypoint.sh

That will avoid overwriting default or user-supplied args.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hey, just came back from vacation will try to resolve these issues this or next week

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also, the /opt/bitnami/scripts/openldap/run.sh is actually default CMD (args in k8s manifest), so highly recommend change:

* fom `/opt/bitnami/scripts/openldap/entrypoint.sh /opt/bitnami/scripts/openldap/run.sh`

* to `exec /opt/bitnami/scripts/openldap/entrypoint.sh`

That will avoid overwriting default or user-supplied args.

hmm exec /opt/bitnami/scripts/openldap/entrypoint.sh does not seem to work
--> /opt/bitnami/scripts/openldap/entrypoint.sh: line 14: $1: unbound variable

(from latest commit on this PR)


env:
- name: POD_NAME
valueFrom:
Expand Down