fix Ingress capabilities check

Signed-off-by: Max Brenner <xamrennerb@gmail.com>
2026-03-21 00:39:07 +00:00 · 2021-06-14 11:29:48 +02:00
18 changed files with 45 additions and 51 deletions
--- a/tip-wlan/charts/opensync-gw-cloud/values.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: opensync-gateway-cloud
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 waitForServicesImage:
  registry: tip-docker-cache-repo.jfrog.io
--- a/tip-wlan/charts/opensync-gw-static/values.yaml
+++ b/tip-wlan/charts/opensync-gw-static/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: opensync-gateway-static
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 testConnectionImage:
  registry: tip-docker-cache-repo.jfrog.io
--- a/tip-wlan/charts/wlan-cloud-graphql-gw/templates/ingress.yaml
+++ b/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:
--- a/tip-wlan/charts/wlan-cloud-graphql-gw/values.yaml
+++ b/tip-wlan/charts/wlan-cloud-graphql-gw/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-cloud-graphql-gw
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT
  pullPolicy: IfNotPresent

 testConnectionImage:
--- a/tip-wlan/charts/wlan-cloud-static-portal/templates/ingress.yaml
+++ b/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:
--- a/tip-wlan/charts/wlan-cloud-static-portal/values.yaml
+++ b/tip-wlan/charts/wlan-cloud-static-portal/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-cloud-ui
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT
  pullPolicy: IfNotPresent

 testConnectionImage:
--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/values.yaml
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-integrated-cloud-component-service
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 waitForServicesImage:
  registry: tip-docker-cache-repo.jfrog.io
@@ -126,4 +126,4 @@ nodeSelector: {}

 tolerations: []

-affinity: {}
+affinity: {}
--- a/tip-wlan/charts/wlan-port-forwarding-gateway-service/values.yaml
+++ b/tip-wlan/charts/wlan-port-forwarding-gateway-service/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-port-forwarding-gateway-service
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 opensyncGwReadinessImage:
  registry: tip-docker-cache-repo.jfrog.io
--- a/tip-wlan/charts/wlan-portal-service/templates/ingress.yaml
+++ b/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:
--- a/tip-wlan/charts/wlan-portal-service/values.yaml
+++ b/tip-wlan/charts/wlan-portal-service/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-portal-service
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 testConnectionImage:
  registry: tip-docker-cache-repo.jfrog.io
@@ -160,4 +160,4 @@ filestore:
  internal: "/tmp/filestore"

 tlsv13:
-  enabled: true
+  enabled: true
--- a/tip-wlan/charts/wlan-prov-service/templates/deployment.yaml
+++ b/tip-wlan/charts/wlan-prov-service/templates/deployment.yaml
@@ -62,8 +62,8 @@ spec:
            apt update
            apt -y install curl
            echo "***** Fetching latest cloud-sdk-schema-postgresql for DB and Tables sql from JFrog *****"
-            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.3.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-db-user.sql"
-            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.3.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-tables.sql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.2.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-db-user.sql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.2.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-tables.sql"
            echo "***** Now executing cloud-sdk-schema-postgresql-db-user.sql on host {{ $pg }} and creating db prov_db and user tip_user using User Postgres. This uses full client-cert authentication *****"
            ### Observed that PSQL was unable to resolve the Postgres-service host because the postgres service wasnt
            ### really ready when running Postgres in Master-Slave config... hence the below retry-logic
--- a/tip-wlan/charts/wlan-prov-service/values.yaml
+++ b/tip-wlan/charts/wlan-prov-service/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-prov-service
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 waitForServicesImage:
  registry: tip-docker-cache-repo.jfrog.io
@@ -125,10 +125,10 @@ ingress:
 resources:
  limits:
    cpu: 500m
-    memory: 600Mi
+    memory: 320Mi
  requests:
    cpu: 10m
-    memory: 600Mi
+    memory: 300Mi

 nodeSelector: {}

--- a/tip-wlan/charts/wlan-spc-service/values.yaml
+++ b/tip-wlan/charts/wlan-spc-service/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-spc-service
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 waitForServicesImage:
  registry: tip-docker-cache-repo.jfrog.io
@@ -117,10 +117,10 @@ ingress:
 resources:
  limits:
    cpu: 500m
-    memory: 400Mi
+    memory: 370Mi
  requests:
    cpu: 10m
-    memory: 400Mi
+    memory: 350Mi

 nodeSelector: {}

--- a/tip-wlan/charts/wlan-ssc-service/templates/deployment.yaml
+++ b/tip-wlan/charts/wlan-ssc-service/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
            apt update
            apt -y install curl
            echo "***** Fetching cloud-sdk-schema-cassandra.cql from JFrog *****"
-            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.3.0-SNAPSHOT/cql/cloud-sdk-schema-cassandra.cql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.2.0-SNAPSHOT/cql/cloud-sdk-schema-cassandra.cql"
            echo "***** Now executing cloud-sdk-schema-cassandra.cql and creating/updating schema on Cassandra instance *****"
            counter=0
            status=1
--- a/tip-wlan/charts/wlan-ssc-service/values.yaml
+++ b/tip-wlan/charts/wlan-ssc-service/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1

 image:
  name: wlan-ssc-service
-  tag: 1.3.0-SNAPSHOT
+  tag: 1.2.0-SNAPSHOT

 waitForServicesImage:
  registry: tip-docker-cache-repo.jfrog.io
@@ -117,10 +117,10 @@ ingress:
 resources:
  limits:
    cpu: 500m
-    memory: 450Mi
+    memory: 420Mi
  requests:
    cpu: 10m
-    memory: 450Mi
+    memory: 400Mi

 nodeSelector: {}

--- a/tip-wlan/example-values/aws-basic/values.yml
+++ b/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
--- a/tip-wlan/example-values/aws-internal/values.yml
+++ b/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
--- a/tip-wlan/values.yaml
+++ b/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