Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
ui-middleware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Open Source Software
OX App Suite
Core
ui-middleware
Commits
682cb9f6
Commit
682cb9f6
authored
3 years ago
by
frank.paczynski
Browse files
Options
Downloads
Patches
Plain Diff
use manifest of frontend-plugin-example and update chart with helm 3.6.0
parent
b80da72b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci/values.yaml
+1
-1
1 addition, 1 deletion
.gitlab-ci/values.yaml
helm/core-manifest-service/templates/ingress.yaml
+22
-2
22 additions, 2 deletions
helm/core-manifest-service/templates/ingress.yaml
helm/core-manifest-service/values.yaml
+4
-1
4 additions, 1 deletion
helm/core-manifest-service/values.yaml
with
27 additions
and
4 deletions
.gitlab-ci/values.yaml
+
1
−
1
View file @
682cb9f6
replicaCount
:
1
containerPort
:
8080
manifests
:
-
https://
manifest-service-dummy
.k3s.os.oxui.de/manifest.json
-
https://
core-plugin-example-${CI_COMMIT_REF_SLUG}
.k3s.os.oxui.de/manifest.json
ingress
:
enabled
:
true
hosts
:
...
...
This diff is collapsed.
Click to expand it.
helm/core-manifest-service/templates/ingress.yaml
+
22
−
2
View file @
682cb9f6
{{
- if .Values.ingress.enabled -
}}
{{
- $fullName
:
= include "core-manifest-service.fullname" . -
}}
{{
- $svcPort
:
= .Values.service.port -
}}
{{
- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -
}}
{{
- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion))
}}
{{
- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class")
}}
{{
- $_
:
= set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className
}}
{{
- end
}}
{{
- end
}}
{{
- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -
}}
apiVersion
:
networking.k8s.io/v1
{{
- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -
}}
apiVersion
:
networking.k8s.io/v1beta1
{{
- else -
}}
apiVersion
:
extensions/v1beta1
...
...
@@ -16,6 +23,9 @@ metadata:
{{
- toYaml . | nindent 4
}}
{{
- end
}}
spec
:
{{
- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)
}}
ingressClassName
:
{{
.Values.ingress.className
}}
{{
- end
}}
{{
- if .Values.ingress.tls
}}
tls
:
{{
- range .Values.ingress.tls
}}
...
...
@@ -33,9 +43,19 @@ spec:
paths
:
{{
- range .paths
}}
-
path
:
{{
.path
}}
{{
- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion)
}}
pathType
:
{{
.pathType
}}
{{
- end
}}
backend
:
{{
- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion
}}
service
:
name
:
{{
$fullName
}}
port
:
number
:
{{
$svcPort
}}
{{
- else
}}
serviceName
:
{{
$fullName
}}
servicePort
:
{{
$svcPort
}}
{{
- end
}}
{{
- end
}}
{{
- end
}}
{{
- end
}}
{{
- end
}}
This diff is collapsed.
Click to expand it.
helm/core-manifest-service/values.yaml
+
4
−
1
View file @
682cb9f6
...
...
@@ -44,12 +44,15 @@ service:
ingress
:
enabled
:
true
className
:
"
"
annotations
:
{}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts
:
-
host
:
chart-example.local
paths
:
[]
paths
:
-
path
:
/
pathType
:
ImplementationSpecific
tls
:
[]
# - secretName: chart-example-tls
# hosts:
...
...
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