Skip to content

remove ingress-nginx controller #2386

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

Open
kalinkostashki wants to merge 2 commits into
base: master
Choose a base branch
from
Open

remove ingress-nginx controller #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84d6fd9
remove ingress-nginx controller
kalinkostashki Apr 1, 2026
4010033
update kubeval to include relevant kubernetes versions
kalinkostashki Apr 1, 2026
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
12 changes: 6 additions & 6 deletions .github/workflows/helm-chart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ jobs:
# which a folder exists at
# https://github.com/yannh/kubernetes-json-schema/
k8s:
- v1.28.13
- v1.29.8
- v1.30.4
- v1.33.7
- v1.34.3
- v1.35.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -92,9 +92,9 @@ jobs:
# available for the docker.io/kindest/node image
# https://hub.docker.com/r/kindest/node/tags
k8s:
- v1.28.13
- v1.29.8
- v1.30.4
- v1.33.7
- v1.34.3
- v1.35.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ description: |
A digital twin is a virtual, cloud based, representation of his real world counterpart
(real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
type: application
version: 3.8.17 # chart version is effectively set by release-job
version: 4.0.0 # chart version is effectively set by release-job
appVersion: 3.8.12
keywords:
- iot-chart
Expand Down
2 changes: 0 additions & 2 deletions deployment/helm/ditto/ci/ci-workflow-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
ingress:
enabled: true
host: ditto.example.com
annotations:
# kubernetes.io/tls-acme: "true"
tls:
- secretName: ditto-tls
hosts:
Expand Down
40 changes: 12 additions & 28 deletions ...lm/ditto/templates/nginx-ingress-api.yaml → ...ent/helm/ditto/templates/ingress-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# http://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
{{- if .Values.ingress.enabled -}}
{{- if and .Values.ingress.enabled .Values.ingress.api.enabled }}
{{- $fullName := include "ditto.fullname" . -}}
---
apiVersion: networking.k8s.io/v1
Expand All @@ -17,48 +17,32 @@ metadata:
name: {{ $fullName }}-api
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
annotations:
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{ tpl .Values.ingress.api.kubernetesAuthAnnotations . | nindent 4}}
{{- include "ditto.labels" . | nindent 4 }}
{{- with .Values.ingress.api.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
defaultBackend:
service:
name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
port:
name: http
{{- if .Values.ingress.tls }}
{{- end }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- toYaml .Values.ingress.tls | nindent 4 }}
{{- end }}
{{- end }}
rules:
- host: {{ .Values.ingress.host | quote }}
- {{- if .Values.ingress.host }}
host: {{ .Values.ingress.host | quote }}
{{- end }}
http:
paths:
{{- range .Values.ingress.api.paths }}
- path: {{ .path }}
{{- if .pathType }}
pathType: {{ .pathType }}
{{- else }}
pathType: Prefix
{{- end }}
backend:
service:
name: {{ $fullName }}-{{ .backendSuffix }}
name: {{ $fullName }}-{{ .service.name }}
port:
name: http
{{- end }}
{{- end }}
{{- end }}
46 changes: 12 additions & 34 deletions ...ditto/templates/nginx-ingress-devops.yaml → .../helm/ditto/templates/ingress-devops.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# http://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
{{- if .Values.ingress.enabled -}}
{{- if and .Values.ingress.enabled .Values.ingress.devops.enabled }}
{{- $fullName := include "ditto.fullname" . -}}
---
apiVersion: networking.k8s.io/v1
Expand All @@ -17,54 +17,32 @@ metadata:
name: {{ $fullName }}-devops
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
annotations:
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.ingress.devops.annotations }}
{{- include "ditto.labels" . | nindent 4 }}
{{- with .Values.ingress.devops.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- else }}
{{- with .Values.ingress.api.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}

spec:
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
defaultBackend:
service:
name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
port:
name: http
{{- if .Values.ingress.tls }}
{{- end }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- toYaml .Values.ingress.tls | nindent 4 }}
{{- end }}
{{- end }}
rules:
- host: {{ .Values.ingress.host | quote }}
- {{- if .Values.ingress.host }}
host: {{ .Values.ingress.host | quote }}
{{- end }}
http:
paths:
{{- range .Values.ingress.devops.paths }}
- path: {{ .path }}
{{- if .pathType }}
pathType: {{ .pathType }}
{{- else }}
pathType: Prefix
{{- end }}
backend:
service:
name: {{ $fullName }}-{{ .backendSuffix }}
name: {{ $fullName }}-{{ .service.name }}
port:
name: http
{{- end }}
{{- end }}
{{- end }}
38 changes: 15 additions & 23 deletions ...elm/ditto/templates/nginx-ingress-ui.yaml → ...ment/helm/ditto/templates/ingress-ui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# http://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
{{- if .Values.ingress.enabled -}}
{{- if and .Values.ingress.enabled .Values.ingress.ui.enabled }}
{{- $fullName := include "ditto.fullname" . -}}
---
apiVersion: networking.k8s.io/v1
Expand All @@ -17,47 +17,39 @@ metadata:
name: {{ $fullName }}-ui
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
annotations:
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- include "ditto.labels" . | nindent 4 }}
{{- with .Values.ingress.ui.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
{{- end }}
{{- if .Values.ingress.ui.defaultBackend }}
defaultBackend:
service:
name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
name: {{ $fullName }}-{{ .Values.ingress.ui.defaultBackend.service.name }}
port:
name: http
{{- if .Values.ingress.tls }}
{{- end }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- toYaml .Values.ingress.tls | nindent 4 }}
{{- end }}
{{- end }}
rules:
- host: {{ .Values.ingress.host | quote }}
- {{- if .Values.ingress.host }}
host: {{ .Values.ingress.host | quote }}
{{- end }}
http:
paths:
{{- range .Values.ingress.ui.paths }}
- path: {{ .path }}
{{- if .pathType }}
pathType: {{ .pathType }}
{{- else }}
pathType: Prefix
{{- end }}
backend:
service:
name: {{ $fullName }}-{{ .backendSuffix }}
name: {{ $fullName }}-{{ .service.name }}
port:
name: http
{{- end }}
{{- end }}
{{- end }}
40 changes: 12 additions & 28 deletions ...elm/ditto/templates/nginx-ingress-ws.yaml → ...ment/helm/ditto/templates/ingress-ws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# http://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
{{- if .Values.ingress.enabled -}}
{{- if and .Values.ingress.enabled .Values.ingress.ws.enabled }}
{{- $fullName := include "ditto.fullname" . -}}
---
apiVersion: networking.k8s.io/v1
Expand All @@ -17,48 +17,32 @@ metadata:
name: {{ $fullName }}-ws
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
annotations:
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- include "ditto.labels" . | nindent 4 }}
{{- with .Values.ingress.ws.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{ tpl .Values.ingress.api.kubernetesAuthAnnotations . | nindent 4}}
spec:
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
defaultBackend:
service:
name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
port:
name: http
{{- if .Values.ingress.tls }}
{{- end }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- toYaml .Values.ingress.tls | nindent 4 }}
{{- end }}
{{- end }}
rules:
- host: {{ .Values.ingress.host | quote }}
- {{- if .Values.ingress.host }}
host: {{ .Values.ingress.host | quote }}
{{- end }}
http:
paths:
{{- range .Values.ingress.ws.paths }}
- path: {{ .path }}
{{- if .pathType }}
pathType: {{ .pathType }}
{{- else }}
pathType: Prefix
{{- end }}
backend:
service:
name: {{ $fullName }}-{{ .backendSuffix }}
name: {{ $fullName }}-{{ .service.name }}
port:
name: http
{{- end }}
{{- end }}
{{- end }}
48 changes: 0 additions & 48 deletions deployment/helm/ditto/templates/nginx-ingress-auth.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading