Skip to content

Commit 0fb2e8c

Browse files
committed
fix: requested changes in permitio#273
1 parent fd84ae3 commit 0fb2e8c

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

charts/pdp/templates/_helpers.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{/*
22
Expand the name of the chart.
33
*/}}
4-
{{- define "..name" -}}
4+
{{- define "pdp.name" -}}
55
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
66
{{- end }}
77

@@ -10,7 +10,7 @@ Create a default fully qualified app name.
1010
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1111
If release name contains chart name it will be used as a full name.
1212
*/}}
13-
{{- define "..fullname" -}}
13+
{{- define "pdp.fullname" -}}
1414
{{- if .Values.fullnameOverride }}
1515
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
1616
{{- else }}
@@ -48,7 +48,7 @@ Get the secret name for the API key
4848
{{- .Values.pdp.existingApiKeySecret.name -}}
4949
{{- else -}}
5050
{{- if .Values.useStandardHelmNamingConventions }}
51-
{{- include "..fullname" . }}
51+
{{- include "pdp.fullname" . }}
5252
{{- else -}}
5353
permitio-pdp-secret
5454
{{- end -}}

charts/pdp/templates/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
{{- if .Values.useStandardHelmNamingConventions }}
5-
name: {{ include "..fullname" . }}
5+
name: {{ include "pdp.fullname" . }}
66
{{- else }}
77
name: permitio-pdp
88
{{- end }}
@@ -145,7 +145,7 @@ spec:
145145
{{- if .Values.pdp.logs_forwarder.enabled }}
146146
- name: fluent-bit-config
147147
configMap:
148-
name: fluentbit-config
148+
name: {{ include "pdp.fullname" . }}-fluentbit-config
149149
- name: logs
150150
emptyDir: {}
151151
{{- else if .Values.openshift.enabled }}

charts/pdp/templates/logs-forwarder-cm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v1
33
kind: ConfigMap
44
metadata:
55
{{- if .Values.useStandardHelmNamingConventions }}
6-
name: {{ include "..fullname" . }}-fluentbit-config
6+
name: {{ include "pdp.fullname" . }}-fluentbit-config
77
{{- else }}
88
name: fluentbit-config
99
{{- end }}

charts/pdp/templates/poddisruptionbudget.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: policy/v1
33
kind: PodDisruptionBudget
44
metadata:
55
{{- if .Values.useStandardHelmNamingConventions }}
6-
name: {{ include "..fullname" . }}
6+
name: {{ include "pdp.fullname" . }}
77
{{- else }}
88
name: permitio-pdp-pdb
99
{{- end }}

charts/pdp/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
{{- if .Values.useStandardHelmNamingConventions }}
5-
name: {{ include "..fullname" . }}
5+
name: {{ include "pdp.fullname" . }}
66
{{- else }}
77
name: permitio-pdp
88
{{- end }}

charts/pdp/values.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ labels: {}
1919
annotations: {}
2020

2121
nameOverride: ""
22+
fullnameOverride: ""
2223

2324
pdp:
2425
pdpEnvs:
@@ -67,11 +68,11 @@ resources:
6768

6869
# OpenShift configuration
6970
openshift:
70-
enabled: false # Set to true for OpenShift deployments
71+
enabled: false # Set to true for OpenShift deployments
7172
serviceAccount:
7273
create: true
7374
name: "permitio-pdp-sa"
74-
sccName: "restricted-v2" # OpenShift Security Context Constraint
75+
sccName: "restricted-v2" # OpenShift Security Context Constraint
7576
# Security context (SCC will override user/group settings automatically)
7677
securityContext:
7778
runAsNonRoot: true

0 commit comments

Comments
 (0)