Skip to content

Commit 1b3680b

Browse files
Updated scoop template
1 parent 2d29864 commit 1b3680b

File tree

9 files changed

+86
-87
lines changed

9 files changed

+86
-87
lines changed

charts/scoop/Chart.yaml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
1-
apiVersion: v2
2-
name: scoop
3-
description: A Helm chart for Kubernetes
4-
5-
# A chart can be either an 'application' or a 'library' chart.
6-
#
7-
# Application charts are a collection of templates that can be packaged into versioned archives
8-
# to be deployed.
9-
#
10-
# Library charts provide useful utilities or functions for the chart developer. They're included as
11-
# a dependency of application charts to inject those utilities and functions into the rendering
12-
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
1+
apiVersion: v1
2+
name: dt-scoop
3+
description: Chart to deploy scoop
134
type: application
14-
15-
# This is the chart version. This version number should be incremented each time you make changes
16-
# to the chart and its templates, including the app version.
17-
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.0
19-
20-
# This is the version number of the application being deployed. This version number should be
21-
# incremented each time you make changes to the application. Versions are not expected to
22-
# follow Semantic Versioning. They should reflect the version the application is using.
23-
# It is recommended to use it with quotes.
5+
version: 0.1.2
246
appVersion: "1.16.0"
7+
maintainers:
8+
9+
name: Devops-Team DEVTRON

charts/scoop/dt-scoop-0.1.2.tgz

2.29 KB
Binary file not shown.

charts/scoop/templates/clusterrole.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Source: deployment-chart_4-18-0/templates/generic.yaml
21
apiVersion: rbac.authorization.k8s.io/v1
32
kind: ClusterRole
43
metadata:

charts/scoop/templates/clusterrolebinding.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
# Source: deployment-chart_4-18-0/templates/generic.yaml
31
apiVersion: rbac.authorization.k8s.io/v1
42
kind: ClusterRoleBinding
53
metadata:

charts/scoop/templates/deployment.yml

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,67 @@
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
5-
name: "release-name-deployment-chart-4-18-0"
5+
name: scoop-deployment
66
labels:
7-
app: "deployment-chart-4-18-0"
8-
chart: "deployment-chart-4-18-0-4.18.0"
9-
release: "release-name"
107
{{- if $.Values.labels }}
118
{{ toYaml $.Values.labels | nindent 4 }}
129
{{- end }}
1310
namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
1411
spec:
1512
selector:
1613
matchLabels:
17-
app: "deployment-chart-4-18-0"
18-
release: "release-name"
19-
replicas: 1
14+
app: scoop-chart
15+
{{- if $.Values.scoop.replicacount }}
16+
replicas: {{ $.Values.scoop.replicacount}}
17+
{{- end }}
2018
minReadySeconds: 60
2119
template:
2220
metadata:
2321
labels:
24-
app: "deployment-chart-4-18-0"
25-
release: "release-name"
22+
app: scoop-chart
2623
{{- if $.Values.labels }}
2724
{{ toYaml $.Values.labels | indent 4 }}
2825
{{- end }}
2926
spec:
30-
#serviceAccount: scoop-sa
3127
serviceAccountName: scoop-sa
3228
terminationGracePeriodSeconds: 30
29+
30+
{{- if $.Values.scoop.imagePullSecrets }}
3331
imagePullSecrets:
34-
- name: {{ $.Values.imagePullSecrets }}
32+
- name: {{ $.Values.scoop.imagePullSecrets }}
33+
{{- end }}
3534
restartPolicy: Always
35+
36+
{{- if $.Values.volumes }}
37+
volumes:
38+
{{ toYaml $.Values.volumes | indent 8 }}
39+
{{- end }}
40+
3641
containers:
37-
- name: "deployment-chart-4-18-0"
38-
image: {{ $.Values.image.name }}
42+
- name: scoop-chart
43+
image: {{ $.Values.scoop.imagename }}
3944
imagePullPolicy: IfNotPresent
4045
ports:
4146
- name: app
42-
containerPort: {{ $.Values.containerPort }}
47+
containerPort: 8080
4348
protocol: TCP
4449
{{- if $.Values.env }}
4550
env:
4651
{{ toYaml $.Values.env | indent 12 }}
4752
{{- end }}
4853

49-
{{- if or $.Values.ConfigMap.data $.Values.secrets.data }}
54+
{{- if or $.Values.ConfigMap.enabled $.Values.secrets.enabled }}
5055
envFrom:
5156
{{- if $.Values.ConfigMap.enabled }}
5257
- configMapRef:
5358
name: {{ $.Values.ConfigMap.name }}
5459
{{- end }}
5560

56-
{{- if $.Values.secrets.data }}
61+
{{- if $.Values.secrets.enabled }}
5762
- SecretRef:
5863
name: {{ $.Values.secrets.name }}
5964
{{- end }}
60-
61-
{{- end}}
65+
{{- end }}
6266

6367
{{- if $.Values.resources }}
6468
resources:
@@ -70,5 +74,4 @@ spec:
7074
{{ toYaml $.Values.volumeMounts | indent 12 }}
7175
{{- end }}
7276
revisionHistoryLimit: 3
73-
#strategy: {}
7477

charts/scoop/templates/secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Secret
44
metadata:
5-
name: scoop-secret
5+
name: {{ $.Values.secrets.name }}
66
namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
77
type: Opaque
88
{{- if $.Values.secrets.data }}
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
# deployment-chart-4-18-0-4.18.0urce: deployment-chart-4-18-0/templates/service.yaml
21
apiVersion: v1
32
kind: Service
43
metadata:
5-
name: "release-name-deployment-chart-4-18-0-service"
4+
name: scoop-service
65
labels:
7-
app: "deployment-chart-4-18-0"
8-
release: "release-name"
6+
app: scoop-chart
97
{{- if $.Values.labels }}
108
{{ toYaml .Values.labels | indent 2 }}
119
{{- end }}
12-
namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
13-
10+
namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
1411
spec:
1512
{{- with $.Values.service.type }}
1613
type: {{ $.Values.service.type }}
@@ -19,9 +16,9 @@ spec:
1916
{{- with $.Values.service.port }}
2017
- port: {{ $.Values.service.port }}
2118
{{- end }}
22-
targetPort: 80
19+
targetPort: 8080
2320
protocol: TCP
2421
name: app
2522
selector:
26-
app: "deployment-chart-4-18-0"
23+
app: scoop-chart
2724

charts/scoop/templates/serviceaccount.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
# Source: deployment-chart-4-18-0/templates/generic.yaml
21
apiVersion: v1
32
kind: ServiceAccount
43
metadata:
54
name: scoop-sa
6-
#namespace: monitoring
75
namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
86

97

charts/scoop/values.yaml

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,78 @@
1-
scoopnamespace: monitoring
1+
# This is a YAML-formatted file.
2+
# Declare variables to be passed into your templates.
23

4+
scoopnamespace: "monitoring"
5+
# namespace where all the resource will be present
36
service:
47
type: ClusterIP
58
port: 80
69

7-
replicacount: 1
8-
imagePullSecrets: devtron-image-pull
9-
image:
10-
name: "nginx"
10+
scoop:
11+
replicacount: 1
12+
imagePullSecrets: devtron-image-pull
13+
imagename: "devtroninc.azurecr.io/scoop:f6a34987-629-23113"
1114

12-
containerPort: 80
1315

1416
env:
15-
- name: CONFIG-HASH
16-
value: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
17-
- name: SECRET-HASH
18-
value: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
19-
- name: DEVTRON-APP-NAME
20-
value: deployment-chart-4-18-0
21-
- name: POD-NAME
22-
valueFrom:
23-
fieldRef:
24-
fieldPath: metadata.name
25-
- name: DEVTRON-CONTAINER-REPO
26-
value: ""
27-
- name: DEVTRON-CONTAINER-TAG
28-
value: "1-95af053"
2917
- name: X-PASS-KEY
3018
value: "random-string"
31-
- name: PASS-KEY
19+
- name: PASS_KEY
3220
value: "random-string"
21+
# X_PASS_KEY and PASS_KEY (should be same) is used for authentication
3322
- name: RETENTION
3423
value: "10080"
24+
# period till which cache will be stored
25+
26+
# id of the cluster where scoop needs to get implemented
27+
- name: CLUSTER_ID
28+
value: "40"
29+
30+
# url to which scoop sends the metrics
31+
- name: ORCHESTRATOR_URL
32+
value: http://staging.devtron.info/orchestrator
33+
34+
#token of the orchestrator url
35+
- name: TOKEN
36+
value: gy567567Ggdl6HlKLgf
37+
# sotring the cache of specified namespaces. If you do not specify it, by default, it will store the cache of all the namespaces.
38+
# - name: CACHED_NAMESPACES
39+
# value: monitoring
3540

41+
42+
# Set enable to false, if you don't want to pass any configMapSecret
3643
ConfigMap:
3744
name: scoop-config
3845
enabled: true
39-
data:
40-
key1: "key1value-1"
41-
key2: "keyvalue2"
46+
data: []
47+
#: "key1value-1"
48+
#key2: "keyvalue2"
49+
4250

51+
# Set enable to false if you don't want to pass the values of secret.yaml from SecretRef
4352
secrets:
4453
name: scoop-secret
4554
enabled: true
4655
data: []
4756

57+
58+
volumes:
59+
# - name: log-volume
60+
# emptyDir: {}
61+
62+
4863
volumeMounts: []
64+
# - name: log-volume
65+
# mountPath: /var/log
4966

50-
resources:
51-
limits:
52-
cpu: "0.5"
53-
memory: 5Gi
54-
requests:
55-
cpu: "0.3"
56-
memory: 2Gi
67+
resources: {}
68+
# We usually recommend not to specify default resources and to leave this as a conscious
69+
# choice for the user. If you do want to specify resources, uncomment the following
70+
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
71+
#limits:
72+
#cpu: 1
73+
#memory: 200Mi
74+
#requests:
75+
#cpu: 0.10
76+
#memory: 100Mi
5777

58-
#strategy: {}
5978

0 commit comments

Comments
 (0)