Remove unnecessary variables in Helm chart & refactor templates (#12011)

deploy/helm/Chart.yaml

@@ -12,4 +12,4 @@ sources:
   - https://github.com/appsmithorg/appsmith
 home: https://www.appsmith.com/
 icon: https://assets.appsmith.com/appsmith-icon.png
-version: 1.5.2
+version: 1.5.3

deploy/helm/README.md

@@ -96,12 +96,6 @@ The command uninstalls the release and removes all Kubernetes resources associat
 | `tolerations`								| Tolerations for pod assignment											| `[]`						|
 | `affinity`									| Affinity fod pod assignment													| `{}`						|
 
-
-### Appsmith namespace parameters
-| Name 						  | Description 																																				 	| Value 	|
-| ----------------- | ------------------------------------------------------------------------------------- | ------- |
-| `namespace.create`| Enable creation of `Namespace`															 													| `true` 	|
-
 ### Appsmith service account parameters
 | Name 											 		| Description 																																				 												| Value 	|
 | ----------------------------- | ----------------------------------------------------------------------------------------------------------- | ------- |
@@ -121,6 +115,7 @@ The command uninstalls the release and removes all Kubernetes resources associat
 | `service.loadBalancerSourceRanges`	| Appsmith service Load Balancer sources                                      						| `[]` 				|
 | `service.annotations` 		 					| Additional custom annotations for Appsmith service 																 			| `{}` 				|
 | `ingress.enabled` 				 					| Enable ingress record generation for Appsmith                                       		| `false` 		|
+|	`ingress.annotations`								|	Additional custom annotations for Ingress																								|	`{}`				|
 | `ingress.hosts`            					| An array of hosts to be covered with the ingress record                             		| `[]` 				|
 | `ingress.tls`              					| Enable TLS configuration for the hosts defined at `ingress.hosts` parameter         		| `false` 		|
 | `ingress.secrets`										| Custom TLS certificates as secrets																											| `[]`				|

deploy/helm/templates/persistentVolumeClaim.yaml

@@ -1,16 +0,0 @@
-{{- if and .Values.persistence.enabled ( not .Values.useStatefulSet) }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "appsmith.fullname" . }}
-  namespace: {{ include "appsmith.namespace" . }}
-spec:
-  accessModes:
-  {{- range .Values.persistence.accessModes }}
-    - {{ . | quote }}
-  {{- end }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size | quote }}
-  {{ include "storage.class" (dict "persistence" .Values.persistence "global" .Values.global) }}
-{{- end }}

deploy/helm/templates/statefulset.yaml

@@ -1,24 +1,15 @@
 apiVersion: apps/v1
-kind: {{ if .Values.useStatefulSet }}StatefulSet{{- else }}Deployment{{- end }}
+kind: StatefulSet
 metadata:
   name: {{ include "appsmith.fullname" . }}
   namespace: {{ include "appsmith.namespace" . }}
   labels:
     {{- include "appsmith.labels" . | nindent 4 }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
   replicas: 1
-  {{- end }}
-  {{- if .Values.useStatefulSet }}
   serviceName: {{ include "appsmith.fullname" . }}
   updateStrategy:
-  {{- else }}
-  strategy:
-  {{- end }}
     type: {{ .Values.strategyType }}
-    {{- if or (and (not .Values.useStatefulSet) (eq "Recreate" .Values.strategyType)) (and .Values.useStatefulSet (eq "OnDelete" .Values.strategyType))  }}
-    rollingUpdate: null
-    {{- end }}
   selector:
     matchLabels:
       {{- include "appsmith.selectorLabels" . | nindent 6 }}
@@ -85,10 +76,6 @@ spec:
   {{- if not .Values.persistence.enabled }}
       - name: data
         emptyDir: {}
-  {{- else if not .Values.useStatefulSet }}
-      - name: data
-        persistentVolumeClaim:
-          claimName: {{ template "appsmith.fullname" . }}
   {{- else }}
   volumeClaimTemplates:
     - metadata:
@@ -104,8 +91,5 @@ spec:
         resources:
           requests:
             storage: {{ .Values.persistence.size | quote }}
-        {{- if .Values.persistence.volumeClaimTemplates.selector }}
-        selector: {{- include "tplvalues.render" (dict "value" .Values.persistence.volumeClaimTemplates.selector "context" $) | nindent 10 }}
-        {{- end }}
         {{ include "storage.class" (dict "persistence" .Values.persistence "global" .Values.global) }}
   {{- end }}

deploy/helm/values.yaml

@@ -22,9 +22,6 @@ commonLabels: {}
 ## @param commonAnnotations Common annotations to add to all Appsmith resources (sub-charts are not considered). Evaluated as a template
 ##
 commonAnnotations: {}
-## @param useStatefulSet Set to true to use a StatefulSet instead of a Deployment
-##
-useStatefulSet: true
 ## @param schedulerName Name of the scheduler (other than default) to dispatch pods
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
 ##
@@ -41,10 +38,6 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
-## Namespace
-##
-namespace:
-  create: true
 ## ServiceAccount
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
 ##
@@ -174,13 +167,6 @@ resources:
   limits: {}
   requests: {}
 
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
 nodeSelector: {}
 
 tolerations: []
@@ -214,22 +200,6 @@ persistence:
   ## @param persistence.size PVC Storage Request
   ##
   size: 10Gi
-  ## Fine tuning for volumeClaimTemplates
-  ##
-  volumeClaimTemplates:
-    ## @param persistence.volumeClaimTemplates.selector A label query over volumes to consider for binding (e.g. when using local volumes)
-    ## A label query over volumes to consider for binding (e.g. when using local volumes)
-    ## See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#labelselector-v1-meta for more details
-    ##
-    selector: {}
-    ## @param persistence.volumeClaimTemplates.requests Custom PVC requests attributes
-    ## Sometime cloud providers use additional requests attributes to provision custom storage instance
-    ## See https://cloud.ibm.com/docs/containers?topic=containers-file_storage#file_dynamic_statefulset
-    ##
-    requests: {}
-    ## @param persistence.volumeClaimTemplates.dataSource Add dataSource to the VolumeClaimTemplate
-    ##
-    dataSource: {}
 # tags:
 #   install-ingress-nginx: true
 storageClass: