Skip to content

Commit

Permalink
name adaption to web-ui #3581
Browse files Browse the repository at this point in the history
eliminated .Values.name because derived names could become too long
  • Loading branch information
sven-dmlr committed Nov 5, 2024
1 parent efec380 commit f6a8e1b
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: MIT

apiVersion: v2
name: sechub-web-ui
description: SecHub Web UI Helm chart for Kubernetes to deploy a vue.js web application
name: web-ui
description: SecHub Web UI Frontend Helm chart for Kubernetes to deploy SecHub's vue.js web application
home: https://github.com/mercedes-benz/sechub

type: application
Expand All @@ -11,4 +11,4 @@ type: application
# This version number should be incremented each time you make changes to the chart and its templates.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 0.2.0
version: 1.0.0
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.name }}
name: web-ui
spec:
replicas: {{ .Values.replicaCount }}
strategy:
Expand All @@ -13,11 +13,11 @@ spec:
maxUnavailable: 49%
selector:
matchLabels:
name: {{ .Values.name }}
name: web-ui
template:
metadata:
labels:
name: {{ .Values.name }}
name: web-ui
{{- if .Values.templateMetadataAnnotations }}
annotations:
{{ .Values.templateMetadataAnnotations | indent 8 | trim }}
Expand Down Expand Up @@ -71,19 +71,19 @@ spec:
{{- end }}

# Web-UI container
- name: {{ .Values.name }}
- name: web-ui
image: {{ .Values.image }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
labels:
name: {{ .Values.name }}
name: web-ui
ports:
- name: {{ .Values.name }}-https
containerPort: 8443
- name: web-ui-https
containerPort: 4443
startupProbe:
httpGet:
scheme: HTTPS
path: /health/alive.html
port: {{ .Values.name }}-https
port: web-ui-https
failureThreshold: 24
periodSeconds: 2
successThreshold: 1
Expand All @@ -93,7 +93,7 @@ spec:
httpGet:
scheme: HTTPS
path: /health/alive.html
port: {{ .Values.name }}-https
port: web-ui-https
failureThreshold: 2
periodSeconds: 5
successThreshold: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: {{ .Values.name }}-policy
name: web-ui-policy
spec:
ingress:
- ports:
{{- if .Values.go_mmproxy.enabled }}
- port: 8080
{{- else }}
- port: 8443
- port: 4443
{{- end }}
protocol: TCP
podSelector:
matchLabels:
name: {{ .Values.name }}
name: web-ui
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.name }}
name: web-ui
labels:
name: {{ .Values.name }}
name: web-ui
{{- if .Values.service.annotations }}
annotations:
{{ .Values.service.annotations | indent 4 | trim }}
Expand All @@ -18,13 +18,13 @@ spec:
type: LoadBalancer
loadBalancerIP: {{ .Values.service.loadbalancer.ip }}
selector:
name: {{ .Values.name }}
name: web-ui
ports:
- name: {{ .Values.service.loadbalancer.port.name }}
port: {{ .Values.service.loadbalancer.port.number }}
protocol: TCP
{{- if .Values.go_mmproxy.enabled }}
targetPort: 8080
{{- else }}
targetPort: 8443
{{- end }}
targetPort: 4443
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

# This is a sample values file containing the defaults.

name: web-ui

# SecHub web-ui container image:
image: "ghcr.io/mercedes-benz/sechub/sechub-web-ui:latest"
imagePullPolicy: "IfNotPresent"

Expand Down Expand Up @@ -74,4 +73,4 @@ go_mmproxy:
# (needs annotation loadbalancer.openstack.org/proxy-protocol: "true" - see above)
enabled: false
# Choose a "go-mmproxy" docker image. See e.g. https://hub.docker.com/search?q=go-mmproxy
image: "example.org/go-mmproxy:2.1.0"
image: "example.org/go-mmproxy:2.1.0"

0 comments on commit f6a8e1b

Please sign in to comment.