Skip to content

Commit 8203b87

Browse files
authored
Merge pull request #19 from prasebha/feature/prasebha/v1.1.2
Kubernetes Inventory changes
2 parents fe64d74 + 61a1c5c commit 8203b87

File tree

5 files changed

+133
-2
lines changed

5 files changed

+133
-2
lines changed

kubernetes-monitoring/mgmtagent_helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.1
18+
version: 0.1.2
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

kubernetes-monitoring/mgmtagent_helm/templates/mgmtagent_cluster_role.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ rules:
3333
- get
3434
- list
3535
- watch
36+
- apiGroups:
37+
- apps
38+
resources:
39+
- '*'
40+
verbs:
41+
- get
42+
- list
43+
- watch
3644

3745
---
3846

kubernetes-monitoring/mgmtagent_helm/templates/mgmtagent_statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ spec:
4343
name: mgmtagent-pvc
4444
spec:
4545
accessModes: [ "ReadWriteOnce" ]
46-
storageClassName: "oci-bv"
46+
{{- if .Values.kubernetesCluster.storageClass }}
47+
storageClassName: {{ .Values.kubernetesCluster.storageClass }}
48+
{{- end }}
4749
resources:
4850
requests:
4951
storage: 2Gi
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"$schema": "https://json-schema.org/draft-07/schema#",
3+
"properties":
4+
{
5+
"mgmtagent":
6+
{
7+
"properties":
8+
{
9+
"installKeyFileContent":
10+
{
11+
"type":
12+
[
13+
"string",
14+
"null"
15+
]
16+
},
17+
"installKey":
18+
{
19+
"type":
20+
[
21+
"string",
22+
"null"
23+
]
24+
},
25+
"image":
26+
{
27+
"properties":
28+
{
29+
"url":
30+
{
31+
"type": "string"
32+
},
33+
"secret":
34+
{
35+
"type":
36+
[
37+
"string",
38+
"null"
39+
]
40+
}
41+
},
42+
"required":
43+
[
44+
"url"
45+
]
46+
}
47+
},
48+
"anyOf":
49+
[
50+
{
51+
"properties":
52+
{
53+
"installKeyFileContent":
54+
{
55+
"minLength": 0
56+
}
57+
},
58+
"required":
59+
[
60+
"installKey"
61+
]
62+
},
63+
{
64+
"properties":
65+
{
66+
"installKey":
67+
{
68+
"minLength": 0
69+
}
70+
},
71+
"required":
72+
[
73+
"installKeyFileContent"
74+
]
75+
}
76+
],
77+
"type": "object"
78+
},
79+
"createNamespace":
80+
{
81+
"type": "boolean"
82+
},
83+
"namespace":
84+
{
85+
"type": "string"
86+
},
87+
"deployMetricServer":
88+
{
89+
"type": "boolean"
90+
},
91+
"kubernetesCluster":
92+
{
93+
"properties":
94+
{
95+
"name":
96+
{
97+
"type": "string"
98+
},
99+
"namespace":
100+
{
101+
"type": "string"
102+
}
103+
},
104+
"required":
105+
[
106+
"name",
107+
"namespace"
108+
]
109+
}
110+
},
111+
"required":
112+
[
113+
"createNamespace",
114+
"namespace"
115+
],
116+
"title": "Values",
117+
"type": "object"
118+
}

kubernetes-monitoring/mgmtagent_helm/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ namespace: mgmtagent
2323
# By default, metric server will be deployed and used by Management Agent to collect metrics. You can set this to false if you already have metric server installed on your cluster
2424
deployMetricServer: true
2525

26+
# Provide the storage class for StatefulSet's PVC. If not provided then the Cluster's default storage class will be used.
27+
storageClass:
28+
2629
# Kubernetes Cluster details to monitor
2730
kubernetesCluster:
2831
# OCI Compartment Id to push Kubernetes Monitoring metrics. If not specified default is same as Agent compartment

0 commit comments

Comments
 (0)