fix: reuse webhookport from values

[oliverbaehler]

No description provided.

[Copilot]

Pull request overview

Replaces hardcoded 9443 webhook port references in the Helm chart templates with the configurable .Values.manager.webhookPort value, so changing the value in values.yaml actually propagates to both the Service and the Pod's container port.

Changes:

• Use .Values.manager.webhookPort for the webhook Service port and targetPort.
• Use .Values.manager.webhookPort for the manager Pod's admission containerPort.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
charts/capsule/templates/webhook-service.yaml	Templated the admission Service port/targetPort from webhookPort instead of hardcoded 9443.
charts/capsule/templates/_pod.tpl	Templated the admission containerPort from webhookPort instead of hardcoded 9443.

[Svarrogh1337]

LGTM

[bakito]

It must be assured, that the port on the dynamic-webhook matches the pod and service ports.

[oliverbaehler]

@bakito agrre with the changes?

[bakito]

@bakito agrre with the changes?

no. The default port should also be considered here:

• https://github.com/projectcapsule/capsule/blob/main/charts/capsule/templates/_helpers.tpl#L164
• https://github.com/projectcapsule/capsule/blob/main/charts/capsule/templates/_helpers.tpl#L181

otherwise generated dynamic webhooks are pointing to the wrong service port

[bakito]

{{/*
Capsule Webhook service (Called with $.Path)

*/}}
{{- define "capsule.webhooks.service" -}}
  {{- include "capsule.webhooks.cabundle" $.ctx | nindent 0 }}
  {{- if $.ctx.Values.webhooks.service.url }}
url: {{ printf "%s/%s" (trimSuffix "/" $.ctx.Values.webhooks.service.url ) (trimPrefix "/" (required "Path is required for the function" $.path)) }}
  {{- else }}
service:
  name: {{ default (printf "%s-webhook-service" (include "capsule.fullname" $.ctx)) $.ctx.Values.webhooks.service.name }}
  namespace: {{ default $.ctx.Release.Namespace $.ctx.Values.webhooks.service.namespace }}
  port: {{ default $.ctx.Values.manager.webhookPort $.ctx.Values.webhooks.service.port }}
  path: {{ required "Path is required for the function" $.path }}
  {{- end }}
{{- end }}


{{/*
Capsule Webhook service (Without Path)
*/}}
{{- define "capsule.webhooks.serviceConfig" -}}
  {{- include "capsule.webhooks.cabundle" $ | nindent 0 }}
  {{- if $.Values.webhooks.service.url }}
url: {{ trimSuffix "/" $.Values.webhooks.service.url }}
  {{- else }}
service:
  name: {{ default (printf "%s-webhook-service" (include "capsule.fullname" $)) $.Values.webhooks.service.name }}
  namespace: {{ default $.Release.Namespace $.Values.webhooks.service.namespace }}
  port: {{ default $.Values.manager.webhookPort $.Values.webhooks.service.port }}
  {{- end }}
{{- end }}

[oliverbaehler]

@bakito didnt push. .. D:

[bakito]

default need to be changed here too

[Copilot]

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.

[bakito]

LGTM