Skip to content

Commit f2dd8a6

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #820 from vyzigold/add-ck-default-kuttl
[OSPRH-23679] Add CloudKitty to default kuttl-test
2 parents 65da081 + 9d128c6 commit f2dd8a6

5 files changed

Lines changed: 184 additions & 0 deletions

File tree

‎test/kuttl/tests/default/00-cloudkitty-deps.yaml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
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+
# minio
38+
apiVersion: v1
39+
kind: Pod
40+
metadata:
41+
labels:
42+
app: minio
43+
name: minio
44+
spec:
45+
containers:
46+
- name: minio
47+
image: quay.io/minio/minio:latest
48+
command:
49+
- /bin/bash
50+
- -c
51+
- |
52+
mkdir -p /data/loki && \
53+
minio server /data
54+
env:
55+
- name: MINIO_ACCESS_KEY
56+
value: minio
57+
- name: MINIO_SECRET_KEY
58+
value: minio123
59+
volumeMounts:
60+
- mountPath: /data
61+
name: storage
62+
volumes:
63+
- name: storage
64+
persistentVolumeClaim:
65+
claimName: minio-pvc
66+
---
67+
apiVersion: v1
68+
kind: PersistentVolumeClaim
69+
metadata:
70+
name: minio-pvc
71+
spec:
72+
accessModes:
73+
- ReadWriteOnce
74+
resources:
75+
requests:
76+
storage: 10Gi
77+
storageClassName: local-storage
78+
---
79+
apiVersion: v1
80+
kind: Service
81+
metadata:
82+
name: minio
83+
spec:
84+
selector:
85+
app: minio
86+
ports:
87+
- name: api
88+
protocol: TCP
89+
port: 9000
90+
- name: console
91+
protocol: TCP
92+
port: 9090
93+
---
94+
# Loki S3 secret
95+
apiVersion: v1
96+
kind: Secret
97+
metadata:
98+
name: logging-loki-s3
99+
stringData:
100+
access_key_id: minio
101+
access_key_secret: minio123
102+
bucketnames: loki
103+
endpoint: http://minio.svc.cluster.local:9000

‎test/kuttl/tests/default/00-deps.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ commands:
44
- script: |
55
oc apply -f deps/rhobs.yaml
66
until oc api-resources | grep -q rhobs; do sleep 1; done
7+
- script: |
8+
oc apply -f deps/loki-operator.yaml
9+
until oc api-resources | grep -q grafana; do sleep 1; done

‎test/kuttl/tests/default/01-assert.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,3 +337,44 @@ status:
337337
currentReplicas: 1
338338
readyReplicas: 1
339339
replicas: 1
340+
---
341+
apiVersion: telemetry.openstack.org/v1beta1
342+
kind: CloudKitty
343+
metadata:
344+
name: cloudkitty
345+
status:
346+
conditions:
347+
- status: "True"
348+
type: Ready
349+
- status: "True"
350+
type: CloudKittyAPIReady
351+
- status: "True"
352+
type: CloudKittyClientCertReady
353+
- status: "True"
354+
type: CloudKittyLokiStackReady
355+
- status: "True"
356+
type: CloudKittyProcReady
357+
- status: "True"
358+
type: CloudKittyStorageInitReady
359+
- status: "True"
360+
type: DBReady
361+
- status: "True"
362+
type: DBSyncReady
363+
- status: "True"
364+
type: InputReady
365+
- status: "True"
366+
type: MariaDBAccountReady
367+
- status: "True"
368+
type: MemcachedReady
369+
- status: "True"
370+
type: NetworkAttachmentsReady
371+
- status: "True"
372+
type: RabbitMqTransportURLReady
373+
- status: "True"
374+
type: RoleBindingReady
375+
- status: "True"
376+
type: RoleReady
377+
- status: "True"
378+
type: ServiceAccountReady
379+
- status: "True"
380+
type: ServiceConfigReady

‎test/kuttl/tests/default/01-deploy.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ spec:
2525
ceilometer:
2626
enabled: true
2727
secret: osp-secret
28+
cloudkitty:
29+
enabled: true
30+
s3StorageConfig:
31+
schemas:
32+
- effectiveDate: "2024-11-18"
33+
version: v13
34+
secret:
35+
name: logging-loki-s3
36+
type: s3
37+
storageClass: local-storage
2838
logging:
2939
enabled: false
3040
port: 10514

‎test/kuttl/tests/default/deps/loki-operator.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
apiVersion: v1
3+
kind: Namespace
4+
metadata:
5+
name: openshift-operators-redhat
6+
labels:
7+
name: openshift-operators-redhat
8+
---
9+
apiVersion: operators.coreos.com/v1
10+
kind: OperatorGroup
11+
metadata:
12+
name: loki-operator
13+
namespace: openshift-operators-redhat
14+
spec:
15+
upgradeStrategy: Default
16+
---
17+
apiVersion: operators.coreos.com/v1alpha1
18+
kind: Subscription
19+
metadata:
20+
name: loki-operator
21+
namespace: openshift-operators-redhat
22+
spec:
23+
channel: stable-6.4
24+
installPlanApproval: Automatic
25+
name: loki-operator
26+
source: redhat-operators
27+
sourceNamespace: openshift-marketplace

0 commit comments

Comments
 (0)