increase prov service memory (#83 )

Merge pull request #82 from Telecominfraproject/feature/example-values-update
[TOOLS-146] Del: usage of docker credentials as anonymous pull is allowd
2026-03-20 21:39:10 +00:00 · 2021-06-25 14:36:17 +02:00 · 2021-06-24 16:15:39 +03:00 · 2021-06-24 12:54:43 +03:00 · 2021-06-23 15:09:31 +02:00
9 changed files with 36 additions and 30 deletions
--- 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/Ingress" }}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
 apiVersion: networking.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 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/Ingress" }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
            pathType: ImplementationSpecific
            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
              service:
                name: ssl-redirect
                port:
@@ -54,11 +54,11 @@ spec:
        {{- end }}
        {{- range .paths }}
          - path: {{ . }}
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
            pathType: ImplementationSpecific
            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
              service:
                name: {{ $fullName }}
                port:
--- 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/Ingress" }}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
 apiVersion: networking.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 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/Ingress" }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
            pathType: ImplementationSpecific
            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
              service:
                name: ssl-redirect
                port:
@@ -54,11 +54,11 @@ spec:
        {{- end }}
        {{- range .paths }}
          - path: {{ . }}
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
            pathType: ImplementationSpecific
            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
              service:
                name: {{ $fullName }}
                port:
--- 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/Ingress" }}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
 apiVersion: networking.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 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/Ingress" }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
            pathType: ImplementationSpecific
            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
              service:
                name: ssl-redirect
                port:
@@ -52,11 +52,11 @@ spec:
        {{- end }}
        {{- range .paths }}
          - path: {{ . }}
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
            pathType: ImplementationSpecific
            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
              service:
                name: {{ $fullName }}
                port:
--- a/tip-wlan/charts/wlan-prov-service/values.yaml
+++ b/tip-wlan/charts/wlan-prov-service/values.yaml
@@ -125,10 +125,10 @@ ingress:
 resources:
  limits:
    cpu: 500m
-    memory: 320Mi
+    memory: 600Mi
  requests:
    cpu: 10m
-    memory: 300Mi
+    memory: 600Mi

 nodeSelector: {}

--- a/tip-wlan/charts/wlan-spc-service/values.yaml
+++ b/tip-wlan/charts/wlan-spc-service/values.yaml
@@ -117,10 +117,10 @@ ingress:
 resources:
  limits:
    cpu: 500m
-    memory: 370Mi
+    memory: 400Mi
  requests:
    cpu: 10m
-    memory: 350Mi
+    memory: 400Mi

 nodeSelector: {}

--- a/tip-wlan/charts/wlan-ssc-service/values.yaml
+++ b/tip-wlan/charts/wlan-ssc-service/values.yaml
@@ -117,10 +117,10 @@ ingress:
 resources:
  limits:
    cpu: 500m
-    memory: 420Mi
+    memory: 450Mi
  requests:
    cpu: 10m
-    memory: 400Mi
+    memory: 450Mi

 nodeSelector: {}

--- a/tip-wlan/example-values/aws-basic/values.yml
+++ b/tip-wlan/example-values/aws-basic/values.yml
@@ -12,7 +12,6 @@ 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,7 +12,6 @@ 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: tip-read
-    password: tip-read
+    # username: username
+    # password: password
  # image pull policy
  pullPolicy: IfNotPresent

@@ -86,7 +86,7 @@ global:
      path: /opt/bitnami/jmx-exporter/jmx_prometheus_javaagent.jar

 # DockerRegistry Secret
-createDockerRegistrySecret: true
+createDockerRegistrySecret: false

 # Enabling components under Tip-wlan
 opensync-gw-static:
@@ -184,13 +184,21 @@ 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: 1400Mi
+      memory: 1100Mi

 cassandra:
  enabled: false
Author	SHA1	Message	Date
Max	63686fbea8	increase prov service memory (#83 )	2021-06-25 14:36:17 +02:00
Dmitry Dunaev	0213319a3d	Merge pull request #82 from Telecominfraproject/feature/example-values-update [TOOLS-146] Del: usage of docker credentials as anonymous pull is allowd	2021-06-24 16:15:39 +03:00
Dmitry Dunaev	ea263e23d6	[TOOLS-146] Del: usage of docker credentials as anonymous pull is allowed	2021-06-24 12:54:43 +03:00
Max	f0cdde9a87	increase memory values for SSC, SPC and prov service (#81 ) * increase memory values for SSC, SPC and prov service * update values for Kafka and Zookeeper	2021-06-23 15:09:31 +02:00