Skip to content

Commit c4794e7

Browse files
Merge pull request #801 from vyzigold/fix_ck_kuttl-tests
[OSPRH-22600] Fix and enable CloudKitty kuttl test
2 parents d3ea47b + 24e9681 commit c4794e7

16 files changed

Lines changed: 145 additions & 110 deletions

kuttl-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ kind: TestSuite
1717
reportFormat: JSON
1818
reportName: kuttl-test-telemetry
1919
namespace: telemetry-kuttl-tests
20-
timeout: 300
20+
# LokiStack can take a long time to get ready
21+
timeout: 600
2122
parallel: 1
2223
skipTests:
2324
- topology
24-
- cloudkitty
2525
testDirs:
2626
- test/kuttl/tests/
2727
suppress:

test/kuttl/fixme/cloudkitty/deps/minio.yaml

Lines changed: 0 additions & 99 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ commands:
55
oc apply -f deps/loki-operator.yaml
66
until oc api-resources | grep -q grafana; do sleep 1; done
77
- script: |
8-
oc apply -f deps/minio.yaml
9-
oc wait --for='jsonpath={.status.conditions[?(@.type=="Ready")].status}=True' pod/minio -n minio-dev
8+
oc apply -f deps/rhobs.yaml
9+
until oc api-resources | grep -q rhobs; do sleep 1; done
Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
---
2+
# Certificate issuer related resources
3+
apiVersion: v1
4+
data:
5+
ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVBRENDQW1pZ0F3SUJBZ0lRVkR2d0hzZTAyaTJhdVN4Z0lUUGlrVEFOQmdrcWhraUc5dzBCQVF3RkFEQWEKTVJnd0ZnWURWUVFERXc5eWIyOTBZMkV0YVc1MFpYSnVZV3d3SGhjTk1qVXhNVEk0TVRBMU1UUTRXaGNOTXpVeApNVEkyTVRBMU1UUTRXakFhTVJnd0ZnWURWUVFERXc5eWIyOTBZMkV0YVc1MFpYSnVZV3d3Z2dHaU1BMEdDU3FHClNJYjNEUUVCQVFVQUE0SUJqd0F3Z2dHS0FvSUJnUUQ2RUJ6aHEwaHRqMkhvb2sxbW1WVTBTZGMwanJzU1NGV28KdnNtemN1OWxKSEpvUDVwRDdzSnZCZGpkWU1jQU92MTRjdHBvak9GMEgrdnBOK0lQL24zdlMvZmxPQ1JHRVdjUApWS0w5VkZNdzlWcklXRmNBYnNOTktiNmZ2QkhLekQ3QzZ1cy8zRFoyRG1xWWoxSGlRMFN5MW1PdklpOHkyWnkzCk5DQkdXMCtwNnlYV2Rwb3h0RnpMSmIrcVZqVmwvTHBBSEN3V2ZmSXlZaHYwa0dSSitLQmpEa1FZT2VTVzQxNy8KdVZWc2VVdEtmNjRZRTd2OTlnWHg1U2s3WlZQNVNuYzlib2NxZEtxbzJFVEVqU3Q2WjFrVnFxVzhkWEh1TlFUaApsSGhkN3ZWSitXcHg4RWpUM2lrRkg5TVRTeVd0NFU5dzJ1WklocG9mSXJuSlBuSml3ekh6WlAyN1c5TjhiZE04CjlRdE44b3BaS2o1YUJ4RFBjd0g1SnNjQ2lINmVScVJZWkwvQXAxNEtIVHkrYXM2VGNQSVoxVDBEeWVnWFpMUGsKeXJ4Q3RlVmc5Z2J3ZlYvOFFpRWg1NEtKNVUycTRRbERXRXR0VmdxdjNGK3pMaThOaURIS21ZTURBNlhNTTkraQo4dHRSVEJpeHBQOXJzRlpic0lQSTdmb3F3MzFZSjgwQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trCk1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZJR012c2tGY3k1dlpKeWprRkxmVEs0YlBZRXoKTUEwR0NTcUdTSWIzRFFFQkRBVUFBNElCZ1FDSTBLZDcrS2JqSjBmL0Z4WE1EVmRCeHdDbm1COW5CYTBBcklqRgp6N2kveDYvT0tFRzFaQ2wrRHorOTJuLzY5WDFCTjBIRW9IMU5YMTU0ckxkZW1TbmprTXpFOWQ1UFVuQ0dsQ1dtCmVTS1RuZGZKTG9odGtPSHNmK2RGUURCcHlQNzcxWDN6RERQSW8wN2ZDRFlNSDQ5QkJ6ak5UdDJtNlNJWkdtUnkKaFNLWFMxWUtnSVAxdEt1NGJZV2Fyd0NCWEQ1cnVPcU9RTGs3SVRDNkRZL01ud2syTVNjY1RrTmE4dzZpRE9YdgpuVHdZN1ZjUWRTdGJQQWxZWmJ3NTBWU3BVamsyQVFWSmVOOFoxYjduZUxGdXF4ZHV2SDFuMDhUV2JLKzFEZ01wCnpYOHcra3J3V2J2VjNuSmVZcUxEU2ptc3pnVWI2bEdORnJlZ0FhUTlMd2lJYy9kQVpOdzFQc2kvVXZaN3ZRMEEKcVdmTUlmQUx2Um9mSTJwTHRKLzNOcWxTRDFhcEg5VlMrQWE3V1IvWkNWVDJ0T1pUREIyY0o3UUV0RE1pUHoyegpnRE5EL2ZTNEcyaDViM2ptSUs5encvaUNuT3lKcVg2YzVrTFNNUVhHTFNiMm41N0xFUGhnU0hkdXR1empteTNrCmNkZXpPZnY1SlJlK1ZDOVcxclpEL2ZYMkNibz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
6+
tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVBRENDQW1pZ0F3SUJBZ0lRVkR2d0hzZTAyaTJhdVN4Z0lUUGlrVEFOQmdrcWhraUc5dzBCQVF3RkFEQWEKTVJnd0ZnWURWUVFERXc5eWIyOTBZMkV0YVc1MFpYSnVZV3d3SGhjTk1qVXhNVEk0TVRBMU1UUTRXaGNOTXpVeApNVEkyTVRBMU1UUTRXakFhTVJnd0ZnWURWUVFERXc5eWIyOTBZMkV0YVc1MFpYSnVZV3d3Z2dHaU1BMEdDU3FHClNJYjNEUUVCQVFVQUE0SUJqd0F3Z2dHS0FvSUJnUUQ2RUJ6aHEwaHRqMkhvb2sxbW1WVTBTZGMwanJzU1NGV28KdnNtemN1OWxKSEpvUDVwRDdzSnZCZGpkWU1jQU92MTRjdHBvak9GMEgrdnBOK0lQL24zdlMvZmxPQ1JHRVdjUApWS0w5VkZNdzlWcklXRmNBYnNOTktiNmZ2QkhLekQ3QzZ1cy8zRFoyRG1xWWoxSGlRMFN5MW1PdklpOHkyWnkzCk5DQkdXMCtwNnlYV2Rwb3h0RnpMSmIrcVZqVmwvTHBBSEN3V2ZmSXlZaHYwa0dSSitLQmpEa1FZT2VTVzQxNy8KdVZWc2VVdEtmNjRZRTd2OTlnWHg1U2s3WlZQNVNuYzlib2NxZEtxbzJFVEVqU3Q2WjFrVnFxVzhkWEh1TlFUaApsSGhkN3ZWSitXcHg4RWpUM2lrRkg5TVRTeVd0NFU5dzJ1WklocG9mSXJuSlBuSml3ekh6WlAyN1c5TjhiZE04CjlRdE44b3BaS2o1YUJ4RFBjd0g1SnNjQ2lINmVScVJZWkwvQXAxNEtIVHkrYXM2VGNQSVoxVDBEeWVnWFpMUGsKeXJ4Q3RlVmc5Z2J3ZlYvOFFpRWg1NEtKNVUycTRRbERXRXR0VmdxdjNGK3pMaThOaURIS21ZTURBNlhNTTkraQo4dHRSVEJpeHBQOXJzRlpic0lQSTdmb3F3MzFZSjgwQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trCk1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZJR012c2tGY3k1dlpKeWprRkxmVEs0YlBZRXoKTUEwR0NTcUdTSWIzRFFFQkRBVUFBNElCZ1FDSTBLZDcrS2JqSjBmL0Z4WE1EVmRCeHdDbm1COW5CYTBBcklqRgp6N2kveDYvT0tFRzFaQ2wrRHorOTJuLzY5WDFCTjBIRW9IMU5YMTU0ckxkZW1TbmprTXpFOWQ1UFVuQ0dsQ1dtCmVTS1RuZGZKTG9odGtPSHNmK2RGUURCcHlQNzcxWDN6RERQSW8wN2ZDRFlNSDQ5QkJ6ak5UdDJtNlNJWkdtUnkKaFNLWFMxWUtnSVAxdEt1NGJZV2Fyd0NCWEQ1cnVPcU9RTGs3SVRDNkRZL01ud2syTVNjY1RrTmE4dzZpRE9YdgpuVHdZN1ZjUWRTdGJQQWxZWmJ3NTBWU3BVamsyQVFWSmVOOFoxYjduZUxGdXF4ZHV2SDFuMDhUV2JLKzFEZ01wCnpYOHcra3J3V2J2VjNuSmVZcUxEU2ptc3pnVWI2bEdORnJlZ0FhUTlMd2lJYy9kQVpOdzFQc2kvVXZaN3ZRMEEKcVdmTUlmQUx2Um9mSTJwTHRKLzNOcWxTRDFhcEg5VlMrQWE3V1IvWkNWVDJ0T1pUREIyY0o3UUV0RE1pUHoyegpnRE5EL2ZTNEcyaDViM2ptSUs5encvaUNuT3lKcVg2YzVrTFNNUVhHTFNiMm41N0xFUGhnU0hkdXR1empteTNrCmNkZXpPZnY1SlJlK1ZDOVcxclpEL2ZYMkNibz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
7+
tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlHNHdJQkFBS0NBWUVBK2hBYzRhdEliWTloNktKTlpwbFZORW5YTkk2N0VraFZxTDdKczNMdlpTUnlhRCthClErN0Nid1hZM1dESEFEcjllSExhYUl6aGRCL3I2VGZpRC81OTcwdjM1VGdrUmhGbkQxU2kvVlJUTVBWYXlGaFgKQUc3RFRTbStuN3dSeXN3K3d1cnJQOXcyZGc1cW1JOVI0a05Fc3RaanJ5SXZNdG1jdHpRZ1JsdFBxZXNsMW5hYQpNYlJjeXlXL3FsWTFaZnk2UUJ3c0ZuM3lNbUliOUpCa1NmaWdZdzVFR0Rua2x1TmUvN2xWYkhsTFNuK3VHQk83Ci9mWUY4ZVVwTzJWVCtVcDNQVzZIS25TcXFOaEV4STByZW1kWkZhcWx2SFZ4N2pVRTRaUjRYZTcxU2ZscWNmQkkKMDk0cEJSL1RFMHNscmVGUGNOcm1TSWFhSHlLNXlUNXlZc014ODJUOXUxdlRmRzNUUFBVTFRmS0tXU28rV2djUQp6M01CK1NiSEFvaCtua2FrV0dTL3dLZGVDaDA4dm1yT2szRHlHZFU5QThub0YyU3o1TXE4UXJYbFlQWUc4SDFmCi9FSWhJZWVDaWVWTnF1RUpRMWhMYlZZS3I5eGZzeTR2RFlneHlwbURBd09sekRQZm92TGJVVXdZc2FUL2E3QlcKVzdDRHlPMzZLc045V0NmTkFnTUJBQUVDZ2dHQU5ZNkVaUWZXZ2hLU3RXeW5kNmt3OExzODRvYU1SZWprb2JqRgpBZEJFdWd5UmpVYkwveTh3aU84L2FJQ005bjFyNHFOMHFDNCtMaTBWRFhUWXo3U2htOElSUkpCZTRudmhMdzBoClFIRVNSVHJUVi9QbHBGUFVzOTdVTXlsb1JSOHo5UEt6OGxBemdOcnJGU1FpOVRzVGlGcjI3Q0E5N0IzajNQQUcKMXBMQmIrTExUcERGeXczMlR0TVZwd0dDTzhiaVRBOU1tUCtlQXhEMHJFOU5qM00yeEtoZVNMTURoSmFMZHVrbQpoTTVBcENMTzhseXRwNEdNK2VjckNzdlRyYUYzRm5qdkZjVEEvMUlkUVZtR2plZ1JXWmwvZWxNaVEwckttYjVxCmVYY3lQVGhoaEhBV2MweFl5dHdkU3RzU1FOdnlYUFJRbzJrZU44LzAxSHBXMTZZM2d4R0NEVDVMcnBDN0NJNE8KekxiUXM3aDd3cHJhelZoM0pXS2UwOUJIc1A5ZTBNR3VhRmVUNVpVMzJ1cldMTDEwa3pwR2UxU3puTkd5R1IxQwpwSVV2aXhOb1FwZ1BHY3Bhek9KYjF5Vk5MZmpOenNXMFNBcFZJKzZkVlBsdDhlNXJkNWkvTG5YNU9vK2VxSHBaCnBmMzNIbmRBb2RUamgrb2FoNlQyZE1CT3VkUkJBb0hCQVA4U0U1cjN0ZHlNWnpNN3VBRXNHYUxISCttR0ZwVFEKb3FzWjJWUkdLczY3Tk1ObWZlMEVkYmI1VzJlNVFMVGJmNXVxcHh0VnZ4WTBPeG5BY3Vlb1ZORjRFeVhwdlpRdQpuU3o5cVFqTkY1TDNjTk5PSDZMV3VOeUlnaTBqWkpxUUpKV2phcXBEWVVKR0NyS1FSNS8xTjhqRVg3Q2lsU2VYCmxPNjdxdHZLVGJnd2N5VFdnVnppMTlJV3lpWnc0aXJZeUhJb05lVU5SQmh5WU1SOUpBdjhjYkcwUVJvU2hQNWUKVVUvZS9kMkt0N29CSk94WFd4L3JhOUd3WjRPQXBWRHF3UUtCd1FENitWMStKOFhvK3BrVUJoUGtOUUthSlRQawpDbWhRUkcrekZGbDRHOGZvSVJDWHNucnFGUkhSWXhOa0ZpMGJkQXpqVG00RzczeU1Ed0hHbnJ3YWdoME95dnhxCm16RWlvQmVjME9PK3AwLytKV3pkZnBnanNRbGR6bzVUcDBuOFhKVUluUDA3YzVLSjJ1RjhBeVNBdmhzSU00Y00KM2tWT3dSdWIxeGJncVNoVis4N1RDWU4wcFJIYWNYTzA4a0ZJTzF5SW9ETWVybXkzYXY1L1l1eW81QnozbzJncApUOVA2Yys5Y1VkNTU5WDVFeTdkc1haRDVuYzhWdG0ycWx1SDNQQTBDZ2NCaFBlbjloWHh1eFpRK2d3RG1hWUtvCmZST2Nlc00zSHNjMVJkaUYrVzR1ZkU1a1JEbXoxNlJ0Q21tZmhJKzNvNHJsdE15YWJqazRaTmMzUFJoUld1cGoKSlV6Zmdsb0ZHVFJReDYvZXJCblZyTUgxdk8zd3JiMnlUZFNiRXNneTZNc1p4VUJRQXZvY1F3bW5BN3hhcmlrRApRR0pldTh6eldDV3VVaHVVU1c4UnpsN0haNFBQL3FkYTc5ZEhpbmVlOENDUzdPT0hIR1Nla1ZSMDlHUitzVkpDCjlqNXZpeW5xczloNkE4Qnk2b1Nhdy83b24zRWRIU3B3dWJqcytHbU9ETUVDZ2NFQTlRSDUxbzJuZEtFb1RkYjkKRmp6MTlGdTdRN1V4VHFMdzFNZFo3SnBhVnUvb2pkOU1oVGJhZFNvZXBRZk5NMDdnd2dzditJOVZiRG0rUnhOeAptUU5Lc01WVEZCTzdMUTFTMytGQlpEOWNKVVNOK2RGN1h1U1d1MEJKeTdxMXpLcnBSMFpUSlBYWHFjTEhlOVJwCmoxR0hmRU1wWlZPY0g1ei9nZXpCeGNMOXdLc1pwd1pUa2MwUUY4dkg1RzdYY2xlWkp6d1ZpNjlHTE8xRDFFSlQKdlRFc1lramhCK3VKaXFnaGxXUExLQTZVSFQ4dktwaFJUbzVUdXVPa1BmUWNWc3NGQW9IQWROTnVNb1lKamhhawp4WlVKWjRuQXV1UEg3dlV0RFRmbWFDMzR1MjJDOTJ3ODRsTmIvSURUVXZMMnZBTFpwa0VIdHY1RmJKWXJMTzdpClJ3UXZwRGNpZEFVUlVlYk11TjFOdmthbmppZ1p0bDJmdlJJamlyM3psWHgrRFVKbDlPOUlXdjNTS0NUWGQzZHkKU1RiMmFyd0NXMkVxVlNqaEpDL01WUG1rNW8xYTJqOUxLb28vQmQ1eEV2MlM5Y21BTjU1SlhERlN2SXF3MUJvZwoyc2s1QjM3SjlESlZqTG5UT0ZDQ1ZzdEFGT0pBM3hvR2F0eHIyM2hCVzEwb0YxSEFablhkCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
8+
kind: Secret
9+
metadata:
10+
annotations:
11+
cert-manager.io/alt-names: ""
12+
cert-manager.io/certificate-name: rootca-internal
13+
cert-manager.io/common-name: rootca-internal
14+
cert-manager.io/ip-sans: ""
15+
cert-manager.io/issuer-group: ""
16+
cert-manager.io/issuer-kind: ""
17+
cert-manager.io/issuer-name: selfsigned-issuer
18+
cert-manager.io/uri-sans: ""
19+
labels:
20+
ca-cert: ""
21+
controller.cert-manager.io/fao: "true"
22+
name: rootca-internal-cloudkitty
23+
type: kubernetes.io/tls
24+
---
25+
apiVersion: cert-manager.io/v1
26+
kind: Issuer
27+
metadata:
28+
annotations:
29+
cert-duration: 43800h0m0s
30+
labels:
31+
osp-rootca-issuer-internal: ""
32+
name: rootca-internal-cloudkitty
33+
spec:
34+
ca:
35+
secretName: rootca-internal-cloudkitty
36+
---
37+
# MetricStorage
38+
apiVersion: telemetry.openstack.org/v1beta1
39+
kind: MetricStorage
40+
metadata:
41+
name: metric-storage
42+
spec:
43+
dashboardsEnabled: true
44+
monitoringStack:
45+
alertingEnabled: true
46+
scrapeInterval: 30s
47+
storage:
48+
strategy: persistent
49+
retention: 24h
50+
persistent:
51+
pvcStorageRequest: 20G
52+
---
53+
# minio
54+
apiVersion: v1
55+
kind: Pod
56+
metadata:
57+
labels:
58+
app: minio
59+
name: minio
60+
spec:
61+
containers:
62+
- name: minio
63+
image: quay.io/minio/minio:latest
64+
command:
65+
- /bin/bash
66+
- -c
67+
- |
68+
mkdir -p /data/loki && \
69+
minio server /data
70+
env:
71+
- name: MINIO_ACCESS_KEY
72+
value: minio
73+
- name: MINIO_SECRET_KEY
74+
value: minio123
75+
volumeMounts:
76+
- mountPath: /data
77+
name: storage
78+
volumes:
79+
- name: storage
80+
persistentVolumeClaim:
81+
claimName: minio-pvc
82+
---
83+
apiVersion: v1
84+
kind: PersistentVolumeClaim
85+
metadata:
86+
name: minio-pvc
87+
spec:
88+
accessModes:
89+
- ReadWriteOnce
90+
resources:
91+
requests:
92+
storage: 10Gi
93+
storageClassName: local-storage
94+
---
95+
apiVersion: v1
96+
kind: Service
97+
metadata:
98+
name: minio
99+
spec:
100+
selector:
101+
app: minio
102+
ports:
103+
- name: api
104+
protocol: TCP
105+
port: 9000
106+
- name: console
107+
protocol: TCP
108+
port: 9090
109+
---
110+
# Loki S3 secret
111+
apiVersion: v1
112+
kind: Secret
113+
metadata:
114+
name: logging-loki-s3
115+
stringData:
116+
access_key_id: minio
117+
access_key_secret: minio123
118+
bucketnames: loki
119+
endpoint: http://minio.svc.cluster.local:9000

test/kuttl/fixme/cloudkitty/01-assert.yaml renamed to test/kuttl/tests/cloudkitty/02-assert.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,17 @@ metadata:
118118
name: telemetry-kuttl-cloudkitty-api
119119
spec:
120120
containers:
121+
- name: telemetry-kuttl-cloudkitty-api-log
121122
- name: cloudkitty-api
122123
hostname: telemetry-kuttl-cloudkitty-api-0
123124
status:
124125
containerStatuses:
125126
- name: cloudkitty-api
126127
ready: true
127128
started: true
129+
- name: telemetry-kuttl-cloudkitty-api-log
130+
ready: true
131+
started: true
128132
---
129133
apiVersion: v1
130134
kind: Service
@@ -192,11 +196,11 @@ metadata:
192196
name: telemetry-kuttl-cloudkitty-proc
193197
spec:
194198
containers:
195-
- name: cloudkitty-processor
199+
- name: cloudkitty-proc
196200
hostname: telemetry-kuttl-cloudkitty-proc-0
197201
status:
198202
containerStatuses:
199-
- name: cloudkitty-processor
203+
- name: cloudkitty-proc
200204
ready: true
201205
started: true
202206
---

test/kuttl/fixme/cloudkitty/01-deploy.yaml renamed to test/kuttl/tests/cloudkitty/02-deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ spec:
2323
api:
2424
internal: {}
2525
public: {}
26-
caBundleSecretName: combined-ca-bundle
26+
caBundleSecretName: ""
2727
cloudKittyProc:
2828
replicas: 1
2929
resources: {}
3030
tls:
31-
caBundleSecretName: combined-ca-bundle
31+
caBundleSecretName: ""
3232
databaseAccount: cloudkitty
3333
databaseInstance: openstack
3434
memcachedInstance: memcached

test/kuttl/fixme/cloudkitty/deps/OpenStackControlPlane.yaml renamed to test/kuttl/tests/cloudkitty/deps/OpenStackControlPlane.yaml

File renamed without changes.
File renamed without changes.
File renamed without changes.

test/kuttl/fixme/cloudkitty/deps/loki-operator.yaml renamed to test/kuttl/tests/cloudkitty/deps/loki-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ metadata:
2020
name: loki-operator
2121
namespace: openshift-operators-redhat
2222
spec:
23-
channel: stable-6.1
23+
channel: stable-6.4
2424
installPlanApproval: Automatic
2525
name: loki-operator
2626
source: redhat-operators

0 commit comments

Comments
 (0)