Skip to content

Commit d08b934

Browse files
jlarribajlarriba
committed
Adjust to use CloudKittyCore to avoid exposing images in the ControlPlane
1 parent 05c41e1 commit d08b934

File tree

12 files changed

+309
-99
lines changed

12 files changed

+309
-99
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 51 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14675,18 +14675,18 @@ spec:
1467514675
type: integer
1467614676
cloudKittyAPI:
1467714677
properties:
14678-
containerImage:
14679-
type: string
1468014678
customServiceConfig:
1468114679
type: string
1468214680
customServiceConfigSecrets:
1468314681
items:
1468414682
type: string
1468514683
type: array
14684+
x-kubernetes-list-type: atomic
1468614685
networkAttachments:
1468714686
items:
1468814687
type: string
1468914688
type: array
14689+
x-kubernetes-list-type: atomic
1469014690
nodeSelector:
1469114691
additionalProperties:
1469214692
type: string
@@ -14755,6 +14755,8 @@ spec:
1475514755
properties:
1475614756
name:
1475714757
type: string
14758+
request:
14759+
type: string
1475814760
required:
1475914761
- name
1476014762
type: object
@@ -14804,23 +14806,21 @@ spec:
1480414806
namespace:
1480514807
type: string
1480614808
type: object
14807-
required:
14808-
- containerImage
1480914809
type: object
1481014810
cloudKittyProc:
1481114811
properties:
14812-
containerImage:
14813-
type: string
1481414812
customServiceConfig:
1481514813
type: string
1481614814
customServiceConfigSecrets:
1481714815
items:
1481814816
type: string
1481914817
type: array
14818+
x-kubernetes-list-type: atomic
1482014819
networkAttachments:
1482114820
items:
1482214821
type: string
1482314822
type: array
14823+
x-kubernetes-list-type: atomic
1482414824
nodeSelector:
1482514825
additionalProperties:
1482614826
type: string
@@ -14837,6 +14837,8 @@ spec:
1483714837
properties:
1483814838
name:
1483914839
type: string
14840+
request:
14841+
type: string
1484014842
required:
1484114843
- name
1484214844
type: object
@@ -14875,15 +14877,14 @@ spec:
1487514877
namespace:
1487614878
type: string
1487714879
type: object
14878-
required:
14879-
- containerImage
1488014880
type: object
1488114881
customServiceConfig:
1488214882
type: string
1488314883
databaseAccount:
1488414884
default: cloudkitty
1488514885
type: string
1488614886
databaseInstance:
14887+
default: openstack
1488714888
type: string
1488814889
enabled:
1488914890
default: false
@@ -14925,6 +14926,7 @@ spec:
1492514926
key:
1492614927
type: string
1492714928
name:
14929+
default: ""
1492814930
type: string
1492914931
optional:
1493014932
type: boolean
@@ -14935,25 +14937,59 @@ spec:
1493514937
rabbitMqClusterName:
1493614938
default: rabbitmq
1493714939
type: string
14940+
s3StorageConfig:
14941+
default:
14942+
secret:
14943+
name: cloudkitty-loki-s3
14944+
type: s3
14945+
properties:
14946+
schemas:
14947+
default:
14948+
- effectiveDate: "2020-10-11"
14949+
version: v11
14950+
items:
14951+
properties:
14952+
effectiveDate:
14953+
type: string
14954+
version:
14955+
type: string
14956+
type: object
14957+
minItems: 1
14958+
type: array
14959+
secret:
14960+
properties:
14961+
credentialMode:
14962+
type: string
14963+
name:
14964+
type: string
14965+
type:
14966+
type: string
14967+
type: object
14968+
tls:
14969+
properties:
14970+
caKey:
14971+
type: string
14972+
caName:
14973+
type: string
14974+
required:
14975+
- caName
14976+
type: object
14977+
type: object
1493814978
secret:
14979+
default: osp-secret
1493914980
type: string
1494014981
serviceUser:
1494114982
default: cloudkitty
1494214983
type: string
14984+
storageClass:
14985+
type: string
1494314986
topologyRef:
1494414987
properties:
1494514988
name:
1494614989
type: string
1494714990
namespace:
1494814991
type: string
1494914992
type: object
14950-
required:
14951-
- cloudKittyAPI
14952-
- cloudKittyProc
14953-
- databaseInstance
14954-
- memcachedInstance
14955-
- rabbitMqClusterName
14956-
- secret
1495714993
type: object
1495814994
logging:
1495914995
properties:

‎apis/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ require (
6868
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
6969
github.com/google/uuid v1.6.0 // indirect
7070
github.com/gophercloud/gophercloud v1.14.1 // indirect
71-
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba // indirect
7271
github.com/imdario/mergo v0.3.16 // indirect
7372
github.com/josharian/intern v1.0.0 // indirect
7473
github.com/json-iterator/go v1.1.12 // indirect
@@ -120,4 +119,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
120119
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
121120

122121
// Test CloudKitty
123-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28
122+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930133019-ac359d938872

‎apis/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6060
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6161
github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw=
6262
github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
63-
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba h1:P5Wgp2HfGfNPLCPpS+YqquKdrrl4tW0El7VX23D6vtg=
64-
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba/go.mod h1:OBAgJh0mLYRvziBzBKr4/anrPHqGY9qEfuNXCpnUNi0=
6563
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
6664
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
67-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28 h1:9H+DxrR9/zzJtTZ9HeC7Ngxq83fLyZU6Z2sr4J5HOcI=
68-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28/go.mod h1:+SOqfHuYQlyFGykNxqMWZcFjdIB6+2+L3K7w+Uh+vCM=
65+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930133019-ac359d938872 h1:LDZKByr7fpYLZydCGiY3hYUJerC+axk0VvLYKSWEqIg=
66+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930133019-ac359d938872/go.mod h1:v4Stbc6YFVR3r7ofSuErpTJ9Ki2Ka9Fs8S+dgiNqx60=
6967
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
7068
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7169
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

0 commit comments

Comments
 (0)