Skip to content

Commit 805a0c8

Browse files
authored
chore(plugins): remove test annotations (#656)
* chore(release): bump version to 0.1.9 and update service URL format Signed-off-by: IB Akshay <akshay.iyyadurai.balasundaram@sap.com> * chore: update chart versions and remove test annotations Signed-off-by: IB Akshay <akshay.iyyadurai.balasundaram@sap.com> * fix(tests): change test kind from Job to Pod in test-kube-monitoring.yaml Signed-off-by: IB Akshay <akshay.iyyadurai.balasundaram@sap.com> * fix(tests): update health check URL in test-configmap.yaml Signed-off-by: IB Akshay <akshay.iyyadurai.balasundaram@sap.com> --------- Signed-off-by: IB Akshay <akshay.iyyadurai.balasundaram@sap.com>
1 parent e79b9a1 commit 805a0c8

23 files changed

+19
-130
lines changed

alerts/charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ maintainers:
88
name: alerts
99
sources:
1010
- https://github.com/cloudoperators/greenhouse-extensions
11-
version: 0.19.4
11+
version: 0.19.5
1212
keywords:
1313
- prometheus-alertmanager
1414
dependencies:

alerts/charts/templates/tests/test-alerts-config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
type: integration-test
9-
annotations:
10-
"helm.sh/hook": test
11-
"helm.sh/hook-weight": "-5" # Installed and upgraded before the test pod
12-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
139
data:
1410
run.sh: |-
1511

alerts/charts/templates/tests/test-permissions.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ metadata:
77
labels:
88
type: integration-test
99
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
10-
annotations:
11-
"helm.sh/hook": test
12-
"helm.sh/hook-weight": "-5"
13-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
1410
---
1511
apiVersion: rbac.authorization.k8s.io/v1
1612
kind: Role
@@ -20,10 +16,6 @@ metadata:
2016
labels:
2117
type: integration-test
2218
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
23-
annotations:
24-
"helm.sh/hook": test
25-
"helm.sh/hook-weight": "-5"
26-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
2719
rules:
2820
- apiGroups: ["apps"]
2921
resources: ["deployments", "statefulsets"]
@@ -46,10 +38,6 @@ metadata:
4638
labels:
4739
type: integration-test
4840
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
49-
annotations:
50-
"helm.sh/hook": test
51-
"helm.sh/hook-weight": "-5"
52-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
5341
subjects:
5442
- kind: ServiceAccount
5543
name: {{ .Release.Name }}-test
@@ -66,10 +54,6 @@ metadata:
6654
labels:
6755
type: integration-test
6856
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
69-
annotations:
70-
"helm.sh/hook": test
71-
"helm.sh/hook-weight": "-5"
72-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
7357
rules:
7458
- apiGroups: ["apiextensions.k8s.io"]
7559
resources: ["customresourcedefinitions"]
@@ -82,10 +66,6 @@ metadata:
8266
labels:
8367
type: integration-test
8468
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
85-
annotations:
86-
"helm.sh/hook": test
87-
"helm.sh/hook-weight": "-5"
88-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
8969
subjects:
9070
- kind: ServiceAccount
9171
name: {{ .Release.Name }}-test

alerts/plugindefinition.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kind: PluginDefinition
66
metadata:
77
name: alerts
88
spec:
9-
version: 2.7.4
9+
version: 2.7.5
1010
weight: 0
1111
displayName: Alerts
1212
description: The Alerts Plugin consists of both Prometheus Alertmanager and Supernova, the holistic alert management UI
@@ -15,7 +15,7 @@ spec:
1515
helmChart:
1616
name: alerts
1717
repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
18-
version: 0.19.4
18+
version: 0.19.5
1919
uiApplication:
2020
name: supernova
2121
version: "latest"
@@ -75,7 +75,7 @@ spec:
7575
required: false
7676
type: map
7777
- name: alerts.dashboard.create
78-
description: Whether to install the default dashboards for self-monitoring Prometheus Alertmanger.
78+
description: Whether to install the default dashboards for self-monitoring Prometheus Alertmanger.
7979
default: true
8080
type: bool
8181
- name: alerts.alertmanager.enabled

kube-monitoring/charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ maintainers:
88
name: kube-monitoring
99
sources:
1010
- https://github.com/cloudoperators/greenhouse-extensions
11-
version: 0.23.0
11+
version: 0.23.1
1212
# prometheus-operator app version
1313
appVersion: v0.79.2
1414
keywords:

kube-monitoring/charts/templates/tests/test-kube-monitoring-config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ metadata:
77
labels:
88
type: integration-test
99
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
10-
annotations:
11-
"helm.sh/hook": test
12-
"helm.sh/hook-weight": "-5"
13-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
1410
data:
1511
run.sh: |-
1612

kube-monitoring/charts/templates/tests/test-permissions.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ metadata:
77
labels:
88
type: integration-test
99
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
10-
annotations:
11-
"helm.sh/hook": test
12-
"helm.sh/hook-weight": "-5"
13-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
1410
---
1511
apiVersion: rbac.authorization.k8s.io/v1
1612
kind: Role
@@ -20,10 +16,6 @@ metadata:
2016
labels:
2117
type: integration-test
2218
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
23-
annotations:
24-
"helm.sh/hook": test
25-
"helm.sh/hook-weight": "-5"
26-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
2719
rules:
2820
- apiGroups: ["apps"]
2921
resources: ["deployments", "statefulsets"]
@@ -43,10 +35,6 @@ metadata:
4335
labels:
4436
type: integration-test
4537
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
46-
annotations:
47-
"helm.sh/hook": test
48-
"helm.sh/hook-weight": "-5"
49-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
5038
subjects:
5139
- kind: ServiceAccount
5240
name: {{ .Release.Name }}-test
@@ -63,10 +51,6 @@ metadata:
6351
labels:
6452
type: integration-test
6553
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
66-
annotations:
67-
"helm.sh/hook": test
68-
"helm.sh/hook-weight": "-5"
69-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
7054
rules:
7155
- apiGroups: ["apiextensions.k8s.io"]
7256
resources: ["customresourcedefinitions"]
@@ -79,10 +63,6 @@ metadata:
7963
labels:
8064
type: integration-test
8165
{{- include "kube-prometheus-stack.labels" . | nindent 4 }}
82-
annotations:
83-
"helm.sh/hook": test
84-
"helm.sh/hook-weight": "-5"
85-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
8666
subjects:
8767
- kind: ServiceAccount
8868
name: {{ .Release.Name }}-test

kube-monitoring/plugindefinition.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ kind: PluginDefinition
66
metadata:
77
name: kube-monitoring
88
spec:
9-
version: 2.10.0
9+
version: 2.10.1
1010
displayName: Kubernetes monitoring
1111
description: Native deployment and management of Prometheus along with Kubernetes cluster monitoring components.
1212
docMarkDownUrl: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/kube-monitoring/README.md
1313
icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/kube-monitoring/logo.png
1414
helmChart:
1515
name: kube-monitoring
1616
repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
17-
version: 0.23.0
17+
version: 0.23.1
1818
options:
1919
- name: global.commonLabels
2020
description: Labels to add to all resources. This can be used to add a support group or service to all alerts.
@@ -84,10 +84,10 @@ spec:
8484
type: string
8585
- name: kubeMonitoring.prometheus.service.additionalPorts
8686
default:
87-
- name: grpc
88-
port: 10901
89-
protocol: TCP
90-
targetPort: grpc
87+
- name: grpc
88+
port: 10901
89+
protocol: TCP
90+
targetPort: grpc
9191
required: false
9292
type: list
9393
- name: kubeMonitoring.prometheus.persesDatasource

opentelemetry/chart/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
apiVersion: v2
55
appVersion: v0.116.0
66
name: opentelemetry-operator
7-
version: 0.7.3
7+
version: 0.7.4
88
description: OpenTelemetry Operator Helm chart for Kubernetes
99
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
1010
type: application

opentelemetry/chart/templates/tests/test-opentelemetry-config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ metadata:
99
labels:
1010
type: integration-test
1111
{{- include "plugin.labels" . | nindent 4 }}
12-
annotations:
13-
"helm.sh/hook": test
14-
"helm.sh/hook-weight": "-5"
15-
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
1612
data:
1713
run.sh: |-
1814

0 commit comments

Comments
 (0)