EOX GitLab Instance
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESA
PRISM
VS
Commits
c6a9a5b9
Commit
c6a9a5b9
authored
4 years ago
by
Fabian Schindler
Browse files
Options
Downloads
Patches
Plain Diff
Trying to fix networking issue
parent
667c8b73
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!62
Backporting
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
chart/Chart.yaml
+1
-1
1 addition, 1 deletion
chart/Chart.yaml
chart/templates/ingress.yaml
+34
-36
34 additions, 36 deletions
chart/templates/ingress.yaml
with
35 additions
and
37 deletions
chart/Chart.yaml
+
1
−
1
View file @
c6a9a5b9
...
...
@@ -7,7 +7,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version
:
0.3.2
3
version
:
0.3.2
4
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
...
...
This diff is collapsed.
Click to expand it.
chart/templates/ingress.yaml
+
34
−
36
View file @
c6a9a5b9
{{
- $fullName
:
= include "vs.fullname" . -
}}
{{
- $svcPort
:
= .Values.service.port -
}}
{{
- if semverCompare ">=1.1
9
-0" .Capabilities.KubeVersion.GitVersion -
}}
{{
- if semverCompare ">=1.1
8
-0" .Capabilities.KubeVersion.GitVersion -
}}
apiVersion
:
networking.k8s.io/v1
{{
- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -
}}
apiVersion
:
networking.k8s.io/v1beta
{{
- else -
}}
apiVersion
:
extensions/v1
{{
- end
}}
...
...
@@ -30,68 +28,68 @@ spec:
{{
- end
}}
rules
:
{{
- range .Values.ingress.hosts
}}
{{
- if semverCompare ">=1.1
9
-0" $.Capabilities.KubeVersion.GitVersion
}}
{{
- if semverCompare ">=1.1
8
-0" $.Capabilities.KubeVersion.GitVersion
}}
-
host
:
{{
.host | quote
}}
http
:
paths
:
-
path
:
/(ows.*)
pathType
:
Prefix
backend
:
service
:
service
:
name
:
{{
$fullName
}}
-renderer
port
:
port
:
number
:
80
-
path
:
/(opensearch.*)
pathType
:
Prefix
backend
:
service
:
service
:
name
:
{{
$fullName
}}
-renderer
port
:
port
:
number
:
80
-
path
:
/(admin.*)
pathType
:
Prefix
backend
:
service
:
service
:
name
:
{{
$fullName
}}
-renderer
port
:
port
:
number
:
80
-
path
:
/cache/(.*)
pathType
:
Prefix
backend
:
service
:
service
:
name
:
{{
$fullName
}}
-cache
port
:
port
:
number
:
80
-
path
:
/(.*)
pathType
:
Prefix
backend
:
service
:
service
:
name
:
{{
$fullName
}}
-client
port
:
number
:
80
port
:
number
:
80
{{
- else
}}
-
host
:
{{
.host | quote
}}
http
:
paths
:
-
path
:
/(ows.*)
backend
:
serviceName
:
{{
$fullName
}}
-renderer
servicePort
:
http
-
path
:
/(opensearch.*)
backend
:
serviceName
:
{{
$fullName
}}
-renderer
servicePort
:
http
-
path
:
/(admin.*)
backend
:
serviceName
:
{{
$fullName
}}
-renderer
servicePort
:
http
-
path
:
/cache/(.*)
backend
:
serviceName
:
{{
$fullName
}}
-cache
servicePort
:
http
-
path
:
/(.*)
backend
:
serviceName
:
{{
$fullName
}}
-client
servicePort
:
http
paths
:
-
path
:
/(ows.*)
backend
:
serviceName
:
{{
$fullName
}}
-renderer
servicePort
:
http
-
path
:
/(opensearch.*)
backend
:
serviceName
:
{{
$fullName
}}
-renderer
servicePort
:
http
-
path
:
/(admin.*)
backend
:
serviceName
:
{{
$fullName
}}
-renderer
servicePort
:
http
-
path
:
/cache/(.*)
backend
:
serviceName
:
{{
$fullName
}}
-cache
servicePort
:
http
-
path
:
/(.*)
backend
:
serviceName
:
{{
$fullName
}}
-client
servicePort
:
http
{{
- end -
}}
{{
- end
}}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment