8000 Fix test for useNonPriviledgedPorts by rjeberhard · Pull Request #2170 · oracle/weblogic-kubernetes-operator · GitHub
[go: up one dir, main page]
Skip to content

Fix test for useNonPriviledgedPorts #2170

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

Merged
merged 1 commit into from
Jan 29, 2021
Merged

Fix test for useNonPriviledgedPorts #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions kubernetes/samples/charts/apache-webtier/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
{{- if or (not (.Values.persistentVolumeClaimName)) (.Values.virtualHostName) }}
env:
{{- end }}
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
{{- if .Values.useNonPriviledgedPorts }}
- name: NonPriviledgedPorts
value: "true"
{{- end }}
Expand All @@ -82,7 +82,7 @@ spec:
{{- end }}
readinessProbe:
tcpSocket:
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
{{- if .Values.useNonPriviledgedPorts }}
port: 8080
{{- else }}
port: 80
Expand All @@ -94,7 +94,7 @@ spec:
timeoutSeconds: 2
livenessProbe:
tcpSocket:
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
{{- if .Values.useNonPriviledgedPorts }}
port: 8080
{{- else }}
port: 80
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/samples/charts/apache-webtier/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
selector:
app: {{ template "apache.fullname" . }}
ports:
{{- if ( .Values.useNonPriviledgedPorts ) and eq .Values.useNonPriviledgedPorts "true"}}
{{- if .Values.useNonPriviledgedPorts }}
- port: 8080
{{- else}}
- port: 80
Expand Down
3 changes: 2 additions & 1 deletion kubernetes/sample 8E34 s/charts/apache-webtier/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ customCert:
customKey:

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

# Cluster name
Expand All @@ -74,5 +74,6 @@ managedServerPort: 8001
# where 'myhost' is the IP of the machine that runs the Apache web tier, and
# 'myport' is the port that the Apache web tier is publicly exposed to.
location: "/weblogic"

# Use non privileged port 8080 to listen. If set to false, default privileged port 80 will be used.
useNonPriviledgedPorts: false
0