Skip to content

Commit 1b4e8ec

Browse files
keptn-botodubajDT
andauthored
Update keptn-metrics-operator Helm chart (#157)
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: odubajDT <[email protected]>
1 parent 8a05187 commit 1b4e8ec

10 files changed

+833
-40
lines changed
+8-25
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
apiVersion: v2
22
name: keptn-metrics-operator
33
description: A Helm chart for Keptn Metrics Operator, a subproject of Keptn
4-
icon: "https://raw.githubusercontent.com/cncf/artwork/master/projects/keptn/icon/color/keptn-icon-color.svg"
4+
icon: >-
5+
https://raw.githubusercontent.com/cncf/artwork/master/projects/keptn/icon/color/keptn-icon-color.svg
56
home: https://keptn.sh
67
sources:
7-
- "https://github.com/keptn/lifecycle-toolkit"
8+
- https://github.com/keptn/lifecycle-toolkit
89
keywords:
910
- cloud-native
1011
- metrics
@@ -17,31 +18,13 @@ annotations:
1718
url: https://github.com/keptn/lifecycle-toolkit/issues/new
1819
- name: community
1920
url: https://slack.keptn.sh/
20-
artifacthub.io/license: "Apache-2.0"
21-
artifacthub.io/operator: "true"
22-
23-
kubeVersion: ">= 1.24.0-0"
24-
# A chart can be either an 'application' or a 'library' chart.
25-
#
26-
# Application charts are a collection of templates that can be packaged into versioned archives
27-
# to be deployed.
28-
#
29-
# Library charts provide useful utilities or functions for the chart developer. They're included as
30-
# a dependency of application charts to inject those utilities and functions into the rendering
31-
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
21+
artifacthub.io/license: Apache-2.0
22+
artifacthub.io/operator: 'true'
23+
kubeVersion: '>= 1.24.0-0'
3224
type: application
33-
34-
# This is the chart version. This version number should be incremented each time you make changes
35-
# to the chart and its templates, including the app version.
36-
# Versions are expected to follow Semantic Versioning (https://semver.org/)
3725
version: 0.1.4
38-
39-
# This is the version number of the application being deployed. This version number should be
40-
# incremented each time you make changes to the application. Versions are not expected to
41-
# follow Semantic Versioning. They should reflect the version the application is using.
42-
# It is recommended to use it with quotes.
43-
appVersion: "v0.9.3" # x-release-please-version
26+
appVersion: v1.0.0 # x-release-please-version
4427
dependencies:
4528
- name: common
46-
repository: "https://charts.lifecycle.keptn.sh"
29+
repository: https://charts.lifecycle.keptn.sh
4730
version: 0.2.1

charts/keptn-metrics-operator/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Prometheus, Dynatrace, DataDog and K8s metric server...
2222
| `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` |
2323
| `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` |
2424
| `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` |
25+
| `global.openShift.enabled` | Enable this value to install on Openshift | `false` |
2526

2627
### Keptn Metrics Operator common
2728

@@ -78,7 +79,7 @@ Prometheus, Dynatrace, DataDog and K8s metric server...
7879
| `env.analysisControllerLogLevel` | sets the log level of Analysis Controller | `0` |
7980
| `image.registry` | specify the container registry for the metrics-operator image | `""` |
8081
| `image.repository` | specify registry for manager image | `keptn/metrics-operator` |
81-
| `image.tag` | select tag for manager image | `v0.9.3` |
82+
| `image.tag` | select tag for manager image | `v1.0.0` |
8283
| `image.imagePullPolicy` | specify pull policy for the manager image. This overrides global values | `""` |
8384
| `livenessProbe` | custom livenessprobe for manager container | |
8485
| `readinessProbe` | custom readinessprobe for manager container | |

charts/keptn-metrics-operator/templates/analysis-crd.yaml

+165-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,170 @@ spec:
2222
singular: analysis
2323
scope: Namespaced
2424
versions:
25+
- additionalPrinterColumns:
26+
- jsonPath: .spec.analysisDefinition.name
27+
name: AnalysisDefinition
28+
type: string
29+
- jsonPath: .status.state
30+
name: State
31+
type: string
32+
- jsonPath: .status.warning
33+
name: Warning
34+
type: string
35+
- jsonPath: .status.pass
36+
name: Pass
37+
type: string
38+
name: v1
39+
schema:
40+
openAPIV3Schema:
41+
description: Analysis is the Schema for the analyses API
42+
properties:
43+
apiVersion:
44+
description: |-
45+
APIVersion defines the versioned schema of this representation of an object.
46+
Servers should convert recognized schemas to the latest internal value, and
47+
may reject unrecognized values.
48+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
49+
type: string
50+
kind:
51+
description: |-
52+
Kind is a string value representing the REST resource this object represents.
53+
Servers may infer this from the endpoint the client submits requests to.
54+
Cannot be updated.
55+
In CamelCase.
56+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
57+
type: string
58+
metadata:
59+
type: object
60+
spec:
61+
description: AnalysisSpec defines the desired state of Analysis
62+
properties:
63+
analysisDefinition:
64+
description: AnalysisDefinition refers to the AnalysisDefinition,
65+
a CRD that stores the AnalysisValuesTemplates
66+
properties:
67+
name:
68+
description: Name defines the name of the referenced object
69+
type: string
70+
namespace:
71+
description: Namespace defines the namespace of the referenced
72+
object
73+
type: string
74+
required:
75+
- name
76+
type: object
77+
args:
78+
additionalProperties:
79+
type: string
80+
description: Args corresponds to a map of key/value pairs that can
81+
be used to substitute placeholders in the AnalysisValueTemplate
82+
query. i.e. for args foo:bar the query could be "query:percentile(95)?scope=tag(my_foo_label:{{.foo}})".
83+
type: object
84+
timeframe:
85+
description: |-
86+
Timeframe specifies the range for the corresponding query in the AnalysisValueTemplate. Please note that either
87+
a combination of 'from' and 'to' or the 'recent' property may be set. If neither is set, the Analysis can
88+
not be added to the cluster.
89+
properties:
90+
from:
91+
description: From is the time of start for the query. This field
92+
follows RFC3339 time format
93+
format: date-time
94+
type: string
95+
recent:
96+
description: |-
97+
Recent describes a recent timeframe using a duration string. E.g. Setting this to '5m' provides an Analysis
98+
for the last five minutes
99+
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
100+
type: string
101+
to:
102+
description: To is the time of end for the query. This field follows
103+
RFC3339 time format
104+
format: date-time
105+
type: string
106+
type: object
107+
required:
108+
- analysisDefinition
109+
- timeframe
110+
type: object
111+
status:
112+
description: AnalysisStatus stores the status of the overall analysis
113+
returns also pass or warnings
114+
properties:
115+
pass:
116+
description: Pass returns whether the SLO is satisfied
117+
type: boolean
118+
raw:
119+
description: Raw contains the raw result of the SLO computation
120+
type: string
121+
state:
122+
description: State describes the current state of the Analysis (Pending/Progressing/Completed)
123+
type: string
124+
storedValues:
125+
additionalProperties:
126+
description: ProviderResult stores reference of already collected
127+
provider query associated to its objective template
128+
properties:
129+
errMsg:
130+
description: ErrMsg stores any possible error at retrieval time
131+
type: string
132+
objectiveReference:
133+
description: Objective store reference to corresponding objective
134+
template
135+
properties:
136+
name:
137+
description: Name defines the name of the referenced object
138+
type: string
139+
namespace:
140+
description: Namespace defines the namespace of the referenced
141+
object
142+
type: string
143+
required:
144+
- name
145+
type: object
146+
query:
147+
description: Query represents the executed query
148+
type: string
149+
value:
150+
description: Value is the value the provider returned
151+
type: string
152+
type: object
153+
description: StoredValues contains all analysis values that have already
154+
been retrieved successfully
155+
type: object
156+
timeframe:
157+
description: Timeframe describes the time frame which is evaluated
158+
by the Analysis
159+
properties:
160+
from:
161+
description: From is the time of start for the query. This field
162+
follows RFC3339 time format
163+
format: date-time
164+
type: string
165+
recent:
166+
description: |-
167+
Recent describes a recent timeframe using a duration string. E.g. Setting this to '5m' provides an Analysis
168+
for the last five minutes
169+
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
170+
type: string
171+
to:
172+
description: To is the time of end for the query. This field follows
173+
RFC3339 time format
174+
format: date-time
175+
type: string
176+
type: object
177+
warning:
178+
description: Warning returns whether the analysis returned a warning
179+
type: boolean
180+
required:
181+
- state
182+
- timeframe
183+
type: object
184+
type: object
185+
served: true
186+
storage: true
187+
subresources:
188+
status: {}
25189
- additionalPrinterColumns:
26190
- jsonPath: .spec.analysisDefinition.name
27191
name: AnalysisDefinition
@@ -347,6 +511,6 @@ spec:
347511
type: object
348512
type: object
349513
served: true
350-
storage: true
514+
storage: false
351515
subresources:
352516
status: {}

0 commit comments

Comments
 (0)