Skip to content

Commit 6eaa44d

Browse files
authored
Fix test for useNonPriviledgedPorts (#2170)
1 parent 725dd54 commit 6eaa44d

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

kubernetes/samples/charts/apache-webtier/templates/deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
{{- if or (not (.Values.persistentVolumeClaimName)) (.Values.virtualHostName) }}
5757
env:
5858
{{- end }}
59-
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
59+
{{- if .Values.useNonPriviledgedPorts }}
6060
- name: NonPriviledgedPorts
6161
value: "true"
6262
{{- end }}
@@ -82,7 +82,7 @@ spec:
8282
{{- end }}
8383
readinessProbe:
8484
tcpSocket:
85-
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
85+
{{- if .Values.useNonPriviledgedPorts }}
8686
port: 8080
8787
{{- else }}
8888
port: 80
@@ -94,7 +94,7 @@ spec:
9494
timeoutSeconds: 2
9595
livenessProbe:
9696
tcpSocket:
97-
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
97+
{{- if .Values.useNonPriviledgedPorts }}
9898
port: 8080
9999
{{- else }}
100100
port: 80

kubernetes/samples/charts/apache-webtier/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
selector:
1212
app: {{ template "apache.fullname" . }}
1313
ports:
14-
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
14+
{{- if .Values.useNonPriviledgedPorts }}
1515
- port: 8080
1616
{{- else}}
1717
- port: 80

kubernetes/samples/charts/apache-webtier/values.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ customCert:
5353
customKey:
5454

5555
# Unique ID identifying a domain.
56-
# This ID must not contain an underscope ("_"), and must be lowercase and unique across all domains in a Kubernetes cluster.
56+
# This ID must not contain an underscore ("_"), and must be lowercase and unique across all domains in a Kubernetes cluster.
5757
domainUID: "domain1"
5858

5959
# Cluster name
@@ -74,5 +74,6 @@ managedServerPort: 8001
7474
# where 'myhost' is the IP of the machine that runs the Apache web tier, and
7575
# 'myport' is the port that the Apache web tier is publicly exposed to.
7676
location: "/weblogic"
77+
7778
# Use non privileged port 8080 to listen. If set to false, default privileged port 80 will be used.
7879
useNonPriviledgedPorts: false

0 commit comments

Comments
 (0)