fix Ingress capabilities check

Signed-off-by: Max Brenner <xamrennerb@gmail.com>

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

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

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

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

tip-wlan/charts/wlan-portal-service/templates/ingress.yaml

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

tip-wlan/charts/wlan-prov-service/values.yaml

@@ -125,10 +125,10 @@ ingress:
 resources:
   limits:
     cpu: 500m
-    memory: 350Mi
+    memory: 320Mi
   requests:
     cpu: 10m
-    memory: 350Mi
+    memory: 300Mi
 
 nodeSelector: {}
 

tip-wlan/charts/wlan-spc-service/values.yaml

@@ -117,10 +117,10 @@ ingress:
 resources:
   limits:
     cpu: 500m
-    memory: 400Mi
+    memory: 370Mi
   requests:
     cpu: 10m
-    memory: 400Mi
+    memory: 350Mi
 
 nodeSelector: {}
 

tip-wlan/charts/wlan-ssc-service/values.yaml

@@ -117,10 +117,10 @@ ingress:
 resources:
   limits:
     cpu: 500m
-    memory: 450Mi
+    memory: 420Mi
   requests:
     cpu: 10m
-    memory: 450Mi
+    memory: 400Mi
 
 nodeSelector: {}
 

tip-wlan/example-values/aws-basic/values.yml

@@ -12,6 +12,7 @@ shared:
 annotations: {
     "helm.sh/resource-policy": keep
 }
+dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9
 
 opensync-gw-static:
   enabled: false

tip-wlan/example-values/aws-internal/values.yml

@@ -12,6 +12,7 @@ shared:
 annotations: {
     "helm.sh/resource-policy": keep
 }
+dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9
 
 opensync-gw-static:
   enabled: false

tip-wlan/values.yaml

@@ -42,8 +42,8 @@ global:
 
   repository:
     registry: tip-tip-wlan-cloud-docker-repo.jfrog.io
-    # username: username
-    # password: password
+    username: tip-read
+    password: tip-read
   # image pull policy
   pullPolicy: IfNotPresent
 
@@ -86,7 +86,7 @@ global:
       path: /opt/bitnami/jmx-exporter/jmx_prometheus_javaagent.jar
 
 # DockerRegistry Secret
-createDockerRegistrySecret: false
+createDockerRegistrySecret: true
 
 # Enabling components under Tip-wlan
 opensync-gw-static:
@@ -184,21 +184,13 @@ kafka:
       registry: tip-docker-cache-repo.jfrog.io
     persistence:
       enabled: true
-    resources:
-      limits:
-        cpu: 1
-        memory: 500Gi
-      requests:
-        cpu: 10m
-        memory: 400Mi
-
   resources:
     limits:
       cpu: 1
       memory: 2Gi
     requests:
       cpu: 10m
-      memory: 1100Mi
+      memory: 1400Mi
 
 cassandra:
   enabled: false