Add the option to configure initResources for ANM, API-Mgr, API-Traff…

…ic and API-Portal
Axway · Feb 15, 2022 · 5397fd4 · 5397fd4
1 parent 5175f07
commit 5397fd4
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 3 deletions.
diff --git a/APIM/Helmchart/CHANGELOG.md b/APIM/Helmchart/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.4.0] 2022-02-15
+
+### Added
+- Add the option to configure initResources for ANM, API-Mgr, API-Traffic and API-Portal
+
 ## [2.3.1] 2022-02-14
 
 ### Changed

diff --git a/APIM/Helmchart/Chart.yaml b/APIM/Helmchart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 
 appVersion: 7.7-20210830
 
-version: "2.3.1"
+version: "2.4.0"
 
 description: Helm chart for installing the Axway API-Management solution.
 icon: https://images.app.goo.gl/MbQyRo2M2jzAsed79

diff --git a/APIM/Helmchart/examples/aws-eks/README.md b/APIM/Helmchart/examples/aws-eks/README.md
@@ -74,7 +74,7 @@ You can overwrite all parameters of the base [`values.yaml`](../../values.yaml),
 
 To finally start the deployment into your Kubernetes Cluster using Helm, use now the following command:
 ```
-helm install axway-apim -n apim -f .\local-values-eks.yaml https://github.com/Axway/Cloud-Automation/releases/download/apim-helm-v2.3.1/helm-chart-axway-apim-2.3.1.tgz
+helm install axway-apim -n apim -f .\local-values-eks.yaml https://github.com/Axway/Cloud-Automation/releases/download/apim-helm-v2.4.0/helm-chart-axway-apim-2.4.0.tgz
 ```
 
 Now check if the resources, such as pods, ingresses, services, etc. are created and correct any problems that occur.

diff --git a/APIM/Helmchart/examples/google-gke/README.md b/APIM/Helmchart/examples/google-gke/README.md
@@ -83,7 +83,7 @@ You can overwrite all parameters of the base [`values.yaml`](../../values.yaml),
 
 To finally start the deployment into your Kubernetes Cluster using Helm, use now the following command:
 ```
-helm install axway-apim -n apim -f .\local-values-gke.yaml https://github.com/Axway/Cloud-Automation/releases/download/apim-helm-v2.3.1/helm-chart-axway-apim-2.3.1.tgz
+helm install axway-apim -n apim -f .\local-values-gke.yaml https://github.com/Axway/Cloud-Automation/releases/download/apim-helm-v2.4.0/helm-chart-axway-apim-2.4.0.tgz
 ```
 
 Now check if the resources, such as pods, ingresses, services, etc. are created and correct any problems that occur.

diff --git a/APIM/Helmchart/templates/anm/anm-deployment.yaml b/APIM/Helmchart/templates/anm/anm-deployment.yaml
@@ -95,6 +95,8 @@ spec:
       - name: init-mysql
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "mysqlmetrics.name" . }} {{ .Values.mysqlmetrics.primary.service.port }}; do echo waiting for mysql; sleep 2; done;']
+        resources:
+{{ toYaml .Values.anm.initResources | indent 10 }}
       {{- end }}
       {{- if .Values.anm.extraInitContainers }}
 {{ tpl .Values.anm.extraInitContainers . | indent 6 }}

diff --git a/APIM/Helmchart/templates/apimgr/apimgr-deployment.yaml b/APIM/Helmchart/templates/apimgr/apimgr-deployment.yaml
@@ -87,14 +87,20 @@ spec:
       - name: init-cassandra
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "cassandra.name" . }} {{ .Values.cassandra.service.port }}; do echo waiting for cassandra-0; sleep 2; done;']
+        resources:
+{{ toYaml .Values.apimgr.initResources | indent 10 }}
       {{- if .Values.mysqlmetrics.internal }}
       - name: init-mysql
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "mysqlmetrics.name" . }} {{ .Values.mysqlmetrics.primary.service.port }}; do echo waiting for mysql; sleep 2; done;']
+        resources:
+{{ toYaml .Values.apimgr.initResources | indent 10 }}
       {{- end }}
       - name: init-anm
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "anm.name" . }} {{ .Values.anm.service.port }}; do echo waiting for anm; sleep 2; done;']      
+        resources:
+{{ toYaml .Values.apimgr.initResources | indent 10 }}
       {{- if .Values.apimgr.extraInitContainers }}
 {{ tpl .Values.apimgr.extraInitContainers . | indent 6 }}
       {{- end }}

diff --git a/APIM/Helmchart/templates/apiportal/apiportal-deployment.yaml b/APIM/Helmchart/templates/apiportal/apiportal-deployment.yaml
@@ -94,10 +94,14 @@ spec:
       - name: init-mysql-apiportal
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "mysqlapiportal.name" . }} {{ .Values.mysqlapiportal.primary.service.port }}; do echo waiting for apiportal mysql; sleep 2; done;']
+        resources:
+{{ toYaml .Values.apiportal.initResources | indent 10 }}
       {{- end }}
       - name: init-apimgmt
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "apimgr.name" . }} 8075; do echo waiting for apimgr; sleep 2; done;']
+        resources:
+{{ toYaml .Values.apiportal.initResources | indent 10 }}
       {{- if .Values.apiportal.extraInitContainers }}
 {{ tpl .Values.apiportal.extraInitContainers . | indent 6 }}
       {{- end }}

diff --git a/APIM/Helmchart/templates/apitraffic/apitraffic-deployment.yaml b/APIM/Helmchart/templates/apitraffic/apitraffic-deployment.yaml
@@ -108,14 +108,20 @@ spec:
       - name: init-cassandra
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "cassandra.name" . }} {{ .Values.cassandra.service.port }}; do echo waiting for cassandra-0; sleep 2; done;']
+        resources:
+{{ toYaml .Values.apitraffic.initResources | indent 10 }}
       {{- if .Values.mysqlmetrics.internal }}
       - name: init-mysql
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "mysqlmetrics.name" . }} {{ .Values.mysqlmetrics.primary.service.port }}; do echo waiting for mysql; sleep 2; done;']
+        resources:
+{{ toYaml .Values.apitraffic.initResources | indent 10 }}
       {{- end }}
       - name: init-anm
         image: busybox:1.33
         command: ['sh', '-c', 'until nc -w 3 -v {{ template "anm.name" . }} {{ .Values.anm.service.port }}; do echo waiting for anm; sleep 2; done;']
+        resources:
+{{ toYaml .Values.apitraffic.initResources | indent 10 }}
       {{- if .Values.apitraffic.extraInitContainers }}
 {{ tpl .Values.apitraffic.extraInitContainers . | indent 6 }}
       {{- end }}

diff --git a/APIM/Helmchart/values.yaml b/APIM/Helmchart/values.yaml
@@ -184,6 +184,15 @@ anm:
          cpu: "500m"
          memory: "1Gi"
 
+   # Resources for all Admin-Node-Manager Init-Containers
+   initResources: {}
+   #   requests:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+   #   limits:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+
    args: 
    - /opt/Axway/apigateway/posix/bin/start-emt-nodemanager
 
@@ -321,6 +330,15 @@ apimgr:
          cpu: "500m"
          memory: "1Gi"
 
+   # Resources for all API-Manager Init-Containers
+   initResources: {}
+   #   requests:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+   #   limits:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+
    lifecycle:
       preStop:
          exec:
@@ -463,6 +481,15 @@ apitraffic:
          cpu: "1000m"
          memory: "1536Mi"
 
+   # Resources for all API-Traffic (API-Gateway) Init-Containers
+   initResources: {}
+   #   requests:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+   #   limits:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+
    podSecurityContext:
       runAsUser: 1000
       fsGroup: 1000
@@ -704,6 +731,15 @@ apiportal:
          cpu: "500m"
          memory: "1000Mi"
 
+   # Resources for all API-Portal Init-Containers
+   initResources: {}
+   #   requests:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+   #   limits:
+   #      cpu: "25m"
+   #      memory: "80Mi"
+
    args: []
    # - /do/some/other/stuff