Telecominfraproject/wlan-cloud-helm
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-helm.git synced 2026-03-21 22:39:21 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

Compare commits

base: Telecominfraproject:NETEXP-3471
Branches Tags
Telecominfraproject:master Telecominfraproject:WIFI-3471 Telecominfraproject:NETEXP-3471 Telecominfraproject:release/v1.1.x Telecominfraproject:release/v1.2 Telecominfraproject:feature/example-values-update Telecominfraproject:WIFI-2654-fix-capabilites-check Telecominfraproject:fix-capabilites-check Telecominfraproject:WIFI-2434 Telecominfraproject:WIFI-2026 Telecominfraproject:release/v1.0.1 Telecominfraproject:release/v1.0.0 Telecominfraproject:1.0.0-artifacts Telecominfraproject:WIFI-1812-Revert Telecominfraproject:WIFI-1812 Telecominfraproject:WIFI-1669 Telecominfraproject:WIFI-1610 Telecominfraproject:WIFI-1172-JMX-to-prometheus-poc Telecominfraproject:wifi-1357-allow-to-disable-internal-mtls-comm Telecominfraproject:feature/thirdparties-fixes Telecominfraproject:feature/thirdparties Telecominfraproject:changelog-v0.4-bump Telecominfraproject:microk8s-patch-1 Telecominfraproject:feature/update-kafka Telecominfraproject:WIFI-990-disable-hardcoded-ports Telecominfraproject:feature/update-cassandra Telecominfraproject:feature/update-postgres Telecominfraproject:metallb-test Telecominfraproject:minikube Telecominfraproject:minikube-working Telecominfraproject:feature/helmfile Telecominfraproject:NGINX-Testing Telecominfraproject:TOOLS-23--fix-validation Telecominfraproject:TOOLS-23-static-analysis
Telecominfraproject:v1.0.1 Telecominfraproject:v1.0.0 Telecominfraproject:v0.4
...
compare: Telecominfraproject:fix-capabilites-check
Branches Tags
Telecominfraproject:master Telecominfraproject:WIFI-3471 Telecominfraproject:NETEXP-3471 Telecominfraproject:release/v1.1.x Telecominfraproject:release/v1.2 Telecominfraproject:feature/example-values-update Telecominfraproject:WIFI-2654-fix-capabilites-check Telecominfraproject:fix-capabilites-check Telecominfraproject:WIFI-2434 Telecominfraproject:WIFI-2026 Telecominfraproject:release/v1.0.1 Telecominfraproject:release/v1.0.0 Telecominfraproject:1.0.0-artifacts Telecominfraproject:WIFI-1812-Revert Telecominfraproject:WIFI-1812 Telecominfraproject:WIFI-1669 Telecominfraproject:WIFI-1610 Telecominfraproject:WIFI-1172-JMX-to-prometheus-poc Telecominfraproject:wifi-1357-allow-to-disable-internal-mtls-comm Telecominfraproject:feature/thirdparties-fixes Telecominfraproject:feature/thirdparties Telecominfraproject:changelog-v0.4-bump Telecominfraproject:microk8s-patch-1 Telecominfraproject:feature/update-kafka Telecominfraproject:WIFI-990-disable-hardcoded-ports Telecominfraproject:feature/update-cassandra Telecominfraproject:feature/update-postgres Telecominfraproject:metallb-test Telecominfraproject:minikube Telecominfraproject:minikube-working Telecominfraproject:feature/helmfile Telecominfraproject:NGINX-Testing Telecominfraproject:TOOLS-23--fix-validation Telecominfraproject:TOOLS-23-static-analysis
Telecominfraproject:v1.0.1 Telecominfraproject:v1.0.0 Telecominfraproject:v0.4

1 Commits
NETEXP-347 ... fix-capabi

Author SHA1 Message Date
Max Brenner
ef1d54cbea fix Ingress capabilities check 
Signed-off-by: Max Brenner <xamrennerb@gmail.com>
 2021-06-14 11:29:48 +02:00
4 changed files with 19 additions and 19 deletions
Expand all files Collapse all files

12
tip-wlan/charts/wlan-cloud-graphql-gw/templates/ingress.yaml
View File

@@ -1,9 +1,9 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "common.fullname" . -}} {{- $fullName := include "common.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $svcPort := .Values.service.port -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{- else -}}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
@@ -38,11 +38,11 @@ spec:
paths: paths:
{{- if $.Values.ingress.lb_https_redirect }} {{- if $.Values.ingress.lb_https_redirect }}
- path: /* - path: /*
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
service: service:
name: ssl-redirect name: ssl-redirect
port: port:
@@ -54,11 +54,11 @@ spec:
{{- end }} {{- end }}
{{- range .paths }} {{- range .paths }}
- path: {{ . }} - path: {{ . }}
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:

12
tip-wlan/charts/wlan-cloud-static-portal/templates/ingress.yaml
View File

@@ -1,9 +1,9 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "common.fullname" . -}} {{- $fullName := include "common.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $svcPort := .Values.service.port -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{- else -}}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
@@ -38,11 +38,11 @@ spec:
paths: paths:
{{- if $.Values.ingress.lb_https_redirect }} {{- if $.Values.ingress.lb_https_redirect }}
- path: /* - path: /*
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
service: service:
name: ssl-redirect name: ssl-redirect
port: port:
@@ -54,11 +54,11 @@ spec:
{{- end }} {{- end }}
{{- range .paths }} {{- range .paths }}
- path: {{ . }} - path: {{ . }}
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:

12
tip-wlan/charts/wlan-portal-service/templates/ingress.yaml
View File

@@ -1,9 +1,9 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "common.fullname" . -}} {{- $fullName := include "common.fullname" . -}}
{{- $svcPort := .Values.service.port1 -}} {{- $svcPort := .Values.service.port1 -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{- else -}}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
@@ -36,11 +36,11 @@ spec:
paths: paths:
{{- if $.Values.ingress.lb_https_redirect }} {{- if $.Values.ingress.lb_https_redirect }}
- path: /* - path: /*
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
service: service:
name: ssl-redirect name: ssl-redirect
port: port:
@@ -52,11 +52,11 @@ spec:
{{- end }} {{- end }}
{{- range .paths }} {{- range .paths }}
- path: {{ . }} - path: {{ . }}
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:

2
tip-wlan/values.yaml
View File

@@ -190,7 +190,7 @@ kafka:
memory: 2Gi memory: 2Gi
requests: requests:
cpu: 10m cpu: 10m
memory: 700Mi memory: 1400Mi
cassandra: cassandra:
enabled: false enabled: false