[K8s] Onboarding Server Helm chart rework to use single deployment for all verticles

K8s-deployment/Charts/onboarding-server/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
+version: 1.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0-alpha"
+appVersion: "1.0.1-alpha"

K8s-deployment/Charts/onboarding-server/example-aws-resource-values.yaml

@@ -4,12 +4,12 @@ ingress:
     cert-manager.io/cluster-issuer: "letsencrypt-staging" # use letsencrypt-prod if proper letsencrypt certs are required
   }
 
-## apiServer resource requests and limits
+## onboardingServer resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param apiServer.resources.limits The resources limits for the apiServer containers
-## @param apiServer.resources.requests The requested resources for the apiServer containers
+## @param onboardingServer.resources.limits The resources limits for the onboardingServer containers
+## @param onboardingServer.resources.requests The requested resources for the onboardingServer containers
 ##
-apiServer:
+onboardingServer:
   enabled: true
   nodeSelector:
     node.kubernetes.io/instance-type: t3a.medium
@@ -20,71 +20,3 @@ apiServer:
     requests: 
       cpu: 400m
       memory: 600Mi
-
-## catalogue resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param catalogue.resources.limits The resources limits for the catalogue containers
-## @param catalogue.resources.requests The requested resources for the catalogue containers
-##
-catalogue:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: t3a.medium
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi
-
-## token resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param token.resources.limits The resources limits for the token containers
-## @param token.resources.requests The requested resources for the token containers
-##
-token:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: t3a.medium
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi
-
-## resourceServer resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param resourceServer.resources.limits The resources limits for the resourceServer containers
-## @param resourceServer.resources.requests The requested resources for the resourceServer containers
-##
-resourceServer:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: t3a.medium
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi
-
-## ingestion resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param ingestion.resources.limits The resources limits for the ingestion containers
-## @param ingestion.resources.requests The requested resources for the ingestion containers
-##
-ingestion:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: t3a.medium
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi

K8s-deployment/Charts/onboarding-server/example-azure-resource-values.yaml

@@ -3,12 +3,12 @@ ingress:
   annotations: {
     cert-manager.io/cluster-issuer: "letsencrypt-staging" # use letsencrypt-prod if proper letsencrypt certs are required
   }
-## apiServer resource requests and limits
+## onboardingServer resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param apiServer.resources.limits The resources limits for the apiServer containers
-## @param apiServer.resources.requests The requested resources for the apiServer containers
+## @param onboardingServer.resources.limits The resources limits for the onboardingServer containers
+## @param onboardingServer.resources.requests The requested resources for the onboardingServer containers
 ##
-apiServer:
+onboardingServer:
   enabled: true
   nodeSelector:
     node.kubernetes.io/instance-type: Standard_B2s
@@ -19,71 +19,3 @@ apiServer:
     requests: 
       cpu: 400m
       memory: 600Mi
-
-## catalogue resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param catalogue.resources.limits The resources limits for the catalogue containers
-## @param catalogue.resources.requests The requested resources for the catalogue containers
-##
-catalogue:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: Standard_B2s
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi
-
-## token resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param token.resources.limits The resources limits for the token containers
-## @param token.resources.requests The requested resources for the token containers
-##
-token:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: Standard_B2s
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi
-
-## resourceServer resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param resourceServer.resources.limits The resources limits for the resourceServer containers
-## @param resourceServer.resources.requests The requested resources for the resourceServer containers
-##
-resourceServer:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: Standard_B2s
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi
-
-## ingestion resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## @param ingestion.resources.limits The resources limits for the ingestion containers
-## @param ingestion.resources.requests The requested resources for the ingestion containers
-##
-ingestion:
-  enabled: true
-  nodeSelector:
-    node.kubernetes.io/instance-type: Standard_B2s
-  resources:
-    limits:
-      cpu: 600m
-      memory: 750Mi
-    requests: 
-      cpu: 400m
-      memory: 600Mi

K8s-deployment/Charts/onboarding-server/templates/_helpers.tpl

@@ -45,8 +45,8 @@ Compile all warnings into a single message.
 */}}
 {{- define "catalogue.validateValues" -}}
 {{- $messages := list -}}
-{{- $messages := append $messages (include "catalogue.apiServer.validateValues.foo" .) -}}
-{{- $messages := append $messages (include "catalogue.apiServer.validateValues.bar" .) -}}
+{{- $messages := append $messages (include "catalogue.onboardingServer.validateValues.foo" .) -}}
+{{- $messages := append $messages (include "catalogue.onboardingServer.validateValues.bar" .) -}}
 {{- $messages := without $messages "" -}}
 {{- $message := join "\n" $messages -}}
 
@@ -90,4 +90,4 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else
         {{- end -}}
     {{- end -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}