revert 5.0 changes

Author: akshatsinha007

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes (StatefulSet)
-name: statefulset-chart_5-1-0
-version: 5.1.0
+name: statefulset-chart_5-0-0
+version: 5.0.0

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/_helpers.tpl

@@ -139,4 +139,5 @@ Create chart name and version as used by the chart label.
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
-{{- end -}}
+{{- end -}}
+

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/ambassador.yaml

@@ -5,11 +5,7 @@
 apiVersion: getambassador.io/v3alpha1
 kind: Mapping
 metadata:
-  {{- if .name }}
-  name: {{ .name }}
-  {{- else }}
-  name: {{ include ".Chart.Name .fullname" $ }}-mapping
-  {{- end }}
+  name:  {{ include ".Chart.Name .fullname" $ }}-mapping
   labels:
     app: {{ template ".Chart.Name .name" $ }}
     chart: {{ template ".Chart.Name .chart" $ }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/hpa.yaml

@@ -8,11 +8,7 @@ apiVersion: autoscaling/v2beta1
 {{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
-  {{- if $.Values.autoscaling.name }}
-  name: {{ $.Values.autoscaling.name }}
-  {{- else }}
   name: {{ template ".Chart.Name .fullname" $ }}-hpa
-  {{- end }}
   {{- if .Values.autoscaling.annotations }}
   annotations:
 {{ toYaml .Values.autoscaling.annotations | indent 4 }}
@@ -30,11 +26,7 @@ spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: StatefulSet
-    {{- if .Values.statefulSetConfig.name }}
-    name: {{ .Values.statefulSetConfig.name }}
-    {{- else }}
     name: {{ include ".Chart.Name .fullname" $ }}
-    {{- end }}
   minReplicas: {{ $.Values.autoscaling.MinReplicas  }}
   maxReplicas: {{ $.Values.autoscaling.MaxReplicas }}
   metrics:

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/ingress.yaml

@@ -21,11 +21,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  {{- if $.Values.ingress.name }}
-  name: {{ $.Values.ingress.name }}
-  {{- else }}
   name: {{ template ".Chart.Name .fullname" . }}-ingress
-  {{- end }}
   namespace: {{ $.Values.NameSpace }}
   labels:
     appId: {{ $.Values.app | quote }}
@@ -110,11 +106,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  {{- if $.Values.ingressInternal.name }}
-  name: {{ $.Values.ingressInternal.name }}
-  {{- else }}
   name: {{ template ".Chart.Name .fullname" . }}-ingress-internal
-  {{- end }}
   namespace: {{ $.Values.NameSpace }}
   labels:
     app: {{ template ".Chart.Name .name" $ }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/istio-gateway.yaml

@@ -2,11 +2,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
-  {{- if .Values.istio.gateway.name }}
-  name: {{ .Values.istio.gateway.name }}
-  {{- else }}
   name: {{ template ".Chart.Name .fullname" $ }}-istio-gateway
-  {{- end }}
   labels:
     appId: {{ $.Values.app | quote }}
     envId: {{ $.Values.env | quote }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/istio-virtualservice.yaml

@@ -3,11 +3,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  {{- if .virtualService.name }}
-  name: {{ .virtualService.name }}
-  {{- else }}
-  name: {{ template ".Chart.Name .fullname" $ }}-virtualservice
-  {{- end }}
+  name: {{  template ".Chart.Name .fullname" $ }}-virtualservice
   labels:
     appId: {{ $.Values.app | quote }}
     envId: {{ $.Values.env | quote }}
@@ -27,14 +23,10 @@ metadata:
 spec:
 {{- if or .gateway.enabled .virtualService.gateways }}
   gateways:
-    {{- if .gateway.enabled }}
-    {{- if .gateway.name }}
-    - name: {{ .gateway.name }}
-    {{- else }}
-    - name: {{ template ".Chart.Name .fullname" $ }}-istio-gateway
-    {{- end }}
-    {{- end }}
-    {{- range .virtualService.gateways }}
+  {{- if .gateway.enabled }} 
+    - {{ template ".Chart.Name .fullname" $ }}-istio-gateway
+  {{- end }}
+  {{- range .virtualService.gateways }}
     - {{ . | quote }}
   {{- end }}
 {{- end }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/keda-autoscaling.yaml

@@ -2,11 +2,7 @@
 apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
-  {{- if $.Values.kedaAutoscaling.name }}
-  name: {{ $.Values.kedaAutoscaling.name }}
-  {{- else }}
   name: {{ template ".Chart.Name .fullname" $ }}-keda
-  {{- end }}
   labels:
     app: {{ template ".Chart.Name .name" $ }}
     chart: {{ template ".Chart.Name .chart" $ }}
@@ -17,11 +13,7 @@ spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: StatefulSet
-    {{- if .Values.statefulSetConfig.name }}
-    name: {{ .Values.statefulSetConfig.name }}
-    {{- else }}
     name: {{ include ".Chart.Name .fullname" $ }}
-    {{- end }}
 {{- if $.Values.kedaAutoscaling.envSourceContainerName }}
     envSourceContainerName: {{ $.Values.kedaAutoscaling.envSourceContainerName }}
 {{- end }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/poddisruptionbudget.yaml

@@ -6,11 +6,7 @@ apiVersion: policy/v1beta1
 {{- end }}
 kind: PodDisruptionBudget
 metadata:
-  {{- if .Values.podDisruptionBudget.name }}
-  name: {{ .Values.podDisruptionBudget.name }}
-  {{- else }}
   name: {{ include ".Chart.Name .fullname" $ }}
-  {{- end }}
   labels:
     appId: {{ $.Values.app | quote }}
     envId: {{ $.Values.env | quote }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/prometheusrules.yaml

@@ -2,11 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  {{- if .Values.prometheusRule.name }}
-  name: {{ .Values.prometheusRule.name }}
-  {{- else }}
-  name: {{ template ".Chart.Name .fullname" . }}
-  {{- end }}
+  name:  {{ template ".Chart.Name .fullname" . }}
   {{- if .Values.prometheusRule.namespace }}
   namespace: {{ .Values.prometheusRule.namespace }}
   {{- end }}
@@ -23,11 +19,7 @@ metadata:
 spec:
   {{- with .Values.prometheusRule.rules }}
   groups:
-    {{- if $.Values.prometheusRule.name }}
-    - name: {{ $.Values.prometheusRule.name }}
-    {{- else }}
-    - name: {{ template ".Chart.Name .fullname" . }}
-    {{- end }}
+    - name: {{ template ".Chart.Name .fullname" $ }}
       rules: {{- toYaml . | nindent 6 }}
   {{- end }}
-  {{- end }}
+  {{- end }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/servicemonitor.yaml

@@ -4,11 +4,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  {{- if .Values.servicemonitor.name }}
-  name: {{ .Values.servicemonitor.name }}
-  {{- else }}
   name: {{ template ".Chart.Name .fullname" . }}-sm
-  {{- end }}
   labels:
     kind: Prometheus
     appId: {{ $.Values.app | quote }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/statefulset.yaml

@@ -26,11 +26,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  {{- if .Values.statefulSetConfig.name }}
-  name: {{ .Values.statefulSetConfig.name }}
-  {{- else }}
   name: {{ include ".Chart.Name .fullname" $ }}
-  {{- end }}
   labels:
     appId: {{ $.Values.app | quote }}
     envId: {{ $.Values.env | quote }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/winter-soldier.yaml

@@ -2,11 +2,7 @@
 apiVersion: {{ $.Values.winterSoldier.apiVersion }}
 kind: Hibernator
 metadata:
-  {{- if .Values.winterSoldier.name }}
-  name: {{ .Values.winterSoldier.name }}
-  {{- else }}
   name: {{ template ".Chart.Name .fullname" $ }}-hibernator
-  {{- end }}
   labels:
     appId: {{ $.Values.app | quote }}
     envId: {{ $.Values.env | quote }}
@@ -29,11 +25,7 @@ spec:
   selectors:
     - inclusions:
         - objectSelector:
-            {{- if .Values.statefulSetConfig.name }}
-            name: {{ .Values.statefulSetConfig.name }}
-            {{- else }}
             name: {{ include ".Chart.Name .fullname" $ }}
-            {{- end }}
             type: StatefulSet
             fieldSelector:
 {{toYaml $.Values.winterSoldier.fieldSelector | indent 14}} 

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/test_values.yaml

@@ -6,11 +6,9 @@ kedaAutoscaling:
 ambassadorMapping:
   enabled: true
 istio:
-  enable: true
+  enabled: true
   gateway:
     enabled: true
-  virtualService:
-    enabled: true
 appLabels: 
       test: thyjhgfv
 containerSpec:
@@ -265,7 +263,6 @@ servicemonitor:
 
 
 prometheusRule:
-  name: ""
   enabled: true
   additionalLabels: {}
   namespace: ""

scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/values.yaml

@@ -47,7 +47,6 @@ image:
   pullPolicy: IfNotPresent
 
 autoscaling:
-  name:
   enabled: false
   MinReplicas: 1
   MaxReplicas: 2
@@ -83,7 +82,6 @@ autoscaling:
 #
 
 kedaAutoscaling:
-  name:
   enabled: false
   envSourceContainerName: "" # Optional. Default: .spec.template.spec.containers[0]
   cooldownPeriod: 300 # Optional. Default: 300 seconds
@@ -175,11 +173,9 @@ ReadinessProbe:
 #      value: abc
 
 prometheus:
-  name:
   release: monitoring
 
 servicemonitor:
-  name:
   additionalLabels: {}
 
 
@@ -218,7 +214,6 @@ prometheusRule:
 #        summary: More than 5% of the all requests did return 4XX, this require your attention
 #
 winterSoldier:
-  name:
   enabled: false
   apiVersion: pincher.devtron.ai/v1alpha1
   labels: {}
@@ -231,7 +226,6 @@ winterSoldier:
   fieldSelector: []
   type: StatefulSet
 ingress:
-  name:
   enabled: false
   className: ""
   labels: {}
@@ -285,7 +279,6 @@ ingressInternal:
 istio:
   enable: false
   gateway:
-    name:
     enabled: false
     labels: {}
     annotations: {}
@@ -294,7 +287,6 @@ istio:
       enabled: false
       secretName: ""
   virtualService:
-    name:
     enabled: false
     labels: {}
     annotations: {}
@@ -514,7 +506,6 @@ envoyproxy:
      memory: 50Mi
 
 ambassadorMapping:
-  # name: ""
   enabled: false
   # labels:
   #   key1: value1