From 0ac197681b2046738e75c74e0793d3a87d9b3634 Mon Sep 17 00:00:00 2001
From: yashasvi <yashasvi.pareta@devtron.ai>
Date: Tue, 25 Jun 2024 10:23:43 +0530
Subject: [PATCH 1/3] Adding scoop chart

---
 charts/scoop/.helmignore                      | 23 ++++++
 charts/scoop/Chart.yaml                       | 24 +++++++
 charts/scoop/templates/clusterrole.yaml       | 33 +++++++++
 .../scoop/templates/clusterrolebinding.yaml   | 14 ++++
 charts/scoop/templates/config.yaml            | 14 ++++
 charts/scoop/templates/deployment.yml         | 70 +++++++++++++++++++
 charts/scoop/templates/secret.yaml            | 13 ++++
 charts/scoop/templates/service.yaml           | 27 +++++++
 charts/scoop/templates/serviceaccount.yaml    | 12 ++++
 charts/scoop/values.yaml                      | 58 +++++++++++++++
 10 files changed, 288 insertions(+)
 create mode 100644 charts/scoop/.helmignore
 create mode 100644 charts/scoop/Chart.yaml
 create mode 100644 charts/scoop/templates/clusterrole.yaml
 create mode 100644 charts/scoop/templates/clusterrolebinding.yaml
 create mode 100644 charts/scoop/templates/config.yaml
 create mode 100644 charts/scoop/templates/deployment.yml
 create mode 100644 charts/scoop/templates/secret.yaml
 create mode 100644 charts/scoop/templates/service.yaml
 create mode 100644 charts/scoop/templates/serviceaccount.yaml
 create mode 100644 charts/scoop/values.yaml

diff --git a/charts/scoop/.helmignore b/charts/scoop/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/charts/scoop/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/scoop/Chart.yaml b/charts/scoop/Chart.yaml
new file mode 100644
index 00000000..fbc633b9
--- /dev/null
+++ b/charts/scoop/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: scoop
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+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.1.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.16.0"
diff --git a/charts/scoop/templates/clusterrole.yaml b/charts/scoop/templates/clusterrole.yaml
new file mode 100644
index 00000000..e099c917
--- /dev/null
+++ b/charts/scoop/templates/clusterrole.yaml
@@ -0,0 +1,33 @@
+# Source: deployment-chart_4-18-0/templates/generic.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  annotations:
+    rbac.authorization.kubernetes.io/autoupdate: "true"
+  name: read-only-cluster-role-scoop
+rules:
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - '*'
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - '*'
+  verbs:
+  - get
+  - list
+  - watch
+---
\ No newline at end of file
diff --git a/charts/scoop/templates/clusterrolebinding.yaml b/charts/scoop/templates/clusterrolebinding.yaml
new file mode 100644
index 00000000..3953333f
--- /dev/null
+++ b/charts/scoop/templates/clusterrolebinding.yaml
@@ -0,0 +1,14 @@
+
+  # Source: deployment-chart_4-18-0/templates/generic.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: read-only-user-crb-scoop
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: read-only-cluster-role-scoop
+subjects:
+- kind: ServiceAccount
+  name: scoop-sa
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }} 
diff --git a/charts/scoop/templates/config.yaml b/charts/scoop/templates/config.yaml
new file mode 100644
index 00000000..a4a70cac
--- /dev/null
+++ b/charts/scoop/templates/config.yaml
@@ -0,0 +1,14 @@
+{{- if $.Values.ConfigMap.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ - name: "scoop-config"
+ - namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
+{{- if $.Values.ConfigMap.data }}
+data:
+{{ toYaml $.Values.ConfigMap.data | indent 2 }}
+{{- end }}
+{{- end}}
+
+
+
diff --git a/charts/scoop/templates/deployment.yml b/charts/scoop/templates/deployment.yml
new file mode 100644
index 00000000..6d68f165
--- /dev/null
+++ b/charts/scoop/templates/deployment.yml
@@ -0,0 +1,70 @@
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "release-name-deployment-chart-4-18-0"
+  labels:
+    app: "deployment-chart-4-18-0"
+    chart: "deployment-chart-4-18-0-4.18.0"
+    release: "release-name"
+    {{- if $.Values.labels }}
+{{ toYaml $.Values.labels | nindent 4 }}
+    {{- end }}
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
+spec:
+  selector:
+    matchLabels:
+      app: "deployment-chart-4-18-0"
+      release: "release-name"
+  replicas: 1
+  minReadySeconds: 60
+  template:
+    metadata:
+      labels:
+        app: "deployment-chart-4-18-0"
+        release: "release-name"
+        {{- if $.Values.labels }}
+    {{ toYaml $.Values.labels | indent 4 }}
+        {{- end }}
+    spec:
+      serviceAccount: sa-scoop
+      serviceAccountName: sa-scoop
+      terminationGracePeriodSeconds: 30
+      imagePullSecrets:
+        - name: {{ $.Values.imagePullSecrets }}
+      restartPolicy: Always
+      containers:
+        - name: "deployment-chart-4-18-0"
+          image: {{ $.Values.image.name }}
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: app
+              containerPort: {{ $.Values.containerPort }}
+              protocol: TCP
+          {{- if $.Values.env }}
+          env:
+{{ toYaml $.Values.env | indent 12 }}
+          {{- end }}
+
+          {{- if or $.Values.ConfigMap.data $.Values.secrets.data }}
+          envFrom:
+             {{- if $.Values.ConfigMap.data }}
+           - configMapRef:
+               name: "scoop-config"
+               data:  
+{{ toYaml $.Values.ConfigMap.data  | indent 16 }}
+                 {{- end }}
+          {{- end}}
+
+          {{- if $.Values.resources }}
+          resources: 
+{{ toYaml $.Values.resources | indent 12 }} 
+          {{- end }}
+
+          {{- if $.Values.volumeMounts }}
+          volumeMounts: 
+{{ toYaml $.Values.volumeMounts | indent 12 }}
+          {{- end }}            
+  revisionHistoryLimit: 3
+strategy: {}
+  
\ No newline at end of file
diff --git a/charts/scoop/templates/secret.yaml b/charts/scoop/templates/secret.yaml
new file mode 100644
index 00000000..27bf7492
--- /dev/null
+++ b/charts/scoop/templates/secret.yaml
@@ -0,0 +1,13 @@
+{{- if $.Values.secrets.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "scoop-secret"
+  namespace: {{ $.Values.scoopNamespace | default .Release.Namespace }}
+type: Opaque
+{{- if $.Values.secrets.data }}
+data:
+{{ toYaml $.Values.secrets.data | indent 2 }}
+{{- end }}
+{{- end }}
+
diff --git a/charts/scoop/templates/service.yaml b/charts/scoop/templates/service.yaml
new file mode 100644
index 00000000..a2ba3376
--- /dev/null
+++ b/charts/scoop/templates/service.yaml
@@ -0,0 +1,27 @@
+# deployment-chart-4-18-0-4.18.0urce: deployment-chart-4-18-0/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: "release-name-deployment-chart-4-18-0-service"
+  labels:
+    app: "deployment-chart-4-18-0"
+    release: "release-name"
+  {{- if $.Values.labels }}
+{{ toYaml .Values.labels | indent 2 }}
+  {{- end }}
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
+    
+spec:
+  {{- with $.Values.service.type }}
+  type: {{ $.Values.service.type }}
+  {{- end }}
+  ports:
+      {{- with $.Values.service.port }}
+    - port: {{ $.Values.service.port }}
+      {{- end }}
+      targetPort: 80
+      protocol: TCP
+      name: app
+  selector:
+    app: "deployment-chart-4-18-0"
+    
\ No newline at end of file
diff --git a/charts/scoop/templates/serviceaccount.yaml b/charts/scoop/templates/serviceaccount.yaml
new file mode 100644
index 00000000..6758915b
--- /dev/null
+++ b/charts/scoop/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+# Source: deployment-chart-4-18-0/templates/generic.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: scoop-sa  
+  #namespace: monitoring
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
+
+
+  
+
+  
\ No newline at end of file
diff --git a/charts/scoop/values.yaml b/charts/scoop/values.yaml
new file mode 100644
index 00000000..c2d601d6
--- /dev/null
+++ b/charts/scoop/values.yaml
@@ -0,0 +1,58 @@
+scoopnamespace: monitoring
+
+service:
+  type: ClusterIP
+  port: 80
+
+replicacount: 1
+imagePullSecrets: devtron-image-pull  
+image:
+  name: "nginx"
+
+containerPort: 80
+
+env:
+  - name: CONFIG-HASH
+    value: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
+  - name: SECRET-HASH
+    value: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+  - name: DEVTRON-APP-NAME
+    value: deployment-chart-4-18-0
+  - name: POD-NAME
+    valueFrom:
+      fieldRef:
+        fieldPath: metadata.name
+  - name: DEVTRON-CONTAINER-REPO
+    value: ""
+  - name: DEVTRON-CONTAINER-TAG
+    value: "1-95af053"
+  - name: X-PASS-KEY
+    value: "random-string"
+  - name: PASS-KEY
+    value: "random-string"
+  - name: RETENTION
+    value: "10080"
+
+ConfigMap:
+  name: "scoop-config"
+  enabled: true
+  data: 
+    key1: "key1value-1"
+
+secrets: 
+  name: "scoop-secret"
+  enabled: true
+  data: []
+
+volumeMounts: []
+
+resources:
+  limits:
+    cpu: "0.5"
+    memory: 5Gi
+  requests:
+    cpu: "0.3"
+    memory: 2Gi
+
+strategy: {}
+

From 2d29864bf7728bbfaddef2e33590a38d335018ec Mon Sep 17 00:00:00 2001
From: yashasvi <yashasvi.pareta@devtron.ai>
Date: Tue, 25 Jun 2024 15:17:48 +0530
Subject: [PATCH 2/3] Adding scoop chartt

---
 charts/scoop/templates/config.yaml         |  4 ++--
 charts/scoop/templates/deployment.yml      | 22 +++++++++++++---------
 charts/scoop/templates/secret.yaml         |  4 ++--
 charts/scoop/templates/serviceaccount.yaml |  2 +-
 charts/scoop/values.yaml                   |  7 ++++---
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/charts/scoop/templates/config.yaml b/charts/scoop/templates/config.yaml
index a4a70cac..fb2124f2 100644
--- a/charts/scoop/templates/config.yaml
+++ b/charts/scoop/templates/config.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
- - name: "scoop-config"
- - namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
+  name: {{ $.Values.ConfigMap.name }}
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
 {{- if $.Values.ConfigMap.data }}
 data:
 {{ toYaml $.Values.ConfigMap.data | indent 2 }}
diff --git a/charts/scoop/templates/deployment.yml b/charts/scoop/templates/deployment.yml
index 6d68f165..dda70b4d 100644
--- a/charts/scoop/templates/deployment.yml
+++ b/charts/scoop/templates/deployment.yml
@@ -27,8 +27,8 @@ spec:
     {{ toYaml $.Values.labels | indent 4 }}
         {{- end }}
     spec:
-      serviceAccount: sa-scoop
-      serviceAccountName: sa-scoop
+      #serviceAccount: scoop-sa
+      serviceAccountName: scoop-sa
       terminationGracePeriodSeconds: 30
       imagePullSecrets:
         - name: {{ $.Values.imagePullSecrets }}
@@ -48,12 +48,16 @@ spec:
 
           {{- if or $.Values.ConfigMap.data $.Values.secrets.data }}
           envFrom:
-             {{- if $.Values.ConfigMap.data }}
-           - configMapRef:
-               name: "scoop-config"
-               data:  
-{{ toYaml $.Values.ConfigMap.data  | indent 16 }}
-                 {{- end }}
+            {{- if $.Values.ConfigMap.enabled }}
+          - configMapRef:
+              name: {{ $.Values.ConfigMap.name }}
+            {{- end }}
+
+            {{- if $.Values.secrets.data }}
+          - SecretRef:
+              name: {{ $.Values.secrets.name }}
+            {{- end }}
+
           {{- end}}
 
           {{- if $.Values.resources }}
@@ -66,5 +70,5 @@ spec:
 {{ toYaml $.Values.volumeMounts | indent 12 }}
           {{- end }}            
   revisionHistoryLimit: 3
-strategy: {}
+#strategy: {}
   
\ No newline at end of file
diff --git a/charts/scoop/templates/secret.yaml b/charts/scoop/templates/secret.yaml
index 27bf7492..eb20ff36 100644
--- a/charts/scoop/templates/secret.yaml
+++ b/charts/scoop/templates/secret.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "scoop-secret"
-  namespace: {{ $.Values.scoopNamespace | default .Release.Namespace }}
+  name: scoop-secret
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
 type: Opaque
 {{- if $.Values.secrets.data }}
 data:
diff --git a/charts/scoop/templates/serviceaccount.yaml b/charts/scoop/templates/serviceaccount.yaml
index 6758915b..0f21cba8 100644
--- a/charts/scoop/templates/serviceaccount.yaml
+++ b/charts/scoop/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: scoop-sa  
+  name: scoop-sa
   #namespace: monitoring
   namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
 
diff --git a/charts/scoop/values.yaml b/charts/scoop/values.yaml
index c2d601d6..44870f00 100644
--- a/charts/scoop/values.yaml
+++ b/charts/scoop/values.yaml
@@ -34,13 +34,14 @@ env:
     value: "10080"
 
 ConfigMap:
-  name: "scoop-config"
+  name: scoop-config
   enabled: true
   data: 
     key1: "key1value-1"
+    key2: "keyvalue2"
 
 secrets: 
-  name: "scoop-secret"
+  name: scoop-secret
   enabled: true
   data: []
 
@@ -54,5 +55,5 @@ resources:
     cpu: "0.3"
     memory: 2Gi
 
-strategy: {}
+#strategy: {}
 

From fdfb26131b077974da631cffa3c397ccfe03dbb1 Mon Sep 17 00:00:00 2001
From: Yashasvi17 <155513200+YashasviDevtron@users.noreply.github.com>
Date: Mon, 2 Sep 2024 19:17:04 +0530
Subject: [PATCH 3/3] Delete charts/scoop directory

---
 charts/scoop/.helmignore                      | 23 ------
 charts/scoop/Chart.yaml                       | 24 ------
 charts/scoop/templates/clusterrole.yaml       | 33 ---------
 .../scoop/templates/clusterrolebinding.yaml   | 14 ----
 charts/scoop/templates/config.yaml            | 14 ----
 charts/scoop/templates/deployment.yml         | 74 -------------------
 charts/scoop/templates/secret.yaml            | 13 ----
 charts/scoop/templates/service.yaml           | 27 -------
 charts/scoop/templates/serviceaccount.yaml    | 12 ---
 charts/scoop/values.yaml                      | 59 ---------------
 10 files changed, 293 deletions(-)
 delete mode 100644 charts/scoop/.helmignore
 delete mode 100644 charts/scoop/Chart.yaml
 delete mode 100644 charts/scoop/templates/clusterrole.yaml
 delete mode 100644 charts/scoop/templates/clusterrolebinding.yaml
 delete mode 100644 charts/scoop/templates/config.yaml
 delete mode 100644 charts/scoop/templates/deployment.yml
 delete mode 100644 charts/scoop/templates/secret.yaml
 delete mode 100644 charts/scoop/templates/service.yaml
 delete mode 100644 charts/scoop/templates/serviceaccount.yaml
 delete mode 100644 charts/scoop/values.yaml

diff --git a/charts/scoop/.helmignore b/charts/scoop/.helmignore
deleted file mode 100644
index 0e8a0eb3..00000000
--- a/charts/scoop/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/scoop/Chart.yaml b/charts/scoop/Chart.yaml
deleted file mode 100644
index fbc633b9..00000000
--- a/charts/scoop/Chart.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v2
-name: scoop
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-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.1.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.16.0"
diff --git a/charts/scoop/templates/clusterrole.yaml b/charts/scoop/templates/clusterrole.yaml
deleted file mode 100644
index e099c917..00000000
--- a/charts/scoop/templates/clusterrole.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Source: deployment-chart_4-18-0/templates/generic.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  annotations:
-    rbac.authorization.kubernetes.io/autoupdate: "true"
-  name: read-only-cluster-role-scoop
-rules:
-- apiGroups:
-  - '*'
-  resources:
-  - '*'
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - extensions
-  resources:
-  - '*'
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apps
-  resources:
-  - '*'
-  verbs:
-  - get
-  - list
-  - watch
----
\ No newline at end of file
diff --git a/charts/scoop/templates/clusterrolebinding.yaml b/charts/scoop/templates/clusterrolebinding.yaml
deleted file mode 100644
index 3953333f..00000000
--- a/charts/scoop/templates/clusterrolebinding.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  # Source: deployment-chart_4-18-0/templates/generic.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: read-only-user-crb-scoop
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: read-only-cluster-role-scoop
-subjects:
-- kind: ServiceAccount
-  name: scoop-sa
-  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }} 
diff --git a/charts/scoop/templates/config.yaml b/charts/scoop/templates/config.yaml
deleted file mode 100644
index fb2124f2..00000000
--- a/charts/scoop/templates/config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- if $.Values.ConfigMap.enabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ $.Values.ConfigMap.name }}
-  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
-{{- if $.Values.ConfigMap.data }}
-data:
-{{ toYaml $.Values.ConfigMap.data | indent 2 }}
-{{- end }}
-{{- end}}
-
-
-
diff --git a/charts/scoop/templates/deployment.yml b/charts/scoop/templates/deployment.yml
deleted file mode 100644
index dda70b4d..00000000
--- a/charts/scoop/templates/deployment.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: "release-name-deployment-chart-4-18-0"
-  labels:
-    app: "deployment-chart-4-18-0"
-    chart: "deployment-chart-4-18-0-4.18.0"
-    release: "release-name"
-    {{- if $.Values.labels }}
-{{ toYaml $.Values.labels | nindent 4 }}
-    {{- end }}
-  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
-spec:
-  selector:
-    matchLabels:
-      app: "deployment-chart-4-18-0"
-      release: "release-name"
-  replicas: 1
-  minReadySeconds: 60
-  template:
-    metadata:
-      labels:
-        app: "deployment-chart-4-18-0"
-        release: "release-name"
-        {{- if $.Values.labels }}
-    {{ toYaml $.Values.labels | indent 4 }}
-        {{- end }}
-    spec:
-      #serviceAccount: scoop-sa
-      serviceAccountName: scoop-sa
-      terminationGracePeriodSeconds: 30
-      imagePullSecrets:
-        - name: {{ $.Values.imagePullSecrets }}
-      restartPolicy: Always
-      containers:
-        - name: "deployment-chart-4-18-0"
-          image: {{ $.Values.image.name }}
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: app
-              containerPort: {{ $.Values.containerPort }}
-              protocol: TCP
-          {{- if $.Values.env }}
-          env:
-{{ toYaml $.Values.env | indent 12 }}
-          {{- end }}
-
-          {{- if or $.Values.ConfigMap.data $.Values.secrets.data }}
-          envFrom:
-            {{- if $.Values.ConfigMap.enabled }}
-          - configMapRef:
-              name: {{ $.Values.ConfigMap.name }}
-            {{- end }}
-
-            {{- if $.Values.secrets.data }}
-          - SecretRef:
-              name: {{ $.Values.secrets.name }}
-            {{- end }}
-
-          {{- end}}
-
-          {{- if $.Values.resources }}
-          resources: 
-{{ toYaml $.Values.resources | indent 12 }} 
-          {{- end }}
-
-          {{- if $.Values.volumeMounts }}
-          volumeMounts: 
-{{ toYaml $.Values.volumeMounts | indent 12 }}
-          {{- end }}            
-  revisionHistoryLimit: 3
-#strategy: {}
-  
\ No newline at end of file
diff --git a/charts/scoop/templates/secret.yaml b/charts/scoop/templates/secret.yaml
deleted file mode 100644
index eb20ff36..00000000
--- a/charts/scoop/templates/secret.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if $.Values.secrets.enabled }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: scoop-secret
-  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
-type: Opaque
-{{- if $.Values.secrets.data }}
-data:
-{{ toYaml $.Values.secrets.data | indent 2 }}
-{{- end }}
-{{- end }}
-
diff --git a/charts/scoop/templates/service.yaml b/charts/scoop/templates/service.yaml
deleted file mode 100644
index a2ba3376..00000000
--- a/charts/scoop/templates/service.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# deployment-chart-4-18-0-4.18.0urce: deployment-chart-4-18-0/templates/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: "release-name-deployment-chart-4-18-0-service"
-  labels:
-    app: "deployment-chart-4-18-0"
-    release: "release-name"
-  {{- if $.Values.labels }}
-{{ toYaml .Values.labels | indent 2 }}
-  {{- end }}
-  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
-    
-spec:
-  {{- with $.Values.service.type }}
-  type: {{ $.Values.service.type }}
-  {{- end }}
-  ports:
-      {{- with $.Values.service.port }}
-    - port: {{ $.Values.service.port }}
-      {{- end }}
-      targetPort: 80
-      protocol: TCP
-      name: app
-  selector:
-    app: "deployment-chart-4-18-0"
-    
\ No newline at end of file
diff --git a/charts/scoop/templates/serviceaccount.yaml b/charts/scoop/templates/serviceaccount.yaml
deleted file mode 100644
index 0f21cba8..00000000
--- a/charts/scoop/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Source: deployment-chart-4-18-0/templates/generic.yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: scoop-sa
-  #namespace: monitoring
-  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
-
-
-  
-
-  
\ No newline at end of file
diff --git a/charts/scoop/values.yaml b/charts/scoop/values.yaml
deleted file mode 100644
index 44870f00..00000000
--- a/charts/scoop/values.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-scoopnamespace: monitoring
-
-service:
-  type: ClusterIP
-  port: 80
-
-replicacount: 1
-imagePullSecrets: devtron-image-pull  
-image:
-  name: "nginx"
-
-containerPort: 80
-
-env:
-  - name: CONFIG-HASH
-    value: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-  - name: SECRET-HASH
-    value: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-  - name: DEVTRON-APP-NAME
-    value: deployment-chart-4-18-0
-  - name: POD-NAME
-    valueFrom:
-      fieldRef:
-        fieldPath: metadata.name
-  - name: DEVTRON-CONTAINER-REPO
-    value: ""
-  - name: DEVTRON-CONTAINER-TAG
-    value: "1-95af053"
-  - name: X-PASS-KEY
-    value: "random-string"
-  - name: PASS-KEY
-    value: "random-string"
-  - name: RETENTION
-    value: "10080"
-
-ConfigMap:
-  name: scoop-config
-  enabled: true
-  data: 
-    key1: "key1value-1"
-    key2: "keyvalue2"
-
-secrets: 
-  name: scoop-secret
-  enabled: true
-  data: []
-
-volumeMounts: []
-
-resources:
-  limits:
-    cpu: "0.5"
-    memory: 5Gi
-  requests:
-    cpu: "0.3"
-    memory: 2Gi
-
-#strategy: {}
-