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.

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

[bitnami/vault] fix injector #26611

Merged
merged 10 commits into from
Jun 10, 2024
8 changes: 6 additions & 2 deletions bitnami/vault/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 1.4.4 (2024-06-06)
## 1.4.5 (2024-06-06)

* [bitnami/vault] Release 1.4.4 ([#27025](https://github.com/bitnami/charts/pull/27025))
* [bitnami/vault] fix injector ([#26611](https://github.com/bitnami/charts/pull/26611))

## <small>1.4.4 (2024-06-06)</small>

* [bitnami/vault] Release 1.4.4 (#27025) ([fcd0b92](https://github.com/bitnami/charts/commit/fcd0b92e3b494126addbb22070d43ac4975287b5)), closes [#27025](https://github.com/bitnami/charts/issues/27025)

## <small>1.4.3 (2024-06-05)</small>

Expand Down
2 changes: 1 addition & 1 deletion bitnami/vault/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ maintainers:
name: vault
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/vault
version: 1.4.4
version: 1.4.5
2 changes: 1 addition & 1 deletion bitnami/vault/templates/injector/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
- name: AGENT_INJECT_LISTEN
value: :{{ .Values.injector.containerPorts.https }}
- name: AGENT_INJECT_VAULT_ADDR
value: http://{{ include "vault.server.fullname" . }}:{{ .Values.server.service.general.ports.http }}
value: http://{{ include "vault.server.fullname" . }}.{{ include "common.names.namespace" . }}.svc:{{ .Values.server.service.general.ports.http }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why don't use the FQDN?

Suggested change
value: http://{{ include "vault.server.fullname" . }}.{{ include "common.names.namespace" . }}.svc:{{ .Values.server.service.general.ports.http }}
value: http://{{ include "vault.server.fullname" . }}.{{ include "common.names.namespace" . }}.svc.{{ .Values.clusterDomain }}:{{ .Values.server.service.general.ports.http }}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I went with what they use in the official chart.
Also, this way it's consistent with AGENT_INJECT_TLS_AUTO_HOSTS and it works with the default values.yaml even if the cluster domain is not cluster.local.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks a lot @SpeedGriffon. LGTM

- name: AGENT_INJECT_VAULT_AUTH_PATH
value: auth/kubernetes
- name: AGENT_INJECT_VAULT_IMAGE
Expand Down
2 changes: 1 addition & 1 deletion bitnami/vault/templates/injector/networkpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
{{- end }}
ingress:
- ports:
- port: {{ .Values.injector.service.ports.https }}
- port: {{ .Values.injector.containerPorts.https }}
{{- if not .Values.injector.networkPolicy.allowExternal }}
from:
- podSelector:
Expand Down
Loading